Chronological Thread  

< Chronological >       < Thread >

---

Author: mcconnell
Date: Thu Feb 3 09:17:41 2005
New Revision: 1709

Added:
development/main/build.properties
- copied unchanged from r1691, development/main/setup.properties
development/main/magic/build.properties
development/main/magic/common.properties
development/main/magic/core/build.properties
development/main/magic/core/etc/deliverables/formats/
development/main/magic/core/etc/deliverables/xsls/

development/main/magic/core/src/main/net/dpml/magic/tasks/CheckstyleTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/StyleTask.java
Removed:
development/main/bootstrap.xml
development/main/home/transit/installer/
development/main/magic/bootstrap/
development/main/magic/core/bootstrap.properties
development/main/magic/core/bootstrap.xml
development/main/magic/spells/checkstyle/
development/main/magic/spells/style/
development/main/magic/test/
development/main/setup.properties
development/main/setup.xml
development/main/transit/
Modified:
development/main/README.TXT
development/main/build.xml
development/main/central/build.xml
development/main/central/index.xml
development/main/central/install/build.xml
development/main/central/module.xml
development/main/central/site/build.xml
development/main/central/site/src/docs/guide/setup/checkout.xml

development/main/central/site/src/docs/guide/transit/000/plugins/simple/index.xml

development/main/central/site/src/docs/guide/transit/plugins/simple/index.xml
development/main/central/site/src/docs/products/magic/antlib/import.xml
development/main/central/site/src/docs/products/magic/antlib/index.xml
development/main/central/site/src/docs/products/magic/antlib/init.xml
development/main/central/site/src/docs/products/magic/antlib/plugin.xml

development/main/central/site/src/docs/products/magic/plugins/checkstyle/index.xml

development/main/central/site/src/docs/products/magic/plugins/eclipse/index.xml
development/main/central/site/src/docs/products/magic/tasks/plugin.xml
development/main/central/tutorials/metro/build.xml
development/main/central/tutorials/metro/composition/application/build.xml

development/main/central/tutorials/metro/composition/application/impl/build.xml
development/main/central/tutorials/metro/composition/build.xml
development/main/central/tutorials/metro/composition/location/api/build.xml
development/main/central/tutorials/metro/composition/location/build.xml

development/main/central/tutorials/metro/composition/location/impl/build.xml

development/main/central/tutorials/metro/composition/publisher/api/build.xml
development/main/central/tutorials/metro/composition/publisher/build.xml

development/main/central/tutorials/metro/composition/publisher/impl/build.xml
development/main/central/tutorials/metro/configuration/block/build.xml
development/main/central/tutorials/metro/configuration/build.xml
development/main/central/tutorials/metro/configuration/defaults/build.xml
development/main/central/tutorials/metro/configuration/injection/build.xml
development/main/central/tutorials/metro/configuration/override/build.xml
development/main/central/tutorials/metro/context/alias/build.xml
development/main/central/tutorials/metro/context/build.xml
development/main/central/tutorials/metro/context/casting/build.xml
development/main/central/tutorials/metro/context/custom/build.xml
development/main/central/tutorials/metro/context/injection/build.xml
development/main/central/tutorials/metro/context/phased/build.xml
development/main/central/tutorials/metro/context/strategy/build.xml
development/main/central/tutorials/metro/dependencies/auto/build.xml
development/main/central/tutorials/metro/dependencies/build.xml
development/main/central/tutorials/metro/dependencies/manual/build.xml
development/main/central/tutorials/metro/dynamics/build.xml
development/main/central/tutorials/metro/hello/build.xml
development/main/central/tutorials/metro/lifecycle/build.xml
development/main/central/tutorials/metro/lifecycle/modern/build.xml
development/main/central/tutorials/metro/main/build.xml
development/main/central/tutorials/metro/module.xml
development/main/central/tutorials/metro/parameterization/build.xml
development/main/central/tutorials/metro/profiles/build.xml
development/main/central/tutorials/metro/selection/build.xml
development/main/central/tutorials/metro/startable/build.xml
development/main/central/tutorials/transit/artifact/build.xml
development/main/central/tutorials/transit/build.xml
development/main/central/tutorials/transit/extension/build.xml
development/main/central/tutorials/transit/plugins/build.xml
development/main/central/tutorials/transit/plugins/cli/build.xml
development/main/central/tutorials/transit/plugins/controller/build.xml
development/main/central/tutorials/transit/plugins/simple/build.xml
development/main/magic/build.xml
development/main/magic/core/build.xml
development/main/magic/core/etc/deliverables/templates/reactor.template
development/main/magic/core/etc/deliverables/templates/standard.template
development/main/magic/core/src/main/net/dpml/magic/model/Info.java
development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
development/main/magic/core/src/main/net/dpml/magic/plugin.xml
development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java

development/main/magic/core/src/main/net/dpml/magic/tasks/InitializeTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/ReactorTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/TarTask.java
development/main/magic/index.xml
development/main/magic/module.xml
development/main/magic/spells/bar/build.xml
development/main/magic/spells/build.xml
development/main/magic/spells/doc/build.xml
development/main/magic/spells/doc/task/build.xml

development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTargetFactory.java
development/main/magic/spells/doc/themes/build.xml
development/main/magic/spells/doc/themes/modern/build.xml
development/main/magic/spells/eclipse/build.xml
development/main/magic/spells/example/build.xml
development/main/magic/spells/publish/build.xml
development/main/magic/spells/upload/build.xml
development/main/metro/activation/api/build.xml
development/main/metro/activation/impl/build.xml
development/main/metro/activation/providers/avalon/build.xml
development/main/metro/activation/providers/build.xml
development/main/metro/activation/providers/metro/build.xml
development/main/metro/activation/test/build.xml
development/main/metro/activity/api/build.xml
development/main/metro/build.xml
development/main/metro/composition/api/build.xml
development/main/metro/composition/build.xml
development/main/metro/composition/impl/build.xml
development/main/metro/composition/spi/build.xml
development/main/metro/composition/test/build.xml
development/main/metro/configuration/api/build.xml
development/main/metro/configuration/impl/build.xml
development/main/metro/context/api/build.xml
development/main/metro/context/impl/build.xml
development/main/metro/extension/api/build.xml
development/main/metro/extension/impl/build.xml
development/main/metro/index.xml
development/main/metro/logging/api/build.xml
development/main/metro/logging/criteria/build.xml
development/main/metro/logging/data/build.xml
development/main/metro/logging/providers/build.xml
development/main/metro/logging/providers/log4j/build.xml
development/main/metro/logging/providers/log4j/impl/build.xml
development/main/metro/logging/providers/log4j/test/build.xml
development/main/metro/logging/providers/logkit/api/build.xml
development/main/metro/logging/providers/logkit/build.xml
development/main/metro/logging/providers/logkit/impl/build.xml
development/main/metro/logging/providers/logkit/plugins/build.xml
development/main/metro/logging/providers/logkit/plugins/datagram/build.xml
development/main/metro/logging/providers/logkit/plugins/socket/build.xml
development/main/metro/logging/providers/logkit/plugins/syslog/build.xml
development/main/metro/logging/providers/logkit/test/build.xml
development/main/metro/logging/spi/build.xml
development/main/metro/main/build.xml
development/main/metro/meta/api/build.xml
development/main/metro/meta/build.xml
development/main/metro/meta/impl/build.xml
development/main/metro/meta/spi/build.xml
development/main/metro/meta/tools/build.xml
development/main/metro/module.xml
development/main/metro/parameters/api/build.xml
development/main/metro/parameters/impl/build.xml
development/main/metro/service/api/build.xml
development/main/metro/system/api/build.xml
development/main/metro/system/impl/build.xml
development/main/metro/system/spi/build.xml
development/main/metro/system/test/build.xml
development/main/metro/testing/build.xml
development/main/metro/testing/cli/build.xml
development/main/metro/testing/components/build.xml
development/main/metro/testing/dynamics/build.xml
development/main/metro/testing/includes/build.xml
development/main/metro/testing/playground/build.xml
development/main/metro/testing/testa/build.xml
development/main/metro/testing/testb/build.xml
development/main/metro/testing/testc/build.xml
development/main/metro/testing/testcyclic/build.xml
development/main/metro/testing/testd/build.xml
development/main/metro/testing/teste/build.xml
development/main/metro/testing/testschema/build.xml
development/main/metro/unit/build.xml
development/main/metro/util/defaults/build.xml
development/main/planet/build.xml
development/main/planet/facilities/build.xml
development/main/planet/facilities/console/api/build.xml
development/main/planet/facilities/console/blocks/build.xml
development/main/planet/facilities/console/blocks/default/build.xml
development/main/planet/facilities/console/build.xml
development/main/planet/facilities/console/commands/build.xml
development/main/planet/facilities/console/impl/build.xml
development/main/planet/facilities/db/api/build.xml
development/main/planet/facilities/db/build.xml
development/main/planet/facilities/db/hsql/build.xml
development/main/planet/facilities/dbcp/api/build.xml
development/main/planet/facilities/dbcp/build.xml
development/main/planet/facilities/dbcp/impl/build.xml
development/main/planet/facilities/finder/api/build.xml
development/main/planet/facilities/finder/build.xml
development/main/planet/facilities/finder/impl/build.xml
development/main/planet/facilities/finder/test/build.xml
development/main/planet/facilities/http/api/build.xml
development/main/planet/facilities/http/blocks/build.xml
development/main/planet/facilities/http/blocks/context/build.xml
development/main/planet/facilities/http/blocks/hash-basic/build.xml
development/main/planet/facilities/http/blocks/hash-clientcert/build.xml
development/main/planet/facilities/http/blocks/hash-digest/build.xml
development/main/planet/facilities/http/blocks/hash-form/build.xml
development/main/planet/facilities/http/blocks/server/build.xml
development/main/planet/facilities/http/blocks/servlet/build.xml
development/main/planet/facilities/http/blocks/static/build.xml
development/main/planet/facilities/http/blocks/tapestry/build.xml
development/main/planet/facilities/http/blocks/webappserver/build.xml
development/main/planet/facilities/http/build.xml
development/main/planet/facilities/http/documentation/build.xml
development/main/planet/facilities/http/examples/build.xml
development/main/planet/facilities/http/examples/hangman/api/build.xml
development/main/planet/facilities/http/examples/hangman/app/build.xml
development/main/planet/facilities/http/examples/hangman/block/build.xml
development/main/planet/facilities/http/examples/hangman/build.xml
development/main/planet/facilities/http/examples/hangman/game/build.xml
development/main/planet/facilities/http/examples/hangman/view/build.xml
development/main/planet/facilities/http/examples/hello/build.xml
development/main/planet/facilities/http/impl/build.xml
development/main/planet/facilities/http/index.xml
development/main/planet/facilities/http/module.xml
development/main/planet/facilities/http/spi/build.xml
development/main/planet/facilities/http/test/build.xml
development/main/planet/facilities/http/util/build.xml
development/main/planet/facilities/javadoc/build.xml
development/main/planet/facilities/jms/api/build.xml
development/main/planet/facilities/jms/build.xml
development/main/planet/facilities/jms/impl/build.xml
development/main/planet/facilities/jms/test/build.xml
development/main/planet/facilities/jmx/api/build.xml
development/main/planet/facilities/jmx/build.xml
development/main/planet/facilities/jmx/handler/build.xml
development/main/planet/facilities/jmx/mx4j/build.xml
development/main/planet/facilities/jmx/spi/build.xml
development/main/planet/facilities/jmx/test/build.xml
development/main/planet/facilities/jmx/util/build.xml
development/main/planet/facilities/reflector/api/build.xml
development/main/planet/facilities/reflector/blocks/complete/build.xml
development/main/planet/facilities/reflector/blocks/standard/build.xml
development/main/planet/facilities/reflector/build.xml
development/main/planet/facilities/reflector/impl/build.xml
development/main/planet/facilities/reflector/spi/build.xml
development/main/planet/facilities/reflector/typehandlers/build.xml
Log:
System rollup - encompasses refactoring of the build strategy to remove the
Magic dependency held by Transit, repacking of transit and util under the
home directory, addition of an ant based build dist creation and install
strategy. Numerouse updates to Transit (bug fixes and the like). NSeveral
updates to Magic and the Transit tools to get this working, and finally
updates to the top level build instructions.

Modified: development/main/README.TXT
==============================================================================
--- development/main/README.TXT (original)
+++ development/main/README.TXT Thu Feb 3 09:17:41 2005
@@ -1,20 +1,16 @@

-Before attempting to build the bootstrap build system please
-install Apache Ant version 1.6.2 or later.
-
-To build the complete plaform and all facilities you need to setup you
-environment with junit and a bootstrap build of magic. The following command
-will initiate this process.
-
- $ ant -file setup.xml
-
-Once the setup procedure is complete you can proceed with the normal build of
-the platform. The following command will build the Transit, Magic, Metro,
the
-tutorials, and the Planet component suite.
-
- $ ant
-
-
-
+The DPML platform has the four major product groups.
+To build respective products please incoke the follwing commands:

+$ ant transit ... builds the transit diustribution and updates the
local installation
+$ ant magic ... builds the magic build system (requires transit)
+$ ant metro ... builds Metro (requires Magic)
+$ ant central ... builds site documentation (requires Metro)
+$ ant planet ... builds the facilities (requires Metro)
+
+Please note that the Transit build will install the junit jar file
+under the .ant/lib directory if not available. In such a case the
+build will exit with a failed condition and a message requesting
+recommencement of the build. If you run transit target a second
+time the build will continue as normal.


Modified: development/main/build.xml
==============================================================================
--- development/main/build.xml (original)
+++ development/main/build.xml Thu Feb 3 09:17:41 2005
@@ -19,10 +19,42 @@
-->


-<project name="dpml-main" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+<project name="dpml-main" default="transit" basedir=".">
+
+ <property file="${basedir}/user.properties"/>
+ <property file="${basedir}/build.properties"/>
+
+ <target name="home">
+ <ant dir="home" target="update"/>
+ </target>
+
+ <target name="transit" depends="home"
+ description="Build the Transit distribution and update the local
installation"/>
+
+ <target name="magic" description="Build magic (requires Transit).">
+ <ant dir="magic"/>
+ </target>
+
+ <target name="metro" description="Build Metro (requires Magic).">
+ <ant dir="metro"/>
+ </target>
+
+ <target name="central" description="Build Central (requires Metro).">
+ <ant dir="central"/>
+ </target>
+
+ <target name="planet" description="Build Planet (requires Metro).">
+ <ant dir="planet"/>
+ </target>
+
+ <target name="clean" description="Clean all subprojects.">
+ <ant dir="home" target="clean"/>
+ <ant dir="magic" target="clean"/>
+ <ant dir="metro" target="clean"/>
+ <ant dir="central" target="clean"/>
+ <ant dir="planet" target="clean"/>
+ </target>

- <magic:import uri="artifact:template:dpml/magic/reactor"/>

<target name="junit-report">
<mkdir dir="target/reports/junit"/>
@@ -33,9 +65,11 @@
<report format="frames" todir="target/reports/junit"/>
</junitreport>
</target>
+
<target name="cc-build">
- <ant antfile="setup.xml"/>
- <antcall target="clean"/>
- <antcall target="install"/>
+ <ant antfile="setup.xml"/>
+ <antcall target="clean"/>
+ <antcall target="install"/>
</target>
+
</project>

Modified: development/main/central/build.xml
==============================================================================
--- development/main/central/build.xml (original)
+++ development/main/central/build.xml Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="central" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/central/index.xml
==============================================================================
--- development/main/central/index.xml (original)
+++ development/main/central/index.xml Thu Feb 3 09:17:41 2005
@@ -11,24 +11,6 @@
-->

<!--
- <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.
-->


Modified: development/main/central/install/build.xml
==============================================================================
--- development/main/central/install/build.xml (original)
+++ development/main/central/install/build.xml Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-install" default="bin" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter feature="version" token="DPML-INSTALL-VERSION"/>

Modified: development/main/central/module.xml
==============================================================================
--- development/main/central/module.xml (original)
+++ development/main/central/module.xml Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-central" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:module index="index.xml">

Modified: development/main/central/site/build.xml
==============================================================================
--- development/main/central/site/build.xml (original)
+++ development/main/central/site/build.xml Thu Feb 3 09:17:41 2005
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-central-site" default="update" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-metro-main" feature="version"
@@ -49,7 +49,7 @@
token="METRO-RUNTIME-PLUGIN-URI"/>
<x:filter key="dpml-metro-main" feature="plugin"
token="METRO-PLUGIN-URI"/>
- <x:filter key="dpml-magic-bootstrap" feature="uri"
token="MAGIC-BOOTSTRAP-URI"/>
+ <x:filter key="dpml-transit-tools" feature="uri"
token="MAGIC-BOOTSTRAP-URI"/>
<x:filter key="dpml-magic-core" feature="plugin"
token="MAGIC-PLUGIN-URI"/>
<x:filter key="dpml-transit-main" feature="uri"
token="TRANSIT-MAIN-URI"/>
<x:filter key="dpml-transit-plugin" feature="plugin"
token="TRANSIT-PLUGIN-URI"/>
@@ -66,9 +66,9 @@

<target name="docs" depends="prepare">
<x:property name="spec" feature="plugin" key="dpml-magic-doc"/>
- <magic:plugin uri="${spec}">
+ <transit:plugin uri="${spec}">
<task class="net.dpml.magic.doc.DocTask" name="docs"/>
- </magic:plugin>
+ </transit:plugin>
<docs/>
</target>


Modified: development/main/central/site/src/docs/guide/setup/checkout.xml
==============================================================================
--- development/main/central/site/src/docs/guide/setup/checkout.xml
(original)
+++ development/main/central/site/src/docs/guide/setup/checkout.xml Thu
Feb 3 09:17:41 2005
@@ -37,19 +37,25 @@
<subsection name="Build Procedure">

<p>
- To build the complete plaform and all facilities you need to setup
you
- environment with junit and a bootstrap build of transit and magic.
+The DPML platform has the four major product groups.
+To build respective products please incoke the follwing commands:
</p>

- <source>$ ant -file setup.xml</source>
-
- <p>
- Once the setup procedure is complete you can proceed with the normal
build of
- the platform. The following command will build the Transit, Magic,
Metro, the
- tutorials, and the Planet component suite.
- </p>
-
- <source>$ ant</source>
+<pre>
+$ ant transit ... builds the transit diustribution and updates the
local installation
+$ ant magic ... builds the magic build system (requires transit)
+$ ant metro ... builds Metro (requires Magic)
+$ ant central ... builds site documentation (requires Metro)
+$ ant planet ... builds the facilities (requires Metro)
+</pre>
+
+<p>
+Please note that the Transit build will install the junit jar file
+under the .ant/lib directory if not available. In such a case the
+build will exit with a failed condition and a message requesting
+recommencement of the build. If you run transit target a second
+time the build will continue as normal.
+</p>

</subsection>


Modified:
development/main/central/site/src/docs/guide/transit/000/plugins/simple/index.xml
==============================================================================
---
development/main/central/site/src/docs/guide/transit/000/plugins/simple/index.xml
(original)
+++
development/main/central/site/src/docs/guide/transit/000/plugins/simple/index.xml
Thu Feb 3 09:17:41 2005
@@ -73,10 +73,10 @@
</p>

<source><![CDATA[<project name="dpml-transit-tutorial-plugin-simple"
default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >


- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="tutorial.plugin.SimplePlugin"/>

Modified:
development/main/central/site/src/docs/guide/transit/plugins/simple/index.xml
==============================================================================
---
development/main/central/site/src/docs/guide/transit/plugins/simple/index.xml
(original)
+++
development/main/central/site/src/docs/guide/transit/plugins/simple/index.xml
Thu Feb 3 09:17:41 2005
@@ -73,10 +73,10 @@
</p>

<source><![CDATA[<project name="dpml-transit-tutorial-plugin-simple"
default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >


- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="tutorial.plugin.SimplePlugin"/>

Modified:
development/main/central/site/src/docs/products/magic/antlib/import.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/antlib/import.xml
(original)
+++ development/main/central/site/src/docs/products/magic/antlib/import.xml
Thu Feb 3 09:17:41 2005
@@ -17,7 +17,7 @@
<p><i>Example of a import request.</i></p>

<source><![CDATA[
- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>
]]></source>

</section>

Modified:
development/main/central/site/src/docs/products/magic/antlib/index.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/antlib/index.xml
(original)
+++ development/main/central/site/src/docs/products/magic/antlib/index.xml
Thu Feb 3 09:17:41 2005
@@ -11,7 +11,7 @@

<subsection
name="URI"><source>@MAGIC-BOOTSTRAP-URI@</source></subsection>

- <subsection
name="Namespace"><source>antlib:net.dpml.magic</source></subsection>
+ <subsection
name="Namespace"><source>antlib:net.dpml.transit</source></subsection>

<subsection name="Description">

@@ -32,7 +32,7 @@

<pre><![CDATA[
<project name="example"
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

<magic:init>
<plugin uri="@MAGIC-PLUGIN-URI@"/>

Modified:
development/main/central/site/src/docs/products/magic/antlib/init.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/antlib/init.xml
(original)
+++ development/main/central/site/src/docs/products/magic/antlib/init.xml
Thu Feb 3 09:17:41 2005
@@ -19,7 +19,7 @@

<source><![CDATA[
<project name="example"
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

<magic:init>
<plugin uri="@MAGIC-PLUGIN-URI@"/>

Modified:
development/main/central/site/src/docs/products/magic/antlib/plugin.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/antlib/plugin.xml
(original)
+++ development/main/central/site/src/docs/products/magic/antlib/plugin.xml
Thu Feb 3 09:17:41 2005
@@ -18,15 +18,15 @@
<p><i>Example of a request to load an antlib.</i></p>

<source><![CDATA[
- <magic:plugin uri="artifact:plugin:dpml/magic/dpml-magic-core#SNAPSHOT"/>
+ <transit:plugin uri="artifact:plugin:dpml/magic/dpml-magic-core#SNAPSHOT"/>
]]></source>

<p><i>Example of a request to load and register a single task
definition.</i></p>

<source><![CDATA[
- <magic:plugin uri="${spec}">
+ <transit:plugin uri="${spec}">
<task class="net.dpml.magic.doc.DocTask" name="docs"/>
- </magic:plugin>
+ </transit:plugin>
<docs/>
]]></source>


Modified:
development/main/central/site/src/docs/products/magic/plugins/checkstyle/index.xml
==============================================================================
---
development/main/central/site/src/docs/products/magic/plugins/checkstyle/index.xml
(original)
+++
development/main/central/site/src/docs/products/magic/plugins/checkstyle/index.xml
Thu Feb 3 09:17:41 2005
@@ -34,10 +34,10 @@

<source><![CDATA[
<project name="demo" default="demo" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
- <magic:import uri="artifact:template:dpml/magic/checkstyle"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/checkstyle"/>

<target name="demo" depends="checkstyle"/>


Modified:
development/main/central/site/src/docs/products/magic/plugins/eclipse/index.xml
==============================================================================
---
development/main/central/site/src/docs/products/magic/plugins/eclipse/index.xml
(original)
+++
development/main/central/site/src/docs/products/magic/plugins/eclipse/index.xml
Thu Feb 3 09:17:41 2005
@@ -34,11 +34,11 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="orchard-management" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

<property file="build.properties" />
- <magic:import uri="artifact:template:dpml/magic/reactor"/>
- <magic:import uri="artifact:template:dpml/magic/eclipse"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/eclipse"/>


</project>

Modified:
development/main/central/site/src/docs/products/magic/tasks/plugin.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/tasks/plugin.xml
(original)
+++ development/main/central/site/src/docs/products/magic/tasks/plugin.xml
Thu Feb 3 09:17:41 2005
@@ -25,7 +25,7 @@
</p>

<source><![CDATA[
-<magic:plugin uri="artifact:plugin:dpml/metro/tools/dpml-meta-tools#1.4.0"/>
+<transit:plugin
uri="artifact:plugin:dpml/metro/tools/dpml-meta-tools#1.4.0"/>
]]></source>

<pre>plugin:

Modified: development/main/central/tutorials/metro/build.xml
==============================================================================
--- development/main/central/tutorials/metro/build.xml (original)
+++ development/main/central/tutorials/metro/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="runtime" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/central/tutorials/metro/composition/application/build.xml
==============================================================================
---
development/main/central/tutorials/metro/composition/application/build.xml
(original)
+++
development/main/central/tutorials/metro/composition/application/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-application-tutorial" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/central/tutorials/metro/composition/application/impl/build.xml
==============================================================================
---
development/main/central/tutorials/metro/composition/application/impl/build.xml
(original)
+++
development/main/central/tutorials/metro/composition/application/impl/build.xml
Thu Feb 3 09:17:41 2005
@@ -2,9 +2,9 @@

<project name="dpml-tutorial-application-impl"
default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:property name="location.spec"

Modified: development/main/central/tutorials/metro/composition/build.xml
==============================================================================
--- development/main/central/tutorials/metro/composition/build.xml
(original)
+++ development/main/central/tutorials/metro/composition/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-composition-tutorial" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/central/tutorials/metro/composition/location/api/build.xml
==============================================================================
---
development/main/central/tutorials/metro/composition/location/api/build.xml
(original)
+++
development/main/central/tutorials/metro/composition/location/api/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-location-api" default="install"
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified:
development/main/central/tutorials/metro/composition/location/build.xml
==============================================================================
--- development/main/central/tutorials/metro/composition/location/build.xml
(original)
+++ development/main/central/tutorials/metro/composition/location/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-location-tutorial" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/central/tutorials/metro/composition/location/impl/build.xml
==============================================================================
---
development/main/central/tutorials/metro/composition/location/impl/build.xml
(original)
+++
development/main/central/tutorials/metro/composition/location/impl/build.xml
Thu Feb 3 09:17:41 2005
@@ -2,9 +2,9 @@

<project name="dpml-tutorial-location-impl"
default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="locator" embed="MAIN">

Modified:
development/main/central/tutorials/metro/composition/publisher/api/build.xml
==============================================================================
---
development/main/central/tutorials/metro/composition/publisher/api/build.xml
(original)
+++
development/main/central/tutorials/metro/composition/publisher/api/build.xml
Thu Feb 3 09:17:41 2005
@@ -2,8 +2,8 @@

<project name="dpml-tutorial-publisher-api"
default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified:
development/main/central/tutorials/metro/composition/publisher/build.xml
==============================================================================
--- development/main/central/tutorials/metro/composition/publisher/build.xml
(original)
+++ development/main/central/tutorials/metro/composition/publisher/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-publisher-tutorial" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/central/tutorials/metro/composition/publisher/impl/build.xml
==============================================================================
---
development/main/central/tutorials/metro/composition/publisher/impl/build.xml
(original)
+++
development/main/central/tutorials/metro/composition/publisher/impl/build.xml
Thu Feb 3 09:17:41 2005
@@ -2,9 +2,9 @@

<project name="dpml-tutorial-publisher-impl"
default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="publishing" embed="MAIN">

Modified:
development/main/central/tutorials/metro/configuration/block/build.xml
==============================================================================
--- development/main/central/tutorials/metro/configuration/block/build.xml
(original)
+++ development/main/central/tutorials/metro/configuration/block/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-config-block" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/metro/configuration/build.xml
==============================================================================
--- development/main/central/tutorials/metro/configuration/build.xml
(original)
+++ development/main/central/tutorials/metro/configuration/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-configuration-tutorial" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/central/tutorials/metro/configuration/defaults/build.xml
==============================================================================
--- development/main/central/tutorials/metro/configuration/defaults/build.xml
(original)
+++ development/main/central/tutorials/metro/configuration/defaults/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-config-defaults" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified:
development/main/central/tutorials/metro/configuration/injection/build.xml
==============================================================================
---
development/main/central/tutorials/metro/configuration/injection/build.xml
(original)
+++
development/main/central/tutorials/metro/configuration/injection/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-config-injection" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified:
development/main/central/tutorials/metro/configuration/override/build.xml
==============================================================================
--- development/main/central/tutorials/metro/configuration/override/build.xml
(original)
+++ development/main/central/tutorials/metro/configuration/override/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-config-override" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial">

Modified: development/main/central/tutorials/metro/context/alias/build.xml
==============================================================================
--- development/main/central/tutorials/metro/context/alias/build.xml
(original)
+++ development/main/central/tutorials/metro/context/alias/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-context-alias" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/metro/context/build.xml
==============================================================================
--- development/main/central/tutorials/metro/context/build.xml (original)
+++ development/main/central/tutorials/metro/context/build.xml Thu Feb 3
09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-context-tutorial" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/central/tutorials/metro/context/casting/build.xml
==============================================================================
--- development/main/central/tutorials/metro/context/casting/build.xml
(original)
+++ development/main/central/tutorials/metro/context/casting/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-context-casting" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="hello" embed="MAIN">

Modified: development/main/central/tutorials/metro/context/custom/build.xml
==============================================================================
--- development/main/central/tutorials/metro/context/custom/build.xml
(original)
+++ development/main/central/tutorials/metro/context/custom/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-context-custom" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="hello" embed="MAIN">

Modified: development/main/central/tutorials/metro/context/injection/build.xml
==============================================================================
--- development/main/central/tutorials/metro/context/injection/build.xml
(original)
+++ development/main/central/tutorials/metro/context/injection/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-context-injection" default="install"
basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="classic" embed="MAIN">

Modified: development/main/central/tutorials/metro/context/phased/build.xml
==============================================================================
--- development/main/central/tutorials/metro/context/phased/build.xml
(original)
+++ development/main/central/tutorials/metro/context/phased/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-context-phased" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="context-phased" embed="MAIN">

Modified: development/main/central/tutorials/metro/context/strategy/build.xml
==============================================================================
--- development/main/central/tutorials/metro/context/strategy/build.xml
(original)
+++ development/main/central/tutorials/metro/context/strategy/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-context-strategy" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="strategy" embed="MAIN">

Modified: development/main/central/tutorials/metro/dependencies/auto/build.xml
==============================================================================
--- development/main/central/tutorials/metro/dependencies/auto/build.xml
(original)
+++ development/main/central/tutorials/metro/dependencies/auto/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-dependency-auto" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/metro/dependencies/build.xml
==============================================================================
--- development/main/central/tutorials/metro/dependencies/build.xml
(original)
+++ development/main/central/tutorials/metro/dependencies/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-dependencies-tutorial" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/central/tutorials/metro/dependencies/manual/build.xml
==============================================================================
--- development/main/central/tutorials/metro/dependencies/manual/build.xml
(original)
+++ development/main/central/tutorials/metro/dependencies/manual/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-dependency-manual" default="install"
basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/metro/dynamics/build.xml
==============================================================================
--- development/main/central/tutorials/metro/dynamics/build.xml (original)
+++ development/main/central/tutorials/metro/dynamics/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-dynamics" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="dynamics" embed="MAIN">

Modified: development/main/central/tutorials/metro/hello/build.xml
==============================================================================
--- development/main/central/tutorials/metro/hello/build.xml (original)
+++ development/main/central/tutorials/metro/hello/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-hello" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/metro/lifecycle/build.xml
==============================================================================
--- development/main/central/tutorials/metro/lifecycle/build.xml
(original)
+++ development/main/central/tutorials/metro/lifecycle/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-lifecycle-tutorial" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/central/tutorials/metro/lifecycle/modern/build.xml
==============================================================================
--- development/main/central/tutorials/metro/lifecycle/modern/build.xml
(original)
+++ development/main/central/tutorials/metro/lifecycle/modern/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-lifecycle-modern" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/metro/main/build.xml
==============================================================================
--- development/main/central/tutorials/metro/main/build.xml (original)
+++ development/main/central/tutorials/metro/main/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-main" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-system-impl" feature="plugin"

Modified: development/main/central/tutorials/metro/module.xml
==============================================================================
--- development/main/central/tutorials/metro/module.xml (original)
+++ development/main/central/tutorials/metro/module.xml Thu Feb 3 09:17:41
2005
@@ -18,11 +18,11 @@
-->

<project name="dpml-metro-tutorials" default="docs" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
- <magic:import uri="artifact:template:dpml/magic/checkstyle"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/checkstyle"/>

<target name="build" depends="standard.build">
<x:module index="index.xml">

Modified: development/main/central/tutorials/metro/parameterization/build.xml
==============================================================================
--- development/main/central/tutorials/metro/parameterization/build.xml
(original)
+++ development/main/central/tutorials/metro/parameterization/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-parameters" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/metro/profiles/build.xml
==============================================================================
--- development/main/central/tutorials/metro/profiles/build.xml (original)
+++ development/main/central/tutorials/metro/profiles/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-profiles" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/metro/selection/build.xml
==============================================================================
--- development/main/central/tutorials/metro/selection/build.xml
(original)
+++ development/main/central/tutorials/metro/selection/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-selection" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/metro/startable/build.xml
==============================================================================
--- development/main/central/tutorials/metro/startable/build.xml
(original)
+++ development/main/central/tutorials/metro/startable/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-tutorial-startable" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">

Modified: development/main/central/tutorials/transit/artifact/build.xml
==============================================================================
--- development/main/central/tutorials/transit/artifact/build.xml
(original)
+++ development/main/central/tutorials/transit/artifact/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-transit-tutorial-artifact" default="test" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/central/tutorials/transit/build.xml
==============================================================================
--- development/main/central/tutorials/transit/build.xml (original)
+++ development/main/central/tutorials/transit/build.xml Thu Feb 3
09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-transit-tutorials" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/central/tutorials/transit/extension/build.xml
==============================================================================
--- development/main/central/tutorials/transit/extension/build.xml
(original)
+++ development/main/central/tutorials/transit/extension/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-transit-tutorial-extension" default="test" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

<property name="project.test.fork" value="true"/>
- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/central/tutorials/transit/plugins/build.xml
==============================================================================
--- development/main/central/tutorials/transit/plugins/build.xml
(original)
+++ development/main/central/tutorials/transit/plugins/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-transit-plugins-tutorials" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/central/tutorials/transit/plugins/cli/build.xml
==============================================================================
--- development/main/central/tutorials/transit/plugins/cli/build.xml
(original)
+++ development/main/central/tutorials/transit/plugins/cli/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-transit-tutorial-plugin-cli" default="install"
basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter feature="plugin" token="URI-SPEC"/>

Modified:
development/main/central/tutorials/transit/plugins/controller/build.xml
==============================================================================
--- development/main/central/tutorials/transit/plugins/controller/build.xml
(original)
+++ development/main/central/tutorials/transit/plugins/controller/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-transit-tutorial-plugin-controller" default="install"
basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-transit-tutorial-plugin-cli"

Modified: development/main/central/tutorials/transit/plugins/simple/build.xml
==============================================================================
--- development/main/central/tutorials/transit/plugins/simple/build.xml
(original)
+++ development/main/central/tutorials/transit/plugins/simple/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-transit-tutorial-plugin-simple" default="install"
basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="tutorial.plugin.SimplePlugin"/>

Added: development/main/magic/build.properties
==============================================================================
--- (empty file)
+++ development/main/magic/build.properties Thu Feb 3 09:17:41 2005
@@ -0,0 +1,2 @@
+
+home = .

Modified: development/main/magic/build.xml
==============================================================================
--- development/main/magic/build.xml (original)
+++ development/main/magic/build.xml Thu Feb 3 09:17:41 2005
@@ -18,19 +18,31 @@
limitations under the License.
-->

-<project name="dpml-magic" basedir="." default="default"
- xmlns:magic="antlib:net.dpml.magic">
+<project name="dpml-magic" basedir="." default="install">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <target name="install" depends="module"/>

+ <target name="module" depends="spells">
+ <ant dir="${basedir}" antfile="module.xml" inheritall="false"/>
+ </target>
+
+ <target name="spells" depends="core">
+ <ant dir="spells" inheritall="false"/>
+ </target>
+
+ <target name="core">
+ <ant dir="core" inheritall="false"/>
+ </target>

- <target name="patch">
- <replace summary="true" dir="."
- token="core/etc/deliverables"
- value="core/etc/deliverables" >
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- </replace>
+ <target name="clean">
+ <delete quiet="true" dir="core/target"/>
+ <delete quiet="true" dir="spells/bar/target"/>
+ <delete quiet="true" dir="spells/doc/task/target"/>
+ <delete quiet="true" dir="spells/doc/themes/modern/target"/>
+ <delete quiet="true" dir="spells/eclipse/target"/>
+ <delete quiet="true" dir="spells/example/target"/>
+ <delete quiet="true" dir="spells/publish/target"/>
+ <delete quiet="true" dir="spells/upload/target"/>
</target>

</project>

Added: development/main/magic/common.properties
==============================================================================
--- (empty file)
+++ development/main/magic/common.properties Thu Feb 3 09:17:41 2005
@@ -0,0 +1,5 @@
+
+dpml.home.version = SNAPSHOT
+dpml.repository = http://repository.dpml.net/classic
+junit.filename = junit-3.8.1.jar
+

Added: development/main/magic/core/build.properties
==============================================================================
--- (empty file)
+++ development/main/magic/core/build.properties Thu Feb 3 09:17:41
2005
@@ -0,0 +1,8 @@
+
+home = ..
+project.name = dpml-magic-core
+project.group = dpml/magic
+project.specification.version = 1.0
+
+checkstyle.uri = artifact:jar:checkstyle/checkstyle#3.4
+

Modified: development/main/magic/core/build.xml
==============================================================================
--- development/main/magic/core/build.xml (original)
+++ development/main/magic/core/build.xml Thu Feb 3 09:17:41 2005
@@ -19,16 +19,35 @@
-->

<project name="dpml-magic-core" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/transit/standard"/>

- <target name="package" depends="standard.package">
- <x:export>
- <antlib resource="net/dpml/magic/plugin.xml"
urn="plugin:dpml/magic/dpml-magic-core"/>
- </x:export>
+ <target name="init" depends="standard.init">
+ <property name="dpml-magic-core.uri"
+
value="artifact:plugin:dpml/magic/dpml-magic-core#${project.version}"/>
+ <filter token="PROJECT-PLUGIN-URN"
value="plugin:dpml/magic/dpml-magic-core"/>
+ <filter token="PROJECT-PLUGIN-URI" value="${dpml-magic-core.uri}"/>
+ </target>
+
+ <target name="setup-path" depends="init">
+ <property name="dpml.local"
value="${dpml.home}/local/${dpml.home.version}"/>
+ <transit:get property="checkstyle.path" uri="${checkstyle.uri}"/>
+ <path id="project.main.path">
+ <pathelement
location="${dpml.local}/dpml/transit/jars/dpml-transit-main-${dpml.home.version}.jar"/>
+ <pathelement
location="${dpml.local}/dpml/transit/jars/dpml-transit-tools-${dpml.home.version}.jar"/>
+ <pathelement location="${checkstyle.path}"/>
+ <pathelement location="${basedir}/target/classes"/>
+ </path>
</target>

- <target name="install"/>
+ <target name="build" depends="standard.build">
+ <taskdef name="export" classname="net.dpml.magic.tasks.ExportTask">
+ <classpath refid="project.main.path"/>
+ </taskdef>
+ <export>
+ <antlib resource="net/dpml/magic/plugin.xml"
urn="plugin:dpml/magic/dpml-magic-core"/>
+ </export>
+ </target>

</project>

Modified:
development/main/magic/core/etc/deliverables/templates/reactor.template
==============================================================================
--- development/main/magic/core/etc/deliverables/templates/reactor.template
(original)
+++ development/main/magic/core/etc/deliverables/templates/reactor.template
Thu Feb 3 09:17:41 2005
@@ -17,13 +17,13 @@
-->

<project name="reactor"
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core">

- <magic:init>
+ <transit:init>
<map urn="@PROJECT-PLUGIN-URN@"
uri="@PROJECT-PLUGIN-URI@"/>
- </magic:init>
+ </transit:init>

<target name="init">
<x:reactor target="init"/>

Modified:
development/main/magic/core/etc/deliverables/templates/standard.template
==============================================================================
--- development/main/magic/core/etc/deliverables/templates/standard.template
(original)
+++ development/main/magic/core/etc/deliverables/templates/standard.template
Thu Feb 3 09:17:41 2005
@@ -17,13 +17,13 @@
-->

<project name="standard"
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core">

- <magic:init>
+ <transit:init>
<map urn="@PROJECT-PLUGIN-URN@"
uri="@PROJECT-PLUGIN-URI@"/>
- </magic:init>
+ </transit:init>

<target name="info" description="List the project key.">
<x:info/>
@@ -64,5 +64,20 @@
</x:javadoc>
</target>

+ <target name="checkstyle" depends="prepare"
unless="project.checkstyle.disable"
+ description="Create a checkstyle report.">
+ <property name="project.checkstyle.dest" value="target/checkstyle"/>
+ <property name="project.checkstyle.format"
value="artifact:format:dpml/magic/dpml"/>
+ <property name="project.checkstyle.reports"
value="target/reports/checkstyle"/>
+ <mkdir dir="${project.checkstyle.dest}"/>
+ <x:checkstyle uri="${project.checkstyle.format}">
+ <formatter type="xml"
toFile="${project.checkstyle.dest}/checkstyle_errors.xml"/>
+ </x:checkstyle>
+ <mkdir dir="${project.checkstyle.reports}"/>
+ <x:style style="artifact:xsl:dpml/magic/checkstyle-frames"
+ in="${project.checkstyle.dest}/checkstyle_errors.xml"
+ out="${project.checkstyle.reports}/checkstyle_report.html" />
+ </target>
+
</project>


Modified: development/main/magic/core/src/main/net/dpml/magic/model/Info.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Info.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Info.java Thu
Feb 3 09:17:41 2005
@@ -63,7 +63,7 @@
* @param group the artifact group
* @param name the artifact name
* @param version the artifact version
- * @param type the artifact type
+ * @param types the artifact types
* @param snapshot the artiact snapshot status
* @return the immutable info descriptor
*/

Modified:
development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
Thu Feb 3 09:17:41 2005
@@ -234,7 +234,7 @@
* Returns a path of artifact filenames relative to the supplied scope.
* The mode may be one of ANY, BUILD, TEST or RUNTIME.
* @param project the current project
- * @param moode one of ANY, BUILD, TEST or RUNTIME
+ * @param mode one of ANY, BUILD, TEST or RUNTIME
* @param filter a value of "*" for any or a type identifier such as "jar"
* @exception NullArgumentException if the supplied project argument is
null.
*/

Modified: development/main/magic/core/src/main/net/dpml/magic/plugin.xml
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/plugin.xml
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/plugin.xml Thu
Feb 3 09:17:41 2005
@@ -8,6 +8,7 @@
<taskdef name="bar" classname="net.dpml.magic.tasks.BarTask"/>
<taskdef name="block" classname="net.dpml.magic.tasks.BlockTask"/>
<taskdef name="clean" classname="net.dpml.magic.tasks.CleanTask"/>
+ <taskdef name="checkstyle"
classname="net.dpml.magic.tasks.CheckstyleTask"/>
<taskdef name="dist" classname="net.dpml.magic.tasks.DistTask"/>
<taskdef name="export" classname="net.dpml.magic.tasks.ExportTask"/>
<taskdef name="filter" classname="net.dpml.magic.tasks.FilterTask"/>
@@ -24,5 +25,6 @@
<taskdef name="property" classname="net.dpml.magic.tasks.PropertyTask"/>
<taskdef name="reactor" classname="net.dpml.magic.tasks.ReactorTask"/>
<taskdef name="replicate" classname="net.dpml.magic.tasks.ReplicateTask"/>
+ <taskdef name="style" classname="net.dpml.magic.tasks.StyleTask"/>

</antlib>

Added:
development/main/magic/core/src/main/net/dpml/magic/tasks/CheckstyleTask.java
==============================================================================
--- (empty file)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/CheckstyleTask.java
Thu Feb 3 09:17:41 2005
@@ -0,0 +1,135 @@
+/*
+ * 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 net.dpml.magic.tasks;
+
+import com.puppycrawl.tools.checkstyle.CheckStyleTask;
+
+import net.dpml.magic.model.Definition;
+import net.dpml.magic.model.Resource;
+import net.dpml.magic.model.ResourceRef;
+import net.dpml.magic.project.Context;
+import net.dpml.magic.Index;
+
+import net.dpml.transit.artifact.Handler;
+
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.BuildException;
+
+import java.io.File;
+import java.net.URL;
+
+public class CheckstyleTask extends CheckStyleTask
+{
+ private boolean m_init = false;
+ private Context m_context;
+
+ public void init()
+ {
+ super.init();
+ if( ! m_init )
+ {
+ m_init = true;
+ m_context = new Context( getProject() );
+ Resource resource = getResource();
+ if( resource instanceof Definition )
+ {
+ Definition def = (Definition) resource;
+ addTargetToFileset( def );
+ }
+ }
+ m_init = true;
+ }
+
+ public void setUri( String uri )
+ {
+ try
+ {
+ URL url = new URL( null, uri, new Handler() );
+ File local = (File) url.getContent( new Class[]{File.class} );
+ super.setConfig( local );
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Could not resolve the uri ["
+ + uri
+ + "]";
+ throw new BuildException( error, e );
+ }
+ }
+
+ private void addTargetToFileset( Definition def )
+ {
+ File file = def.getBaseDir();
+ File main = new File( file, "src/main" );
+ if( main.exists() )
+ {
+ FileSet fileset = new FileSet();
+ fileset.setDir( main );
+ fileset.setIncludes( "**/*.java" );
+ super.addFileset( fileset );
+ }
+
+ if( "module".equals( def.getInfo().getType() ) )
+ {
+ Definition[] defs = getIndex().getSubsidiaryDefinitions( def );
+ for( int i=0; i<defs.length; i++ )
+ {
+ Definition d = defs[i];
+ addTargetToFileset( d );
+ }
+ }
+
+ //
+ // add any projects referenced as parts of the defintion
+ //
+
+ ResourceRef[] parts = def.getPartRefs();
+ for( int i = 0; i < parts.length; i++ )
+ {
+ Resource resource = getIndex().getResource( parts[i] );
+ if( resource instanceof Definition )
+ {
+ Definition d = (Definition) resource;
+ addTargetToFileset( d );
+ }
+ }
+ }
+
+ private String getKey()
+ {
+ return getContext().getKey();
+ }
+
+ private Resource getResource()
+ {
+ return getIndex().getResource( getKey() );
+ }
+
+ private Index getIndex()
+ {
+ return getContext().getIndex();
+ }
+
+ private Context getContext()
+ {
+ return m_context;
+ }
+
+
+}

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java
Thu Feb 3 09:17:41 2005
@@ -72,12 +72,11 @@
}
m_tar.setCompression( mode );
String policy = mode.getValue();
-System.out.println( "#POLICY: " + policy );
- if( policy == "gzip" )
+ if( "gzip".equals( policy ) )
{
m_compression = "gz";
}
- else if( policy == "bzip2" )
+ else if( "bzip2".equals( policy ) )
{
m_compression = "gz2";
}
@@ -183,7 +182,6 @@
{
if( null == m_tar )
{
- //m_tar = (Tar) getProject().createTask( "tar" );
m_tar = createNewTarTask();
}

@@ -200,17 +198,6 @@
{
FileSet set = (FileSet) filesetIterator.next();
m_tar.addFileset( set );
- /*
- Tar.TarFileSet tarset = m_tar.createTarFileSet();
- tarset.setDir( set.getDir( getProject() ) );
- FileSelector[] selectors = set.getSelectors( getProject() );
-System.out.println( "#COUNT: " + selectors.length );
- for( int i=0; i<selectors.length; i++ )
- {
- FileSelector selector = selectors[i];
- tarset.add( selector );
- }
- */
}

TarTask.TarLongFileMode mode = new TarTask.TarLongFileMode();

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java
Thu Feb 3 09:17:41 2005
@@ -34,7 +34,7 @@
import net.dpml.magic.project.Context;
import net.dpml.magic.project.DeliverableHelper;

-import net.dpml.magic.bootstrap.PluginTask;
+import net.dpml.transit.tools.PluginTask;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/InitializeTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/InitializeTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/InitializeTask.java
Thu Feb 3 09:17:41 2005
@@ -24,14 +24,13 @@
import net.dpml.magic.model.Definition;
import net.dpml.magic.model.Resource;
import net.dpml.magic.model.ResourceRef;
-import net.dpml.magic.bootstrap.PluginTask;

+import net.dpml.transit.tools.PluginTask;
import net.dpml.transit.repository.Plugin;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildListener;

-
/**
* The initialize task loads and plugins that a project
* has declared under the &lt;plugins&gt; element.
@@ -74,7 +73,7 @@
if( null != resource )
{
String urn = plugin.getURN();
- Object task = getProject().createTask(
"antlib:net.dpml.magic:plugin" );
+ Object task = getProject().createTask(
"antlib:net.dpml.transit:plugin" );
// System.out.println( "------------- Loaded PluginTask
--------------" );
// printClassLoaderURLs( task.getClass().getClassLoader() );
// System.out.println( "------------- Resident PluginTask
--------------" );

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/ReactorTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/ReactorTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/ReactorTask.java
Thu Feb 3 09:17:41 2005
@@ -18,6 +18,7 @@
package net.dpml.magic.tasks;

import net.dpml.magic.Index;
+import net.dpml.magic.UnknownResourceException;
import net.dpml.magic.model.Definition;
import net.dpml.magic.model.ResourceRef;
import net.dpml.magic.project.Context;
@@ -195,28 +196,54 @@
for( int i=0; i<refs.length; i++ )
{
final ResourceRef ref = refs[i];
- if( getIndex().isaDefinition( ref ) )
+ try
{
- final Definition d = getIndex().getDefinition( ref );
- if( definitions.contains( d ) )
+ if( getIndex().isaDefinition( ref ) )
{
- list.add( d );
+ final Definition d = getIndex().getDefinition( ref );
+ if( definitions.contains( d ) )
+ {
+ list.add( d );
+ }
}
}
+ catch( UnknownResourceException ure )
+ {
+ final String error =
+ "The definition "
+ + def
+ + " contains an unknown dependency reference ["
+ + ure.getKey()
+ + "].";
+ throw new BuildException( error, getLocation() );
+ }
}

final ResourceRef[] plugins = def.getPluginRefs();
for( int i=0; i<plugins.length; i++ )
{
final ResourceRef ref = plugins[i];
- if( getIndex().isaDefinition( ref ) )
+ try
{
- final Definition plugin = getIndex().getDefinition( ref );
- if( definitions.contains( plugin ) )
+ if( getIndex().isaDefinition( ref ) )
{
- list.add( plugin );
+ final Definition plugin = getIndex().getDefinition( ref
);
+ if( definitions.contains( plugin ) )
+ {
+ list.add( plugin );
+ }
}
}
+ catch( UnknownResourceException ure )
+ {
+ final String error =
+ "The definition "
+ + def
+ + " contains an unknown plugin reference ["
+ + ure.getKey()
+ + "].";
+ throw new BuildException( error, getLocation() );
+ }
}

return (Definition[]) list.toArray( new Definition[0] );

Added:
development/main/magic/core/src/main/net/dpml/magic/tasks/StyleTask.java
==============================================================================
--- (empty file)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/StyleTask.java
Thu Feb 3 09:17:41 2005
@@ -0,0 +1,53 @@
+/*
+ * 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 net.dpml.magic.tasks;
+
+import java.io.File;
+import java.net.URL;
+
+import net.dpml.transit.artifact.Handler;
+
+import org.apache.tools.ant.taskdefs.XSLTProcess;
+import org.apache.tools.ant.BuildException;
+
+
+public class StyleTask extends XSLTProcess
+{
+ public void setStyle( String uri )
+ {
+ if( !uri.startsWith( "artifact:" ) )
+ {
+ super.setStyle( uri );
+ }
+
+ try
+ {
+ URL url = new URL( null, uri, new Handler() );
+ File local = (File) url.getContent( new Class[]{File.class} );
+ super.setStyle( local.getAbsolutePath() );
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Could not resolve the uri ["
+ + uri
+ + "]";
+ throw new BuildException( error, e );
+ }
+ }
+}
\ No newline at end of file

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/TarTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/TarTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/TarTask.java
Thu Feb 3 09:17:41 2005
@@ -49,7 +49,6 @@
*
* @since Ant 1.1
*
- * @ant.task category="packaging"
*/
public class TarTask extends MatchingTask {


Modified: development/main/magic/index.xml
==============================================================================
--- development/main/magic/index.xml (original)
+++ development/main/magic/index.xml Thu Feb 3 09:17:41 2005
@@ -21,11 +21,7 @@

<index key="dpml-magic">

- <!--
- <import uri="artifact:module:dpml/transit/dpml-transit#1638"/>
- -->
-
- <import index="../transit/index.xml"/>
+ <import uri="artifact:module:dpml/transit/dpml-transit#SNAPSHOT"/>

<!--
Magic Module
@@ -42,16 +38,13 @@
<dependencies>
<include key="dpml-transit"/>
</dependencies>
- <plugins>
- <include key="dpml-magic-checkstyle"/>
- <include key="dpml-magic-eclipse"/>
- </plugins>
</project>

<!--
Magic and associated spells.
-->

+ <!--
<project basedir="bootstrap">
<info>
<group>dpml/magic</group>
@@ -65,6 +58,7 @@
<include key="ant"/>
</dependencies>
</project>
+ -->

<project basedir="core">
<info>
@@ -78,9 +72,9 @@
</types>
</info>
<dependencies>
- <include key="dpml-magic-bootstrap"/>
- <include key="ant-junit"/>
+ <include key="dpml-transit-tools"/>
<include key="checkstyle"/>
+ <include key="ant-junit"/>
</dependencies>
</project>

@@ -110,6 +104,7 @@
</dependencies>
</project>

+ <!--
<project basedir="spells/checkstyle">
<info>
<group>dpml/magic</group>
@@ -124,6 +119,7 @@
<include key="dpml-magic-style"/>
</dependencies>
</project>
+ -->

<project basedir="spells/eclipse">
<info>
@@ -138,6 +134,7 @@
</dependencies>
</project>

+ <!--
<project basedir="spells/style">
<info>
<group>dpml/magic</group>
@@ -150,6 +147,7 @@
<include key="dpml-transit-main"/>
</dependencies>
</project>
+ -->

<project basedir="spells/doc/task">
<info>
@@ -219,48 +217,11 @@
</dependencies>
</project>

- <!-- disabled for now - for some reason (not yet investigated) a totally
clean build fails on this project -->
- <!--
- <project basedir="test">
- <info>
- <group>dpml/test</group>
- <name>dpml-magic-test</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <type>plugin</type>
- </info>
- <dependencies>
- <include key="dpml-magic-core"/>
- <include key="dpml-magic-doc" build="false"/>
- <include key="dpml-magic-themes-modern" build="false"/>
- <include key="dpml-magic-publish" build="false"/>
- <include key="dpml-magic-bar" build="false"/>
- <include key="dpml-magic-upload" build="false"/>
- </dependencies>
- <plugins>
- <include key="dpml-magic-example"/>
- </plugins>
- </project>
- -->
-
- <!--
- Resources.
- -->
-
- <resource>
- <info>
- <group>ant</group>
- <name>ant</name>
- <version>1.6.2</version>
- <type>jar</type>
- </info>
- </resource>
-
<resource>
<info>
<group>checkstyle</group>
<name>checkstyle</name>
- <version>3.4</version>
+ <version>3.5</version>
<type>jar</type>
</info>
<dependencies>
@@ -280,6 +241,9 @@
<version>2.7.2</version>
<type>jar</type>
</info>
+ <dependencies>
+ <include key="ant" />
+ </dependencies>
</resource>

<resource>
@@ -334,6 +298,9 @@
<version>1.6.2</version>
<type>jar</type>
</info>
+ <dependencies>
+ <include key="ant" />
+ </dependencies>
</resource>

<resource>
@@ -343,6 +310,9 @@
<version>0.1.17</version>
<type>jar</type>
</info>
+ <dependencies>
+ <include key="ant" />
+ </dependencies>
</resource>

<resource>
@@ -354,6 +324,7 @@
</info>
<dependencies>
<include key="junit" />
+ <include key="ant" />
</dependencies>
</resource>


Modified: development/main/magic/module.xml
==============================================================================
--- development/main/magic/module.xml (original)
+++ development/main/magic/module.xml Thu Feb 3 09:17:41 2005
@@ -19,11 +19,10 @@
-->


-<project name="dpml-magic" default="docs" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+<project name="dpml-magic" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
- <magic:import uri="artifact:template:dpml/magic/checkstyle"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:module index="index.xml">
@@ -38,11 +37,11 @@
</x:module>
</target>

- <target name="docs" depends="install,junit-report,checkstyle">
+ <target name="install" depends="standard.install,junit-report,checkstyle">
<x:javadoc>
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
<link href="http://www.dpml.net/api/ant/1.6.2"/>
- <link href="http://www.dpml.net/api/checkstyle/3.4"/>
+ <link href="http://www.dpml.net/api/checkstyle/3.5"/>
<group title="Magic Bootstrap">
<package name="net.dpml.magic.bootstrap"/>
</group>
@@ -65,7 +64,7 @@
</x:javadoc>
</target>

- <target name="junit-report">
+ <target name="junit-report" depends="test">
<mkdir dir="target/reports/junit"/>
<junitreport todir="target/reports/junit">
<fileset dir=".">

Modified: development/main/magic/spells/bar/build.xml
==============================================================================
--- development/main/magic/spells/bar/build.xml (original)
+++ development/main/magic/spells/bar/build.xml Thu Feb 3 09:17:41 2005
@@ -19,9 +19,9 @@
-->

<project name="dpml-magic-bar" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="net.dpml.magic.bar.BarTask"/>

Modified: development/main/magic/spells/build.xml
==============================================================================
--- development/main/magic/spells/build.xml (original)
+++ development/main/magic/spells/build.xml Thu Feb 3 09:17:41 2005
@@ -19,8 +19,8 @@
-->

<project name="dpml-magic-spells" basedir="." default="install"
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/magic/spells/doc/build.xml
==============================================================================
--- development/main/magic/spells/doc/build.xml (original)
+++ development/main/magic/spells/doc/build.xml Thu Feb 3 09:17:41 2005
@@ -20,8 +20,8 @@


<project name="dpml-magic-spells-doc" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/magic/spells/doc/task/build.xml
==============================================================================
--- development/main/magic/spells/doc/task/build.xml (original)
+++ development/main/magic/spells/doc/task/build.xml Thu Feb 3 09:17:41
2005
@@ -19,9 +19,9 @@
-->

<project name="dpml-magic-doc" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<!-- x:export class="net.dpml.magic.doc.DocTask"/ -->

Modified:
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTargetFactory.java
==============================================================================
---
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTargetFactory.java
(original)
+++
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTargetFactory.java
Thu Feb 3 09:17:41 2005
@@ -23,7 +23,7 @@
import org.apache.tools.ant.Target;
import org.apache.tools.ant.Location;

-import net.dpml.magic.bootstrap.TargetFactory;
+import net.dpml.transit.tools.TargetFactory;

import java.net.URI;


Modified: development/main/magic/spells/doc/themes/build.xml
==============================================================================
--- development/main/magic/spells/doc/themes/build.xml (original)
+++ development/main/magic/spells/doc/themes/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-magic-spells-doc-themes" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/magic/spells/doc/themes/modern/build.xml
==============================================================================
--- development/main/magic/spells/doc/themes/modern/build.xml (original)
+++ development/main/magic/spells/doc/themes/modern/build.xml Thu Feb 3
09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-magic-themes-modern" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/magic/spells/eclipse/build.xml
==============================================================================
--- development/main/magic/spells/eclipse/build.xml (original)
+++ development/main/magic/spells/eclipse/build.xml Thu Feb 3 09:17:41
2005
@@ -1,10 +1,10 @@
<project name="dpml-magic-eclipse" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<!-- example of usage
- <magic:import uri="artifact:template:dpml/magic/eclipse"/ -->
+ <transit:import uri="artifact:template:dpml/magic/eclipse"/ -->

<target name="init" depends="standard.init">
<x:filter feature="plugin" token="PLUGIN-URI"/>

Modified: development/main/magic/spells/example/build.xml
==============================================================================
--- development/main/magic/spells/example/build.xml (original)
+++ development/main/magic/spells/example/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-magic-example" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter feature="path" token="MESSAGE"/>

Modified: development/main/magic/spells/publish/build.xml
==============================================================================
--- development/main/magic/spells/publish/build.xml (original)
+++ development/main/magic/spells/publish/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-magic-publish" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="net.dpml.magic.publish.PublishTask">

Modified: development/main/magic/spells/upload/build.xml
==============================================================================
--- development/main/magic/spells/upload/build.xml (original)
+++ development/main/magic/spells/upload/build.xml Thu Feb 3 09:17:41
2005
@@ -19,9 +19,9 @@
-->

<project name="dpml-magic-upload" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="net.dpml.magic.upload.UploadTask"/>

Modified: development/main/metro/activation/api/build.xml
==============================================================================
--- development/main/metro/activation/api/build.xml (original)
+++ development/main/metro/activation/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-activation-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/activation/impl/build.xml
==============================================================================
--- development/main/metro/activation/impl/build.xml (original)
+++ development/main/metro/activation/impl/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-activation-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-activation-metro-provider" feature="plugin"

Modified: development/main/metro/activation/providers/avalon/build.xml
==============================================================================
--- development/main/metro/activation/providers/avalon/build.xml
(original)
+++ development/main/metro/activation/providers/avalon/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-activation-avalon-provider" default="install"
basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="net.dpml.activation.avalon.DefaultRuntimeFactory"/>

Modified: development/main/metro/activation/providers/build.xml
==============================================================================
--- development/main/metro/activation/providers/build.xml (original)
+++ development/main/metro/activation/providers/build.xml Thu Feb 3
09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-activation-providers" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/metro/activation/providers/metro/build.xml
==============================================================================
--- development/main/metro/activation/providers/metro/build.xml (original)
+++ development/main/metro/activation/providers/metro/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-activation-metro-provider" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="net.dpml.activation.metro.DefaultRuntimeFactory"/>

Modified: development/main/metro/activation/test/build.xml
==============================================================================
--- development/main/metro/activation/test/build.xml (original)
+++ development/main/metro/activation/test/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-activation-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-activation-impl" feature="plugin"

Modified: development/main/metro/activity/api/build.xml
==============================================================================
--- development/main/metro/activity/api/build.xml (original)
+++ development/main/metro/activity/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-activity-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/build.xml
==============================================================================
--- development/main/metro/build.xml (original)
+++ development/main/metro/build.xml Thu Feb 3 09:17:41 2005
@@ -19,8 +19,8 @@
-->

<project name="dpml-runtime" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/metro/composition/api/build.xml
==============================================================================
--- development/main/metro/composition/api/build.xml (original)
+++ development/main/metro/composition/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-composition-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/composition/build.xml
==============================================================================
--- development/main/metro/composition/build.xml (original)
+++ development/main/metro/composition/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-composition" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/metro/composition/impl/build.xml
==============================================================================
--- development/main/metro/composition/impl/build.xml (original)
+++ development/main/metro/composition/impl/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-composition-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-activation-impl" feature="plugin"
token="ACTIVATION-IMPL-SPEC"/>

Modified: development/main/metro/composition/spi/build.xml
==============================================================================
--- development/main/metro/composition/spi/build.xml (original)
+++ development/main/metro/composition/spi/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-composition-spi" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/composition/test/build.xml
==============================================================================
--- development/main/metro/composition/test/build.xml (original)
+++ development/main/metro/composition/test/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-composition-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter feature="plugin" key="dpml-composition-impl"
token="COMPOSITION_IMPL_URI"/>

Modified: development/main/metro/configuration/api/build.xml
==============================================================================
--- development/main/metro/configuration/api/build.xml (original)
+++ development/main/metro/configuration/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-configuration-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/configuration/impl/build.xml
==============================================================================
--- development/main/metro/configuration/impl/build.xml (original)
+++ development/main/metro/configuration/impl/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-configuration-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/context/api/build.xml
==============================================================================
--- development/main/metro/context/api/build.xml (original)
+++ development/main/metro/context/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-context-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/context/impl/build.xml
==============================================================================
--- development/main/metro/context/impl/build.xml (original)
+++ development/main/metro/context/impl/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-context-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/extension/api/build.xml
==============================================================================
--- development/main/metro/extension/api/build.xml (original)
+++ development/main/metro/extension/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-extension-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/extension/impl/build.xml
==============================================================================
--- development/main/metro/extension/impl/build.xml (original)
+++ development/main/metro/extension/impl/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-extension-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml (original)
+++ development/main/metro/index.xml Thu Feb 3 09:17:41 2005
@@ -16,9 +16,6 @@
<status>SNAPSHOT</status>
<type>module</type>
</info>
- <plugins>
- <include key="dpml-magic-checkstyle"/>
- </plugins>
<dependencies>
<include key="dpml-magic"/>
<include key="dpml-transit"/>

Modified: development/main/metro/logging/api/build.xml
==============================================================================
--- development/main/metro/logging/api/build.xml (original)
+++ development/main/metro/logging/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/logging/criteria/build.xml
==============================================================================
--- development/main/metro/logging/criteria/build.xml (original)
+++ development/main/metro/logging/criteria/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-criteria" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/logging/data/build.xml
==============================================================================
--- development/main/metro/logging/data/build.xml (original)
+++ development/main/metro/logging/data/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-data" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/logging/providers/build.xml
==============================================================================
--- development/main/metro/logging/providers/build.xml (original)
+++ development/main/metro/logging/providers/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/metro/logging/providers/log4j/build.xml
==============================================================================
--- development/main/metro/logging/providers/log4j/build.xml (original)
+++ development/main/metro/logging/providers/log4j/build.xml Thu Feb 3
09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-log4j-group" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/metro/logging/providers/log4j/impl/build.xml
==============================================================================
--- development/main/metro/logging/providers/log4j/impl/build.xml
(original)
+++ development/main/metro/logging/providers/log4j/impl/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-log4j" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="net.dpml.logging.log4j.Log4JLoggingFactory"/>

Modified: development/main/metro/logging/providers/log4j/test/build.xml
==============================================================================
--- development/main/metro/logging/providers/log4j/test/build.xml
(original)
+++ development/main/metro/logging/providers/log4j/test/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-log4j-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-logging-log4j" feature="plugin"

Modified: development/main/metro/logging/providers/logkit/api/build.xml
==============================================================================
--- development/main/metro/logging/providers/logkit/api/build.xml
(original)
+++ development/main/metro/logging/providers/logkit/api/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-logkit-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/logging/providers/logkit/build.xml
==============================================================================
--- development/main/metro/logging/providers/logkit/build.xml (original)
+++ development/main/metro/logging/providers/logkit/build.xml Thu Feb 3
09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-logkit" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/metro/logging/providers/logkit/impl/build.xml
==============================================================================
--- development/main/metro/logging/providers/logkit/impl/build.xml
(original)
+++ development/main/metro/logging/providers/logkit/impl/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-logkit-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="net.dpml.logging.logkit.DefaultLoggingFactory"/>

Modified: development/main/metro/logging/providers/logkit/plugins/build.xml
==============================================================================
--- development/main/metro/logging/providers/logkit/plugins/build.xml
(original)
+++ development/main/metro/logging/providers/logkit/plugins/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/metro/logging/providers/logkit/plugins/datagram/build.xml
==============================================================================
---
development/main/metro/logging/providers/logkit/plugins/datagram/build.xml
(original)
+++
development/main/metro/logging/providers/logkit/plugins/datagram/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-logkit-datagram" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export
class="net.dpml.logging.logkit.datagram.DatagramTargetFactory"/>

Modified:
development/main/metro/logging/providers/logkit/plugins/socket/build.xml
==============================================================================
--- development/main/metro/logging/providers/logkit/plugins/socket/build.xml
(original)
+++ development/main/metro/logging/providers/logkit/plugins/socket/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-logkit-socket" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="package" depends="standard.package">
<x:export class="net.dpml.logging.logkit.socket.SocketTargetFactory"/>

Modified:
development/main/metro/logging/providers/logkit/plugins/syslog/build.xml
==============================================================================
--- development/main/metro/logging/providers/logkit/plugins/syslog/build.xml
(original)
+++ development/main/metro/logging/providers/logkit/plugins/syslog/build.xml
Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-logkit-syslog" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter feature="plugin" token="PLUGIN-URI"/>

Modified: development/main/metro/logging/providers/logkit/test/build.xml
==============================================================================
--- development/main/metro/logging/providers/logkit/test/build.xml
(original)
+++ development/main/metro/logging/providers/logkit/test/build.xml Thu
Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-logkit-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-logging-logkit-impl" feature="plugin"

Modified: development/main/metro/logging/spi/build.xml
==============================================================================
--- development/main/metro/logging/spi/build.xml (original)
+++ development/main/metro/logging/spi/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-logging-spi" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/main/build.xml
==============================================================================
--- development/main/metro/main/build.xml (original)
+++ development/main/metro/main/build.xml Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-metro-main" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter feature="plugin" token="METRO-PLUGIN-URI"/>

Modified: development/main/metro/meta/api/build.xml
==============================================================================
--- development/main/metro/meta/api/build.xml (original)
+++ development/main/metro/meta/api/build.xml Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-meta-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/meta/build.xml
==============================================================================
--- development/main/metro/meta/build.xml (original)
+++ development/main/metro/meta/build.xml Thu Feb 3 09:17:41 2005
@@ -19,8 +19,8 @@
-->

<project name="dpml-metro-meta" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/metro/meta/impl/build.xml
==============================================================================
--- development/main/metro/meta/impl/build.xml (original)
+++ development/main/metro/meta/impl/build.xml Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-meta-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<filter token="TYPE-DTD-PUBLIC-ID" value="-//DPML/Metro/Type DTD Version
1.0//EN" />

Modified: development/main/metro/meta/spi/build.xml
==============================================================================
--- development/main/metro/meta/spi/build.xml (original)
+++ development/main/metro/meta/spi/build.xml Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-meta-spi" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/meta/tools/build.xml
==============================================================================
--- development/main/metro/meta/tools/build.xml (original)
+++ development/main/metro/meta/tools/build.xml Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-meta-tools" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:export class="net.dpml.meta.info.ant.MetaBuildListener"/>

Modified: development/main/metro/module.xml
==============================================================================
--- development/main/metro/module.xml (original)
+++ development/main/metro/module.xml Thu Feb 3 09:17:41 2005
@@ -18,11 +18,10 @@
-->

<project name="dpml-metro" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
- <magic:import uri="artifact:template:dpml/magic/checkstyle"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:module index="index.xml">

Modified: development/main/metro/parameters/api/build.xml
==============================================================================
--- development/main/metro/parameters/api/build.xml (original)
+++ development/main/metro/parameters/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-parameters-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/parameters/impl/build.xml
==============================================================================
--- development/main/metro/parameters/impl/build.xml (original)
+++ development/main/metro/parameters/impl/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-parameters-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/service/api/build.xml
==============================================================================
--- development/main/metro/service/api/build.xml (original)
+++ development/main/metro/service/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-service-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/system/api/build.xml
==============================================================================
--- development/main/metro/system/api/build.xml (original)
+++ development/main/metro/system/api/build.xml Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-system-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/system/impl/build.xml
==============================================================================
--- development/main/metro/system/impl/build.xml (original)
+++ development/main/metro/system/impl/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-system-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-logging-logkit-impl" feature="plugin"
token="DEFAULT_LOGGING_PLUGIN"/>

Modified: development/main/metro/system/spi/build.xml
==============================================================================
--- development/main/metro/system/spi/build.xml (original)
+++ development/main/metro/system/spi/build.xml Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-system-spi" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/system/test/build.xml
==============================================================================
--- development/main/metro/system/test/build.xml (original)
+++ development/main/metro/system/test/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-system-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter key="dpml-transit-main" feature="uri" token="CACHE_MAIN_URI"/>

Modified: development/main/metro/testing/build.xml
==============================================================================
--- development/main/metro/testing/build.xml (original)
+++ development/main/metro/testing/build.xml Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/metro/testing/cli/build.xml
==============================================================================
--- development/main/metro/testing/cli/build.xml (original)
+++ development/main/metro/testing/cli/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-metro-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter feature="plugin" key="dpml-metro-cli" token="METRO-CLI-SPEC"/>

Modified: development/main/metro/testing/components/build.xml
==============================================================================
--- development/main/metro/testing/components/build.xml (original)
+++ development/main/metro/testing/components/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-components" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/testing/dynamics/build.xml
==============================================================================
--- development/main/metro/testing/dynamics/build.xml (original)
+++ development/main/metro/testing/dynamics/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-dynamics" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/testing/includes/build.xml
==============================================================================
--- development/main/metro/testing/includes/build.xml (original)
+++ development/main/metro/testing/includes/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-includes" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<property name="dpml.meta.namespace" value="avalon"/>


Modified: development/main/metro/testing/playground/build.xml
==============================================================================
--- development/main/metro/testing/playground/build.xml (original)
+++ development/main/metro/testing/playground/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-playground" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="playground" embed="MAIN">

Modified: development/main/metro/testing/testa/build.xml
==============================================================================
--- development/main/metro/testing/testa/build.xml (original)
+++ development/main/metro/testing/testa/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-testa" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/testing/testb/build.xml
==============================================================================
--- development/main/metro/testing/testb/build.xml (original)
+++ development/main/metro/testing/testb/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-testb" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/testing/testc/build.xml
==============================================================================
--- development/main/metro/testing/testc/build.xml (original)
+++ development/main/metro/testing/testc/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-testc" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/testing/testcyclic/build.xml
==============================================================================
--- development/main/metro/testing/testcyclic/build.xml (original)
+++ development/main/metro/testing/testcyclic/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-testcyclic" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/testing/testd/build.xml
==============================================================================
--- development/main/metro/testing/testd/build.xml (original)
+++ development/main/metro/testing/testd/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-testd" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/testing/teste/build.xml
==============================================================================
--- development/main/metro/testing/teste/build.xml (original)
+++ development/main/metro/testing/teste/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-teste" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/testing/testschema/build.xml
==============================================================================
--- development/main/metro/testing/testschema/build.xml (original)
+++ development/main/metro/testing/testschema/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-test-testschema" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/metro/unit/build.xml
==============================================================================
--- development/main/metro/unit/build.xml (original)
+++ development/main/metro/unit/build.xml Thu Feb 3 09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-metro-unit" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
<x:filter feature="plugin" key="dpml-composition-impl"
token="COMPOSITION_PLUGIN_URI"/>
@@ -12,9 +12,9 @@

<target name="documentation" depends="install">
<x:property name="mdoc.spec" feature="plugin" key="dpml-magic-mdoc"/>
- <magic:plugin uri="${mdoc.spec}">
+ <transit:plugin uri="${mdoc.spec}">
<task class="net.dpml.magic.mdoc.ModuleDocTask" name="doc"/>
- </magic:plugin>
+ </transit:plugin>
<doc>
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
<link href="http://www.dpml.net/asf/ant/1.6.2/api"/>

Modified: development/main/metro/util/defaults/build.xml
==============================================================================
--- development/main/metro/util/defaults/build.xml (original)
+++ development/main/metro/util/defaults/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-util-defaults" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/planet/build.xml
==============================================================================
--- development/main/planet/build.xml (original)
+++ development/main/planet/build.xml Thu Feb 3 09:17:41 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-planet" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/build.xml
==============================================================================
--- development/main/planet/facilities/build.xml (original)
+++ development/main/planet/facilities/build.xml Thu Feb 3 09:17:41
2005
@@ -17,8 +17,8 @@
-->

<project name="dpml-facilities" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/console/api/build.xml
==============================================================================
--- development/main/planet/facilities/console/api/build.xml (original)
+++ development/main/planet/facilities/console/api/build.xml Thu Feb 3
09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="dpml-console-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/planet/facilities/console/blocks/build.xml
==============================================================================
--- development/main/planet/facilities/console/blocks/build.xml (original)
+++ development/main/planet/facilities/console/blocks/build.xml Thu Feb 3
09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="dpml-console-blocks" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/console/blocks/default/build.xml
==============================================================================
--- development/main/planet/facilities/console/blocks/default/build.xml
(original)
+++ development/main/planet/facilities/console/blocks/default/build.xml Thu
Feb 3 09:17:41 2005
@@ -3,9 +3,9 @@
<project name="dpml-console-default"
default="install"
basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">


Modified: development/main/planet/facilities/console/build.xml
==============================================================================
--- development/main/planet/facilities/console/build.xml (original)
+++ development/main/planet/facilities/console/build.xml Thu Feb 3
09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="runtime" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/console/commands/build.xml
==============================================================================
--- development/main/planet/facilities/console/commands/build.xml
(original)
+++ development/main/planet/facilities/console/commands/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="dpml-console-commands" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/planet/facilities/console/impl/build.xml
==============================================================================
--- development/main/planet/facilities/console/impl/build.xml (original)
+++ development/main/planet/facilities/console/impl/build.xml Thu Feb 3
09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="dpml-console-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/planet/facilities/db/api/build.xml
==============================================================================
--- development/main/planet/facilities/db/api/build.xml (original)
+++ development/main/planet/facilities/db/api/build.xml Thu Feb 3 09:17:41
2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-db-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/db/build.xml
==============================================================================
--- development/main/planet/facilities/db/build.xml (original)
+++ development/main/planet/facilities/db/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="db" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/db/hsql/build.xml
==============================================================================
--- development/main/planet/facilities/db/hsql/build.xml (original)
+++ development/main/planet/facilities/db/hsql/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-db-hsql" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="hsql" embed="MAIN">

Modified: development/main/planet/facilities/dbcp/api/build.xml
==============================================================================
--- development/main/planet/facilities/dbcp/api/build.xml (original)
+++ development/main/planet/facilities/dbcp/api/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-dbcp-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/dbcp/build.xml
==============================================================================
--- development/main/planet/facilities/dbcp/build.xml (original)
+++ development/main/planet/facilities/dbcp/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dbcp" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/dbcp/impl/build.xml
==============================================================================
--- development/main/planet/facilities/dbcp/impl/build.xml (original)
+++ development/main/planet/facilities/dbcp/impl/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-dbcp-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:property name="hsql.spec" key="dpml-db-hsql" feature="uri"/>

Modified: development/main/planet/facilities/finder/api/build.xml
==============================================================================
--- development/main/planet/facilities/finder/api/build.xml (original)
+++ development/main/planet/facilities/finder/api/build.xml Thu Feb 3
09:17:41 2005
@@ -16,9 +16,9 @@
-->

<project name="dpml-finder-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/finder/build.xml
==============================================================================
--- development/main/planet/facilities/finder/build.xml (original)
+++ development/main/planet/facilities/finder/build.xml Thu Feb 3 09:17:41
2005
@@ -16,8 +16,8 @@
-->

<project name="finder" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/finder/impl/build.xml
==============================================================================
--- development/main/planet/facilities/finder/impl/build.xml (original)
+++ development/main/planet/facilities/finder/impl/build.xml Thu Feb 3
09:17:41 2005
@@ -16,9 +16,9 @@
-->

<project name="dpml-finder-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="finder" embed="MAIN">

Modified: development/main/planet/facilities/finder/test/build.xml
==============================================================================
--- development/main/planet/facilities/finder/test/build.xml (original)
+++ development/main/planet/facilities/finder/test/build.xml Thu Feb 3
09:17:41 2005
@@ -16,9 +16,9 @@
-->

<project name="dpml-finder-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="test" embed="MAIN" standalone="false">

Modified: development/main/planet/facilities/http/api/build.xml
==============================================================================
--- development/main/planet/facilities/http/api/build.xml (original)
+++ development/main/planet/facilities/http/api/build.xml Thu Feb 3
09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/http/blocks/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/build.xml (original)
+++ development/main/planet/facilities/http/blocks/build.xml Thu Feb 3
09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="dpml-http-blocks" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/http/blocks/context/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/context/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/context/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-context" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="default-context">

Modified: development/main/planet/facilities/http/blocks/hash-basic/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/hash-basic/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/hash-basic/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-hash-basic" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="hash-basic-auth">

Modified:
development/main/planet/facilities/http/blocks/hash-clientcert/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/hash-clientcert/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/hash-clientcert/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-hash-clientcert" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="hash-clientcert-auth">

Modified: development/main/planet/facilities/http/blocks/hash-digest/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/hash-digest/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/hash-digest/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-hash-digest" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="hash-digest-auth">

Modified: development/main/planet/facilities/http/blocks/hash-form/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/hash-form/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/hash-form/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-hash-form" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="hash-form-auth">

Modified: development/main/planet/facilities/http/blocks/server/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/server/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/server/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-server" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="http-server">

Modified: development/main/planet/facilities/http/blocks/servlet/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/servlet/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/servlet/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-servlet" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="servlet">

Modified: development/main/planet/facilities/http/blocks/static/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/static/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/static/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-static" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="static">

Modified: development/main/planet/facilities/http/blocks/tapestry/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/tapestry/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/tapestry/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-tapestry" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:property name="webappserver.uri"

Modified:
development/main/planet/facilities/http/blocks/webappserver/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/webappserver/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/webappserver/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-webappserver" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">


Modified: development/main/planet/facilities/http/build.xml
==============================================================================
--- development/main/planet/facilities/http/build.xml (original)
+++ development/main/planet/facilities/http/build.xml Thu Feb 3 09:17:41
2005
@@ -17,8 +17,8 @@
-->

<project name="http" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/http/documentation/build.xml
==============================================================================
--- development/main/planet/facilities/http/documentation/build.xml
(original)
+++ development/main/planet/facilities/http/documentation/build.xml Thu
Feb 3 09:17:41 2005
@@ -20,16 +20,16 @@
name="dpml-http-docs"
default="install"
basedir="."
- xmlns:magic="antlib:net.dpml.magic"
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core"
>
- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="docs" depends="prepare">
<x:property name="spec" feature="plugin" key="dpml-magic-doc"/>
- <magic:plugin uri="${spec}">
+ <transit:plugin uri="${spec}">
<task class="net.dpml.magic.doc.DocTask" name="docs"/>
- </magic:plugin>
+ </transit:plugin>
<docs/>
</target>


Modified: development/main/planet/facilities/http/examples/build.xml
==============================================================================
--- development/main/planet/facilities/http/examples/build.xml (original)
+++ development/main/planet/facilities/http/examples/build.xml Thu Feb 3
09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="http-examples" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/planet/facilities/http/examples/hangman/api/build.xml
==============================================================================
--- development/main/planet/facilities/http/examples/hangman/api/build.xml
(original)
+++ development/main/planet/facilities/http/examples/hangman/api/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="hangman-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified:
development/main/planet/facilities/http/examples/hangman/app/build.xml
==============================================================================
--- development/main/planet/facilities/http/examples/hangman/app/build.xml
(original)
+++ development/main/planet/facilities/http/examples/hangman/app/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,11 +17,11 @@
-->

<project name="hangman-app" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<x:filter token="HANGMAN_WAR_URI" feature="uri" key="hangman-view" />

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build" >
<x:property name="hangman.uri" key="hangman-game" feature="block"/>

Modified:
development/main/planet/facilities/http/examples/hangman/block/build.xml
==============================================================================
--- development/main/planet/facilities/http/examples/hangman/block/build.xml
(original)
+++ development/main/planet/facilities/http/examples/hangman/block/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="hangman-block" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/planet/facilities/http/examples/hangman/build.xml
==============================================================================
--- development/main/planet/facilities/http/examples/hangman/build.xml
(original)
+++ development/main/planet/facilities/http/examples/hangman/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="http-hangman" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified:
development/main/planet/facilities/http/examples/hangman/game/build.xml
==============================================================================
--- development/main/planet/facilities/http/examples/hangman/game/build.xml
(original)
+++ development/main/planet/facilities/http/examples/hangman/game/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="hangman-game" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build" >


Modified:
development/main/planet/facilities/http/examples/hangman/view/build.xml
==============================================================================
--- development/main/planet/facilities/http/examples/hangman/view/build.xml
(original)
+++ development/main/planet/facilities/http/examples/hangman/view/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="hangman-view" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<mkdir dir="target/deliverables/wars/" />

Modified: development/main/planet/facilities/http/examples/hello/build.xml
==============================================================================
--- development/main/planet/facilities/http/examples/hello/build.xml
(original)
+++ development/main/planet/facilities/http/examples/hello/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-hello" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">


Modified: development/main/planet/facilities/http/impl/build.xml
==============================================================================
--- development/main/planet/facilities/http/impl/build.xml (original)
+++ development/main/planet/facilities/http/impl/build.xml Thu Feb 3
09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="dpml-http-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/planet/facilities/http/index.xml
==============================================================================
--- development/main/planet/facilities/http/index.xml (original)
+++ development/main/planet/facilities/http/index.xml Thu Feb 3 09:17:41
2005
@@ -29,9 +29,6 @@
<status>SNAPSHOT</status>
<type>module</type>
</info>
- <plugins>
- <include key="dpml-magic-checkstyle"/>
- </plugins>
<dependencies>
<include key="dpml-util"/>
<include key="dpml-transit"/>

Modified: development/main/planet/facilities/http/module.xml
==============================================================================
--- development/main/planet/facilities/http/module.xml (original)
+++ development/main/planet/facilities/http/module.xml Thu Feb 3 09:17:41
2005
@@ -17,12 +17,11 @@
limitations under the License.
-->

-<project name="dpml-http" default="docs" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
+<project name="dpml-http" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
- <magic:import uri="artifact:template:dpml/magic/checkstyle"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:module index="index.xml">
@@ -33,7 +32,7 @@
</x:module>
</target>

- <target name="docs" depends="install,checkstyle">
+ <target name="install" depends="standard.install,checkstyle,junit-report">
<x:javadoc>
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
<group title="HTTP Facility">
@@ -49,7 +48,7 @@
</x:javadoc>
</target>

- <target name="junit-report">
+ <target name="junit-report" depends="test">
<mkdir dir="target/reports/junit"/>
<junitreport todir="target/reports/junit">
<fileset dir=".">

Modified: development/main/planet/facilities/http/spi/build.xml
==============================================================================
--- development/main/planet/facilities/http/spi/build.xml (original)
+++ development/main/planet/facilities/http/spi/build.xml Thu Feb 3
09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-spi" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/http/test/build.xml
==============================================================================
--- development/main/planet/facilities/http/test/build.xml (original)
+++ development/main/planet/facilities/http/test/build.xml Thu Feb 3
09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="test">

Modified: development/main/planet/facilities/http/util/build.xml
==============================================================================
--- development/main/planet/facilities/http/util/build.xml (original)
+++ development/main/planet/facilities/http/util/build.xml Thu Feb 3
09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-http-util" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/javadoc/build.xml
==============================================================================
--- development/main/planet/facilities/javadoc/build.xml (original)
+++ development/main/planet/facilities/javadoc/build.xml Thu Feb 3
09:17:41 2005
@@ -16,8 +16,8 @@
-->

<project name="dpml-facilities" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/planet/facilities/jms/api/build.xml
==============================================================================
--- development/main/planet/facilities/jms/api/build.xml (original)
+++ development/main/planet/facilities/jms/api/build.xml Thu Feb 3
09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-jms-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/jms/build.xml
==============================================================================
--- development/main/planet/facilities/jms/build.xml (original)
+++ development/main/planet/facilities/jms/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="avalon-jms" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/jms/impl/build.xml
==============================================================================
--- development/main/planet/facilities/jms/impl/build.xml (original)
+++ development/main/planet/facilities/jms/impl/build.xml Thu Feb 3
09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-jms-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="jms" embed="MAIN">

Modified: development/main/planet/facilities/jms/test/build.xml
==============================================================================
--- development/main/planet/facilities/jms/test/build.xml (original)
+++ development/main/planet/facilities/jms/test/build.xml Thu Feb 3
09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-jms-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/jmx/api/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/api/build.xml (original)
+++ development/main/planet/facilities/jmx/api/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-jmx-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/jmx/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/build.xml (original)
+++ development/main/planet/facilities/jmx/build.xml Thu Feb 3 09:17:41
2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="jmx" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/jmx/handler/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/handler/build.xml (original)
+++ development/main/planet/facilities/jmx/handler/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-jmx-handler" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:property name="mx4j.spec" key="dpml-jmx-mx4j" feature="uri"/>

Modified: development/main/planet/facilities/jmx/mx4j/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/mx4j/build.xml (original)
+++ development/main/planet/facilities/jmx/mx4j/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-jmx-mx4j" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="jmx" embed="MAIN">

Modified: development/main/planet/facilities/jmx/spi/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/spi/build.xml (original)
+++ development/main/planet/facilities/jmx/spi/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-jmx-spi" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/jmx/test/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/test/build.xml (original)
+++ development/main/planet/facilities/jmx/test/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-jmx-test" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="jmx" embed="MAIN">

Modified: development/main/planet/facilities/jmx/util/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/util/build.xml (original)
+++ development/main/planet/facilities/jmx/util/build.xml Thu Feb 3
09:17:41 2005
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="dpml-jmx-util" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/reflector/api/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/api/build.xml (original)
+++ development/main/planet/facilities/reflector/api/build.xml Thu Feb 3
09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-reflector-api" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified:
development/main/planet/facilities/reflector/blocks/complete/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/blocks/complete/build.xml
(original)
+++ development/main/planet/facilities/reflector/blocks/complete/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-reflector-blocks-complete" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">


Modified:
development/main/planet/facilities/reflector/blocks/standard/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/blocks/standard/build.xml
(original)
+++ development/main/planet/facilities/reflector/blocks/standard/build.xml
Thu Feb 3 09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-reflector-blocks-standard" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+ xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">


Modified: development/main/planet/facilities/reflector/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/build.xml (original)
+++ development/main/planet/facilities/reflector/build.xml Thu Feb 3
09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="reflector" default="default" basedir="."
- xmlns:magic="antlib:net.dpml.magic">
+ xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>

Modified: development/main/planet/facilities/reflector/impl/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/impl/build.xml (original)
+++ development/main/planet/facilities/reflector/impl/build.xml Thu Feb 3
09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="dpml-reflector-impl" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/planet/facilities/reflector/spi/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/spi/build.xml (original)
+++ development/main/planet/facilities/reflector/spi/build.xml Thu Feb 3
09:17:41 2005
@@ -17,9 +17,9 @@
-->

<project name="dpml-reflector-spi" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>


Modified: development/main/planet/facilities/reflector/typehandlers/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/typehandlers/build.xml
(original)
+++ development/main/planet/facilities/reflector/typehandlers/build.xml Thu
Feb 3 09:17:41 2005
@@ -17,8 +17,8 @@
-->

<project name="dpml-reflector-typehandlers" default="install" basedir="."
- xmlns:magic="antlib:net.dpml.magic" >
+ xmlns:transit="antlib:net.dpml.transit" >

- <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <transit:import uri="artifact:template:dpml/magic/standard"/>

</project>

---

• svn commit: r1709 - in development/main: . central central/install central/site central/site/src/docs/guide/setup central/site/src/docs/guide/transit/000/plugins/simple central/site/src/docs/guide/transit/plugins/simple central/site/src/docs/products/magic/antlib central/site/src/docs/products/magic/plugins/checkstyle central/site/src/docs/products/magic/plugins/eclipse central/site/src/docs/products/magic/tasks central/tutorials/metro central/tutorials/metro/composition central/tutorials/metro/composition/application central/tutorials/metro/composition/application/impl central/tutorials/metro/composition/location central/tutorials/metro/composition/location/api central/tutorials/metro/composition/location/impl central/tutorials/metro/composition/publisher central/tutorials/metro/composition/publisher/api central/tutorials/metro/composition/publisher/impl central/tutorials/metro/configuration central/tutorials/metro/configuration/block central/tutorials/metro/configuration/defaults central/tutorials/metro/configuration/injection central/tutorials/metro/configuration/override central/tutorials/metro/context central/tutorials/metro/context/alias central/tutorials/metro/context/casting central/tutorials/metro/context/custom central/tutorials/metro/context/injection central/tutorials/metro/context/phased central/tutorials/metro/context/strategy central/tutorials/metro/dependencies central/tutorials/metro/dependencies/auto central/tutorials/metro/dependencies/manual central/tutorials/metro/dynamics central/tutorials/metro/hello central/tutorials/metro/lifecycle central/tutorials/metro/lifecycle/modern central/tutorials/metro/main central/tutorials/metro/parameterization central/tutorials/metro/profiles central/tutorials/metro/selection central/tutorials/metro/startable central/tutorials/transit central/tutorials/transit/artifact central/tutorials/transit/extension central/tutorials/transit/plugins central/tutorials/transit/plugins/cli central/tutorials/transit/plugins/controller central/tutorials/transit/plugins/simple home/transit/installer magic magic/bootstrap magic/core magic/core/etc/deliverables/formats magic/core/etc/deliverables/templates magic/core/etc/deliverables/xsls magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/tasks magic/spells magic/spells/bar magic/spells/checkstyle magic/spells/doc magic/spells/doc/task magic/spells/doc/task/src/main/net/dpml/magic/doc magic/spells/doc/themes magic/spells/doc/themes/modern magic/spells/eclipse magic/spells/example magic/spells/publish magic/spells/style magic/spells/upload magic/test metro metro/activation/api metro/activation/impl metro/activation/providers metro/activation/providers/avalon metro/activation/providers/metro metro/activation/test metro/activity/api metro/composition metro/composition/api metro/composition/impl metro/composition/spi metro/composition/test metro/configuration/api metro/configuration/impl metro/context/api metro/context/impl metro/extension/api metro/extension/impl metro/logging/api metro/logging/criteria metro/logging/data metro/logging/providers metro/logging/providers/log4j metro/logging/providers/log4j/impl metro/logging/providers/log4j/test metro/logging/providers/logkit metro/logging/providers/logkit/api metro/logging/providers/logkit/impl metro/logging/providers/logkit/plugins metro/logging/providers/logkit/plugins/datagram metro/logging/providers/logkit/plugins/socket metro/logging/providers/logkit/plugins/syslog metro/logging/providers/logkit/test metro/logging/spi metro/main metro/meta metro/meta/api metro/meta/impl metro/meta/spi metro/meta/tools metro/parameters/api metro/parameters/impl metro/service/api metro/system/api metro/system/impl metro/system/spi metro/system/test metro/testing metro/testing/cli metro/testing/components metro/testing/dynamics metro/testing/includes metro/testing/playground metro/testing/testa metro/testing/testb metro/testing/testc metro/testing/testcyclic metro/testing/testd metro/testing/teste metro/testing/testschema metro/unit metro/util/defaults planet planet/facilities planet/facilities/console planet/facilities/console/api planet/facilities/console/blocks planet/facilities/console/blocks/default planet/facilities/console/commands planet/facilities/console/impl planet/facilities/db planet/facilities/db/api planet/facilities/db/hsql planet/facilities/dbcp planet/facilities/dbcp/api planet/facilities/dbcp/impl planet/facilities/finder planet/facilities/finder/api planet/facilities/finder/impl planet/facilities/finder/test planet/facilities/http planet/facilities/http/api planet/facilities/http/blocks planet/facilities/http/blocks/context planet/facilities/http/blocks/hash-basic planet/facilities/http/blocks/hash-clientcert planet/facilities/http/blocks/hash-digest planet/facilities/http/blocks/hash-form planet/facilities/http/blocks/server planet/facilities/http/blocks/servlet planet/facilities/http/blocks/static planet/facilities/http/blocks/tapestry planet/facilities/http/blocks/webappserver planet/facilities/http/documentation planet/facilities/http/examples planet/facilities/http/examples/hangman planet/facilities/http/examples/hangman/api planet/facilities/http/examples/hangman/app planet/facilities/http/examples/hangman/block planet/facilities/http/examples/hangman/game planet/facilities/http/examples/hangman/view planet/facilities/http/examples/hello planet/facilities/http/impl planet/facilities/http/spi planet/facilities/http/test planet/facilities/http/util planet/facilities/javadoc planet/facilities/jms planet/facilities/jms/api planet/facilities/jms/impl planet/facilities/jms/test planet/facilities/jmx planet/facilities/jmx/api planet/facilities/jmx/handler planet/facilities/jmx/mx4j planet/facilities/jmx/spi planet/facilities/jmx/test planet/facilities/jmx/util planet/facilities/reflector planet/facilities/reflector/api planet/facilities/reflector/blocks/complete planet/facilities/reflector/blocks/standard planet/facilities/reflector/impl planet/facilities/reflector/spi planet/facilities/reflector/typehandlers transit, mcconnell, 02/03/2005

---

Archive powered by MHonArc 2.6.24.