Chronological Thread  

< Chronological >       < Thread >

---

Author: mcconnell
Date: Thu Dec 16 15:19:34 2004
New Revision: 1187

Added:
development/main/magic/bootstrap/src/main/net/dpml/magic/antlib.xml
(contents, props changed)
development/main/magic/core/src/main/net/dpml/magic/plugin.xml
- copied unchanged from r1186,
development/main/magic/core/src/main/net/dpml/magic/antlib.xml
development/main/metro/activation/
development/main/metro/composition/
development/main/metro/context/
development/main/metro/extension/
development/main/metro/logging/
development/main/metro/meta/
development/main/metro/modules/
development/main/metro/modules/private/
development/main/metro/modules/private/build.xml (contents, props
changed)
development/main/metro/modules/protected/
development/main/metro/modules/protected/build.xml (contents, props
changed)
development/main/metro/modules/public/
development/main/metro/modules/public/build.xml (contents, props changed)
development/main/metro/modules/tools/
development/main/metro/modules/tools/build.xml (contents, props changed)
development/main/metro/parameters/
development/main/metro/system/
development/main/metro/test/
development/main/metro/util/
Removed:
development/main/magic/bootstrap/src/main/net/dpml/transit/
development/main/magic/core/etc/deliverables/templates/reactor.xml
development/main/magic/core/etc/deliverables/templates/setup.xml
development/main/magic/core/etc/deliverables/templates/standard.xml
development/main/magic/core/src/main/net/dpml/magic/antlib.xml
development/main/magic/spells/checkstyle/README.TXT
development/main/metro/tools/index.xml
Modified:
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/deployment/plugins/simple/index.xml
development/main/central/site/src/docs/guide/setup/checkout.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/tasks/index.xml
development/main/central/site/src/docs/products/transit/tasks/index.xml
development/main/central/site/src/docs/products/transit/tasks/init.xml
development/main/central/site/src/docs/products/transit/tasks/plugin.xml

development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/MainTask.java

development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java

development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/package.html
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/tasks/InitializeTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
development/main/magic/module.xml
development/main/magic/spells/bar/build.xml
development/main/magic/spells/build.xml
development/main/magic/spells/checkstyle/build.xml

development/main/magic/spells/checkstyle/etc/deliverables/templates/checkstyle.template
development/main/magic/spells/doc/build.xml
development/main/magic/spells/doc/task/build.xml
development/main/magic/spells/doc/themes/build.xml
development/main/magic/spells/doc/themes/docbook.sf.net/build.xml
development/main/magic/spells/doc/themes/modern/build.xml
development/main/magic/spells/example/build.xml

development/main/magic/spells/example/src/main/net/dpml/magic/example/ExampleListener.java
development/main/magic/spells/publish/build.xml
development/main/magic/spells/style/build.xml
development/main/magic/spells/upload/build.xml
development/main/magic/spells/upload/etc/deliverables/templates/magic.xml
development/main/magic/test/build.xml
development/main/metro/build.xml
development/main/metro/index.xml
development/main/metro/private/activation/api/build.xml
development/main/metro/private/activation/build.xml
development/main/metro/private/activation/impl/build.xml
development/main/metro/private/activation/providers/avalon/build.xml
development/main/metro/private/activation/providers/build.xml
development/main/metro/private/activation/providers/metro/build.xml
development/main/metro/private/activation/test/build.xml
development/main/metro/private/build.xml
development/main/metro/private/composition/build.xml
development/main/metro/private/composition/impl/build.xml
development/main/metro/private/composition/spi/build.xml
development/main/metro/private/composition/test/build.xml
development/main/metro/private/configuration/build.xml
development/main/metro/private/context/build.xml
development/main/metro/private/extension/build.xml
development/main/metro/private/extension/impl/build.xml
development/main/metro/private/index.xml
development/main/metro/private/logging/build.xml
development/main/metro/private/logging/criteria/build.xml
development/main/metro/private/logging/providers/build.xml
development/main/metro/private/logging/providers/log4j/build.xml
development/main/metro/private/logging/providers/log4j/impl/build.xml
development/main/metro/private/logging/providers/log4j/test/build.xml
development/main/metro/private/logging/providers/logkit/api/build.xml
development/main/metro/private/logging/providers/logkit/build.xml
development/main/metro/private/logging/providers/logkit/impl/build.xml
development/main/metro/private/logging/providers/logkit/plugins/build.xml

development/main/metro/private/logging/providers/logkit/plugins/datagram/build.xml

development/main/metro/private/logging/providers/logkit/plugins/socket/build.xml

development/main/metro/private/logging/providers/logkit/plugins/syslog/build.xml
development/main/metro/private/logging/providers/logkit/test/build.xml
development/main/metro/private/logging/spi/build.xml
development/main/metro/private/meta/build.xml
development/main/metro/private/meta/impl/build.xml
development/main/metro/private/meta/spi/build.xml
development/main/metro/private/module.xml
development/main/metro/private/parameters/build.xml
development/main/metro/private/system/api/build.xml
development/main/metro/private/system/build.xml
development/main/metro/private/system/demo/build.xml
development/main/metro/private/system/impl/build.xml
development/main/metro/private/system/spi/build.xml
development/main/metro/private/system/test/build.xml
development/main/metro/private/test/build.xml
development/main/metro/private/test/cli/build.xml
development/main/metro/private/test/components/build.xml
development/main/metro/private/test/dynamics/build.xml
development/main/metro/private/test/includes/build.xml
development/main/metro/private/test/playground/build.xml
development/main/metro/private/test/testa/build.xml
development/main/metro/private/test/testb/build.xml
development/main/metro/private/test/testc/build.xml
development/main/metro/private/test/testcyclic/build.xml
development/main/metro/private/test/testd/build.xml
development/main/metro/private/test/teste/build.xml
development/main/metro/private/test/testschema/build.xml
development/main/metro/private/util/build.xml
development/main/metro/private/util/criteria/build.xml
development/main/metro/private/util/defaults/build.xml
development/main/metro/protected/build.xml
development/main/metro/protected/composition/build.xml
development/main/metro/protected/extension/build.xml
development/main/metro/protected/logging/build.xml
development/main/metro/protected/meta/build.xml
development/main/metro/protected/module.xml
development/main/metro/public/activity/build.xml
development/main/metro/public/build.xml
development/main/metro/public/configuration/build.xml
development/main/metro/public/context/build.xml
development/main/metro/public/logging/build.xml
development/main/metro/public/module.xml
development/main/metro/public/parameters/build.xml
development/main/metro/public/service/build.xml
development/main/metro/tools/build.xml
development/main/metro/tools/main/build.xml
development/main/metro/tools/meta/build.xml

development/main/metro/tools/meta/src/main/net/dpml/meta/info/ant/MetaBuildListener.java
development/main/metro/tools/module.xml
development/main/metro/tools/unit/build.xml
development/main/metro/tutorials/build.xml
development/main/metro/tutorials/composition/application/build.xml
development/main/metro/tutorials/composition/application/impl/build.xml
development/main/metro/tutorials/composition/build.xml
development/main/metro/tutorials/composition/location/api/build.xml
development/main/metro/tutorials/composition/location/build.xml
development/main/metro/tutorials/composition/location/impl/build.xml
development/main/metro/tutorials/composition/publisher/api/build.xml
development/main/metro/tutorials/composition/publisher/build.xml
development/main/metro/tutorials/composition/publisher/impl/build.xml
development/main/metro/tutorials/configuration/block/build.xml
development/main/metro/tutorials/configuration/build.xml
development/main/metro/tutorials/configuration/defaults/build.xml
development/main/metro/tutorials/configuration/injection/build.xml
development/main/metro/tutorials/configuration/override/build.xml
development/main/metro/tutorials/context/alias/build.xml
development/main/metro/tutorials/context/build.xml
development/main/metro/tutorials/context/casting/build.xml
development/main/metro/tutorials/context/custom/build.xml
development/main/metro/tutorials/context/injection/build.xml
development/main/metro/tutorials/context/phased/build.xml
development/main/metro/tutorials/context/strategy/build.xml
development/main/metro/tutorials/dependencies/auto/build.xml
development/main/metro/tutorials/dependencies/build.xml
development/main/metro/tutorials/dependencies/manual/build.xml
development/main/metro/tutorials/dynamics/build.xml
development/main/metro/tutorials/hello/build.xml
development/main/metro/tutorials/index.xml
development/main/metro/tutorials/lifecycle/build.xml
development/main/metro/tutorials/lifecycle/modern/build.xml
development/main/metro/tutorials/main/build.xml
development/main/metro/tutorials/parameterization/build.xml
development/main/metro/tutorials/profiles/build.xml
development/main/metro/tutorials/selection/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/demo/build.xml
development/main/planet/facilities/http/blocks/examples/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/build.xml
development/main/planet/facilities/http/impl/build.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
development/main/transit/build.xml
development/main/transit/module.xml
development/main/transit/plugin/build.xml
development/main/transit/tutorials/artifact/build.xml
development/main/transit/tutorials/build.xml
development/main/transit/tutorials/extension/build.xml
development/main/transit/tutorials/plugins/build.xml
development/main/transit/tutorials/plugins/cli/build.xml
development/main/transit/tutorials/plugins/controller/build.xml
development/main/transit/tutorials/plugins/simple/build.xml
development/main/util/build.xml
development/main/util/cli/build.xml
development/main/util/criteria/build.xml
development/main/util/exception/build.xml
development/main/util/i18n/build.xml
development/main/util/module.xml
Log:
First phase on commit - includes updates to antlib urns and code changes
related to this.

Modified: development/main/build.xml
==============================================================================
--- development/main/build.xml (original)
+++ development/main/build.xml Thu Dec 16 15:19:34 2004
@@ -20,9 +20,9 @@


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

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

<target name="junit-report">
<mkdir dir="target/reports/junit"/>

Modified: development/main/central/build.xml
==============================================================================
--- development/main/central/build.xml (original)
+++ development/main/central/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16 15:19:34 2004
@@ -4,7 +4,7 @@

<import index="../magic/index.xml"
uri="artifact:module:dpml/magic/dpml-magic#SNAPSHOT"/>
- <import index="../metro/tools/index.xml"
+ <import index="../metro/index.xml"
uri="artifact:module:dpml/metro/tools/dpml-metro-tools#SNAPSHOT"/>
<import index="../metro/tutorials/index.xml" />


Modified: development/main/central/install/build.xml
==============================================================================
--- development/main/central/install/build.xml (original)
+++ development/main/central/install/build.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34 2004
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

<target name="init" depends="standard.init">
<x:filter key="dpml-metro-main" feature="version"
@@ -69,14 +69,14 @@

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

<target name="update" depends="docs">
- <p:publish path="central"/>
+ <publish xmlns="plugin:dpml/magic/dpml-magic-publish" path="central"/>
</target>

<target name="install" depends="docs"/>

Modified:
development/main/central/site/src/docs/guide/deployment/plugins/simple/index.xml
==============================================================================
---
development/main/central/site/src/docs/guide/deployment/plugins/simple/index.xml
(original)
+++
development/main/central/site/src/docs/guide/deployment/plugins/simple/index.xml
Thu Dec 16 15:19:34 2004
@@ -73,10 +73,10 @@
</p>

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

- <transit:init/>
- <import file="${dpml.templates}/standard.xml"/>
+
+ <magic: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/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
Dec 16 15:19:34 2004
@@ -38,13 +38,10 @@

<p>
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 (please check the messages at the end of
the setup
- process and the procedure may request the re-execution of setup
depending on
- your environment).
+ environment with junit and a bootstrap build of transit and magic.
</p>

- <source>$ ant setup</source>
+ <source>$ ant -file setup.xml</source>

<p>
Once the setup procedure is complete you can proceed with the normal
build of
@@ -54,13 +51,6 @@

<source>$ ant</source>

- <p>
- The following convenience goal copies the command line scripts from
the DPML
- main cache to your ${dpml.home}/bin directory.
- </p>
-
- <source>$ ant bin</source>
-
</subsection>

<subsection name="Next Steps">

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 Dec 16 15:19:34 2004
@@ -11,7 +11,7 @@

<subsection name="Namespace">

-<source>antlib:net.dpml.transit</source>
+<source>antlib:net.dpml.magic</source>

</subsection>

@@ -34,7 +34,7 @@

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

<transit:init>
<plugin uri="@MAGIC-CORE-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 Dec 16 15:19:34 2004
@@ -19,13 +19,12 @@

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

- <transit:init/>
+ <magic:init/>

<echo message="Home: ${dpml.home}"/>
<echo message="Cache: ${dpml.cache}"/>
- <echo message="Templates: ${dpml.templates}"/>
<echo message="Docs: ${dpml.docs}"/>

</project>
@@ -35,7 +34,6 @@
<pre><![CDATA[
[echo] Home: C:\system\dpml
[echo] Cache: C:\system\dpml\main
- [echo] Templates: C:\system\dpml\templates
[echo] Docs: C:\system\dpml\docs
]]></pre>


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 Dec 16 15:19:34 2004
@@ -18,17 +18,17 @@
<p><i>Example of a request to load an antlib.</i></p>

<source><![CDATA[
- <transit:plugin uri="artifact:meta:dpml/magic/dpml-magic-core#SNAPSHOT">
- <antlib resource="net/dpml/magic/antlib.xml"
urn="antlib:net.dpml.magic"/>
- </transit:plugin>
+ <magic:plugin uri="artifact:meta:dpml/magic/dpml-magic-core#SNAPSHOT">
+ <antlib resource="net/dpml/magic/antlib.xml"
urn="plugin:dpml/magic/dpml-magic-core"/>
+ </magic:plugin>
]]></source>

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

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


Modified:
development/main/central/site/src/docs/products/magic/tasks/index.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/tasks/index.xml
(original)
+++ development/main/central/site/src/docs/products/magic/tasks/index.xml
Thu Dec 16 15:19:34 2004
@@ -11,7 +11,7 @@

<subsection name="Namespace">

-<source>antlib:net.dpml.magic</source>
+<source>plugin:dpml/magic/dpml-magic-core</source>

</subsection>

@@ -27,7 +27,7 @@

<pre><![CDATA[
<project name="example"
- xmlns:x="antlib:net.dpml.magic">
+ xmlns:x="plugin:dpml/magic/dpml-magic-core">
....
</project>
]]></pre>

Modified:
development/main/central/site/src/docs/products/transit/tasks/index.xml
==============================================================================
--- development/main/central/site/src/docs/products/transit/tasks/index.xml
(original)
+++ development/main/central/site/src/docs/products/transit/tasks/index.xml
Thu Dec 16 15:19:34 2004
@@ -11,7 +11,7 @@

<subsection name="Namespace">

-<source>antlib:net.dpml.transit</source>
+<source>antlib:net.dpml.magic</source>

</subsection>

@@ -30,7 +30,7 @@

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

<transit:init/>
<import file="${dpml.templates}/standard.xml"/>

Modified:
development/main/central/site/src/docs/products/transit/tasks/init.xml
==============================================================================
--- development/main/central/site/src/docs/products/transit/tasks/init.xml
(original)
+++ development/main/central/site/src/docs/products/transit/tasks/init.xml
Thu Dec 16 15:19:34 2004
@@ -19,7 +19,7 @@

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

<transit:init/>


Modified:
development/main/central/site/src/docs/products/transit/tasks/plugin.xml
==============================================================================
--- development/main/central/site/src/docs/products/transit/tasks/plugin.xml
(original)
+++ development/main/central/site/src/docs/products/transit/tasks/plugin.xml
Thu Dec 16 15:19:34 2004
@@ -18,17 +18,17 @@
<p><i>Example of a request to load an antlib.</i></p>

<source><![CDATA[
- <transit:plugin uri="artifact:meta:dpml/magic/dpml-magic-core#SNAPSHOT">
- <antlib resource="net/dpml/magic/antlib.xml"
urn="antlib:net.dpml.magic"/>
- </transit:plugin>
+ <magic:plugin uri="artifact:meta:dpml/magic/dpml-magic-core#SNAPSHOT">
+ <antlib resource="net/dpml/magic/antlib.xml"
urn="plugin:dpml/magic/dpml-magic-core"/>
+ </magic:plugin>
]]></source>

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

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


Added: development/main/magic/bootstrap/src/main/net/dpml/magic/antlib.xml
==============================================================================
--- (empty file)
+++ development/main/magic/bootstrap/src/main/net/dpml/magic/antlib.xml Thu
Dec 16 15:19:34 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<antlib xmlns:current="ant:current">
+ <taskdef name="init" classname="net.dpml.magic.bootstrap.MainTask"/>
+ <taskdef name="plugin" classname="net.dpml.magic.bootstrap.PluginTask"/>
+ <taskdef name="import"
classname="net.dpml.magic.bootstrap.ImportArtifactTask"/>
+</antlib>

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/MainTask.java
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/MainTask.java
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/MainTask.java
Thu Dec 16 15:19:34 2004
@@ -44,7 +44,7 @@
*
* <pre>
&lt;project name="example"
- xmlns:TRANSIT="antlib:net.dpml.transit">
+ xmlns:TRANSIT="antlib:net.dpml.magic">
&lt;TRANSIT:init/>
&lt;echo message="Home: ${dpml.home}"/>
&lt;echo message="Cache: ${dpml.cache}"/>

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
Thu Dec 16 15:19:34 2004
@@ -197,7 +197,7 @@
}
else
{
- String alias = uri.toString() + ":" + task;
+ String alias = urn.toString() + ":" + task;
if( m_parent != null )
{
Object object = m_parent.createComponent( alias );
@@ -214,7 +214,8 @@
}
}
installPlugin( uri, urn, task );
- return super.createComponent( alias );
+ Object object = super.createComponent( alias );
+ return object;
}
}
else
@@ -290,7 +291,7 @@
for( int i=0; i < tasks.length; i++ )
{
Element task = tasks[i];
- String key = uri.toString() + ":" +
ElementHelper.getAttribute( task, "name" );
+ String key = urn + ":" + ElementHelper.getAttribute(
task, "name" );
getProject().log( "installing task [" + key + "]",
Project.MSG_VERBOSE );
String classname = ElementHelper.getAttribute( task,
"classname" );
Class clazz = classloader.loadClass( classname );
@@ -301,7 +302,7 @@
for( int i=0; i < types.length; i++ )
{
Element type = types[i];
- String key = uri.toString() + ":" +
ElementHelper.getAttribute( type, "name" );
+ String key = urn + ":" + ElementHelper.getAttribute(
type, "name" );
getProject().log( "installing type [" + key + "]",
Project.MSG_VERBOSE );
String classname = ElementHelper.getAttribute( type,
"classname" );
Class clazz = classloader.loadClass( classname );

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/package.html
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/package.html
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/package.html
Thu Dec 16 15:19:34 2004
@@ -12,10 +12,9 @@
<p><i>Example build file:</i></p>

<pre>
-&lt;project name="example" xmlns:transit="antlib:net.dpml.transit"&gt;
+&lt;project name="example" xmlns:magic="antlib:net.dpml.magic"&gt;

- &lt;transit:init/&gt;
- &lt;import file="${dpml.templates}/standard.xml"/&gt;
+ &lt;magic:import uri="artifact:template:dpml/magic/reactor"/&gt;

&lt;/project&gt;
</pre>
@@ -25,9 +24,9 @@
<pre>
&lt;project name="example" xmlns:transit="antlib:net.dpml.transit"&gt;

- &lt;transit:plugin
uri="artifact:meta:dpml/magic/dpml-magic-doc#SNAPSHOT"&gt;
+ &lt;magic:plugin
uri="artifact:meta:dpml/magic/dpml-magic-doc#SNAPSHOT"&gt;
&lt;task class="net.dpml.magic.doc.DocTask" name="docs"/&gt;
- &lt;/transit:plugin&gt;
+ &lt;/magic:plugin&gt;

&lt;docs/&gt;


Modified: development/main/magic/build.xml
==============================================================================
--- development/main/magic/build.xml (original)
+++ development/main/magic/build.xml Thu Dec 16 15:19:34 2004
@@ -19,9 +19,9 @@
-->

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

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

<target name="patch">
<replace summary="true" dir="."

Modified: development/main/magic/core/build.xml
==============================================================================
--- development/main/magic/core/build.xml (original)
+++ development/main/magic/core/build.xml Thu Dec 16 15:19:34 2004
@@ -7,8 +7,8 @@
<available classname="net.dpml.transit.Main" property="transit.available"/>
<available classname="junit.framework.TestCase"
property="junit.available"/>

+ <filter token="PROJECT-PLUGIN-URN"
value="plugin:dpml/magic/dpml-magic-core"/>
<filter token="PROJECT-PLUGIN-URI" value="${project.plugin.uri}"/>
- <filter token="PROJECT-PLUGIN-URN" value="antlib:net.dpml.magic"/>

<target name="init" depends="bootstrap.init">
<echo>
@@ -37,16 +37,14 @@
</classpath>
</taskdef>
<export>
- <antlib resource="net/dpml/magic/antlib.xml"
urn="antlib:net.dpml.magic"/>
+ <antlib resource="net/dpml/magic/plugin.xml"
urn="plugin:dpml/magic/dpml-magic-core"/>
</export>
</target>

<target name="install" depends="bootstrap.install">
<mkdir dir="${dpml.home}/docs"/>
- <mkdir dir="${dpml.home}/templates"/>
<copy toDir="${dpml.home}">
<fileset dir="target/deliverables">
- <include name="templates/**"/>
<include name="themes/**"/>
<include name="processes/**"/>
</fileset>

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 Dec 16 15:19:34 2004
@@ -17,13 +17,13 @@
-->

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

- <transit:init>
+ <magic:init>
<map urn="@PROJECT-PLUGIN-URN@"
uri="@PROJECT-PLUGIN-URI@"/>
- </transit:init>
+ </magic: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 Dec 16 15:19:34 2004
@@ -17,13 +17,13 @@
-->

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

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

<target name="info">
<x:info/>

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 Dec 16 15:19:34 2004
@@ -74,7 +74,7 @@
{
String urn = plugin.getURN();
PluginTask p =
- (PluginTask) getProject().createTask(
"antlib:net.dpml.transit:plugin" );
+ (PluginTask) getProject().createTask(
"antlib:net.dpml.magic:plugin" );
p.init();
p.setUri( spec );
PluginTask.Antlib antlib = p.createAntlib();

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
Thu Dec 16 15:19:34 2004
@@ -79,19 +79,7 @@
{
if( null == m_target )
{
- File index = new File( getProject().getBaseDir(), "index.xml" );
- if( index.exists() )
- {
- IndexBuilder builder = new IndexBuilder( getProject(),
index );
- m_target = builder.getIndex();
- return m_target;
- }
- else
- {
- final String error =
- "Index atttribute is not defined and a default index
could not be located.";
- throw new BuildException( error );
- }
+ return getIndex();
}
else
{

Modified: development/main/magic/module.xml
==============================================================================
--- development/main/magic/module.xml (original)
+++ development/main/magic/module.xml Thu Dec 16 15:19:34 2004
@@ -20,10 +20,10 @@


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

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

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

Modified: development/main/magic/spells/bar/build.xml
==============================================================================
--- development/main/magic/spells/bar/build.xml (original)
+++ development/main/magic/spells/bar/build.xml Thu Dec 16 15:19:34 2004
@@ -19,9 +19,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34 2004
@@ -19,8 +19,8 @@
-->

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

- <import file="${dpml.templates}/reactor.xml"/>
+ <magic:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/magic/spells/checkstyle/build.xml
==============================================================================
--- development/main/magic/spells/checkstyle/build.xml (original)
+++ development/main/magic/spells/checkstyle/build.xml Thu Dec 16 15:19:34
2004
@@ -19,9 +19,9 @@
-->

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

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

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

<target name="build" depends="standard.build">
<x:export>
- <antlib urn="plugin:net.dpml.magic.checkstyle"
resource="net/dpml/magic/checkstyle/antlib.xml"/>
+ <antlib urn="plugin:dpml/magic/dpml-magic-checkstyle"
resource="net/dpml/magic/checkstyle/antlib.xml"/>
</x:export>
</target>


Modified:
development/main/magic/spells/checkstyle/etc/deliverables/templates/checkstyle.template
==============================================================================
---
development/main/magic/spells/checkstyle/etc/deliverables/templates/checkstyle.template
(original)
+++
development/main/magic/spells/checkstyle/etc/deliverables/templates/checkstyle.template
Thu Dec 16 15:19:34 2004
@@ -19,18 +19,18 @@
-->

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

<target name="checkstyle" depends="prepare"
unless="project.checkstyle.disable" >
- <transit:plugin uri="@PLUGIN-URI@"/>
+ <magic:plugin uri="@PLUGIN-URI@"/>
<mkdir dir="target/checkstyle"/>
- <checkstyle xmlns="plugin:net.dpml.magic.checkstyle"
+ <checkstyle xmlns="plugin:dpml/magic/dpml-magic-checkstyle"
uri="artifact:format:dpml/magic/standard">
<formatter type="xml"
toFile="target/checkstyle/checkstyle_errors.xml"/>
</checkstyle>
<mkdir dir="target/reports/checkstyle"/>
- <transit:plugin uri="@STYLE-PLUGIN-URI@"/>
- <style xmlns="plugin:net.dpml.magic.style"
+ <magic:plugin uri="@STYLE-PLUGIN-URI@"/>
+ <style xmlns="plugin:dpml/magic/dpml-magic-style"
in="target/checkstyle/checkstyle_errors.xml"
out="target/reports/checkstyle/checkstyle_report.html"
style="artifact:xsl:dpml/magic/checkstyle-frames"/>

Modified: development/main/magic/spells/doc/build.xml
==============================================================================
--- development/main/magic/spells/doc/build.xml (original)
+++ development/main/magic/spells/doc/build.xml Thu Dec 16 15:19:34 2004
@@ -20,8 +20,8 @@


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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16 15:19:34
2004
@@ -19,9 +19,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/themes/build.xml
==============================================================================
--- development/main/magic/spells/doc/themes/build.xml (original)
+++ development/main/magic/spells/doc/themes/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/magic/spells/doc/themes/docbook.sf.net/build.xml
==============================================================================
--- development/main/magic/spells/doc/themes/docbook.sf.net/build.xml
(original)
+++ development/main/magic/spells/doc/themes/docbook.sf.net/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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


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 Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/magic/spells/example/build.xml
==============================================================================
--- development/main/magic/spells/example/build.xml (original)
+++ development/main/magic/spells/example/build.xml Thu Dec 16 15:19:34
2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified:
development/main/magic/spells/example/src/main/net/dpml/magic/example/ExampleListener.java
==============================================================================
---
development/main/magic/spells/example/src/main/net/dpml/magic/example/ExampleListener.java
(original)
+++
development/main/magic/spells/example/src/main/net/dpml/magic/example/ExampleListener.java
Thu Dec 16 15:19:34 2004
@@ -31,7 +31,7 @@
public class ExampleListener implements BuildListener
{
private static final String PREPARE_TASK_KEY =
- "antlib:net.dpml.magic:prepare";
+ "plugin:dpml/magic/dpml-magic-core:prepare";

private Project m_project;


Modified: development/main/magic/spells/publish/build.xml
==============================================================================
--- development/main/magic/spells/publish/build.xml (original)
+++ development/main/magic/spells/publish/build.xml Thu Dec 16 15:19:34
2004
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

<target name="package" depends="standard.package">
<x:export class="net.dpml.magic.publish.PublishTask">
<antlib resource="net/dpml/magic/publish/antlib.xml"
- urn="antlib:net.dpml.magic.publish"/>
+ urn="plugin:dpml/magic/dpml-magic-publish"/>
</x:export>
</target>


Modified: development/main/magic/spells/style/build.xml
==============================================================================
--- development/main/magic/spells/style/build.xml (original)
+++ development/main/magic/spells/style/build.xml Thu Dec 16 15:19:34
2004
@@ -19,13 +19,13 @@
-->

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

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

<target name="build" depends="standard.build">
<x:export>
- <antlib urn="plugin:net.dpml.magic.style"
resource="net/dpml/magic/style/antlib.xml"/>
+ <antlib urn="plugin:dpml/magic/dpml-magic-style"
resource="net/dpml/magic/style/antlib.xml"/>
</x:export>
</target>


Modified: development/main/magic/spells/upload/build.xml
==============================================================================
--- development/main/magic/spells/upload/build.xml (original)
+++ development/main/magic/spells/upload/build.xml Thu Dec 16 15:19:34
2004
@@ -19,9 +19,9 @@
-->

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

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

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

Modified:
development/main/magic/spells/upload/etc/deliverables/templates/magic.xml
==============================================================================
--- development/main/magic/spells/upload/etc/deliverables/templates/magic.xml
(original)
+++ development/main/magic/spells/upload/etc/deliverables/templates/magic.xml
Thu Dec 16 15:19:34 2004
@@ -18,7 +18,7 @@
limitations under the License.
-->

-<targets xmlns:x="antlib:net.dpml.magic" >
+<targets xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<target name="publish" depends="install">
<x:plugin name="upload"
uri="plugin:dpml/magic/spells/upload/dpml-magic-upload"/>

Modified: development/main/magic/test/build.xml
==============================================================================
--- development/main/magic/test/build.xml (original)
+++ development/main/magic/test/build.xml Thu Dec 16 15:19:34 2004
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

<echo message="Home: ${dpml.home}"/>
<echo message="Cache: ${dpml.cache}"/>
- <echo message="Templates: ${dpml.templates}"/>
<echo message="Docs: ${dpml.docs}"/>

<target name="package" depends="standard.package">
@@ -17,9 +16,9 @@

<target name="install" depends="standard.install">
<x:property name="plugin" feature="plugin" key="dpml-magic-example"/>
- <transit:plugin uri="${plugin}">
+ <magic:plugin uri="${plugin}">
<task name="example" class="net.dpml.magic.example.ExampleTask"/>
- </transit:plugin>
+ </magic:plugin>
<example message="Goodbye!"/>
</target>


Modified: development/main/metro/build.xml
==============================================================================
--- development/main/metro/build.xml (original)
+++ development/main/metro/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml (original)
+++ development/main/metro/index.xml Thu Dec 16 15:19:34 2004
@@ -2,10 +2,1000 @@

<index>

+ <import index="../magic/index.xml"/>
<import index="tutorials/index.xml"/>
- <import index="public/index.xml"/>
+ <!--<import index="public/index.xml"/>
<import index="protected/index.xml"/>
<import index="private/index.xml"/>
- <import index="tools/index.xml"/>
+ <import index="tools/index.xml"/> -->
+
+ <!--
+ Metro Modules
+ -->
+
+ <project basedir="modules/public">
+ <info>
+ <group>dpml/metro/public</group>
+ <name>dpml-metro-public</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <type>module</type>
+ </info>
+ </project>
+
+ <project basedir="modules/protected">
+ <info>
+ <group>dpml/metro/protected</group>
+ <name>dpml-metro-protected</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <type>module</type>
+ </info>
+ <dependencies>
+ <include key="dpml-transit"/>
+ </dependencies>
+ <parts>
+ <include key="dpml-metro-public"/>
+ </parts>
+ </project>
+
+ <project basedir="modules/private">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-metro-private</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <type>module</type>
+ </info>
+ <parts>
+ <include key="dpml-metro-protected"/>
+ </parts>
+ </project>
+
+ <project basedir="modules/tools">
+ <info>
+ <group>dpml/metro/tools</group>
+ <name>dpml-metro-tools</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <type>module</type>
+ </info>
+ <dependencies>
+ <include key="dpml-transit"/>
+ <include key="dpml-metro-protected"/>
+ </dependencies>
+ </project>
+
+ <!-- FROM PUBLIC INDEX -->
+
+ <!-- Activity -->
+
+ <project basedir="public/activity">
+ <info>
+ <group>dpml/metro/public</group>
+ <name>dpml-activity-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <!-- Configuration -->
+
+ <project basedir="public/configuration">
+ <info>
+ <group>dpml/metro/public</group>
+ <name>dpml-configuration-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <!-- Parameters -->
+
+ <project basedir="public/parameters">
+ <info>
+ <group>dpml/metro/public</group>
+ <name>dpml-parameters-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <!-- Context -->
+
+ <project basedir="public/context">
+ <info>
+ <group>dpml/metro/public</group>
+ <name>dpml-context-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <!-- Service -->
+
+ <project basedir="public/service">
+ <info>
+ <group>dpml/metro/public</group>
+ <name>dpml-service-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <!-- Logging -->
+
+ <project basedir="public/logging">
+ <info>
+ <group>dpml/metro/public</group>
+ <name>dpml-logging-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <!-- FROM TOOLS INDEX -->
+
+ <!-- Meta -->
+
+ <project basedir="tools/meta">
+ <info>
+ <group>dpml/metro/tools</group>
+ <name>dpml-meta-tools</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-meta-impl"/>
+ <include key="qdox"/>
+ <include key="ant"/>
+ <include key="ant-junit"/>
+ </dependencies>
+ </project>
+
+ <!-- Metro -->
+
+ <project basedir="tools/main">
+ <info>
+ <group>dpml/metro/tools</group>
+ <name>dpml-metro-main</name>
+ <version>1.0.0</version>
+ <type>jar</type>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-api" tag="api"/>
+ <include key="dpml-activity-api" tag="api"/>
+ <include key="dpml-context-api" tag="api"/>
+ <include key="dpml-transit-main" tag="api"/>
+ <include key="dpml-system-spi" tag="spi"/>
+ <include key="dpml-logging-spi" tag="spi"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-util-exception"/>
+ <include key="dpml-util-criteria"/>
+ <include key="dpml-util-cli"/>
+ <include key="dpml-system-impl" build="false"/>
+ <include key="dpml-composition-impl" build="false"/>
+ <include key="commons-cli"/>
+ </dependencies>
+ </project>
+
+ <project basedir="tools/unit">
+ <info>
+ <group>dpml/metro/tools</group>
+ <name>dpml-metro-unit</name>
+ <version>1.0.0</version>
+ <type>jar</type>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-composition-spi"/>
+ <include key="dpml-util-exception"/>
+ <include key="dpml-composition-impl" build="false"/>
+ <include key="dpml-system-impl" build="false"/>
+ </dependencies>
+ </project>
+
+ <!-- FROM PROTECTED INDEX -->
+
+ <!-- Extension -->
+
+ <project basedir="protected/extension">
+ <info>
+ <group>dpml/metro/protected</group>
+ <name>dpml-extension-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <!-- Logging -->
+
+ <project basedir="protected/logging">
+ <info>
+ <group>dpml/metro/protected</group>
+ <name>dpml-logging-data</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <!-- Meta -->
+
+ <project basedir="protected/meta">
+ <info>
+ <group>dpml/metro/protected</group>
+ <name>dpml-meta-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-parameters-api"/>
+ <include key="dpml-configuration-api"/>
+ <include key="dpml-configuration-impl" build="false" test="true"
runtime="false"/>
+ <include key="dpml-parameters-impl" build="false" test="true"
runtime="false"/>
+ </dependencies>
+ </project>
+
+ <!-- Composition -->
+
+ <project basedir="protected/composition">
+ <info>
+ <group>dpml/metro/protected</group>
+ <name>dpml-composition-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-transit-main"/>
+ <include key="dpml-meta-api"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-configuration-api"/>
+ <include key="dpml-context-api"/>
+ <include key="dpml-service-api"/>
+ <include key="dpml-parameters-api"/>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-logging-data"/>
+ <include key="dpml-extension-api"/>
+ <include key="dpml-configuration-impl" build="false" test="true"
runtime="false"/>
+ <include key="dpml-parameters-impl" build="false" test="true"
runtime="false"/>
+ </dependencies>
+ </project>
+
+ <!-- FROM METRO PRIVATE -->
+
+ <!-- Utitlities -->
+
+ <project basedir="private/util/defaults">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-util-defaults</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <type>jar</type>
+ </info>
+ </project>
+
+ <!-- Configuration -->
+
+ <project basedir="private/configuration">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-configuration-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-configuration-api"/>
+ </dependencies>
+ </project>
+
+ <!-- Parameters -->
+
+ <project basedir="private/parameters">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-parameters-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-parameters-api"/>
+ <include key="dpml-configuration-api"/>
+ </dependencies>
+ </project>
+
+ <!-- Context -->
+
+ <project basedir="private/context">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-context-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-context-api"/>
+ </dependencies>
+ </project>
+
+ <!-- Extension -->
+
+ <project basedir="private/extension/impl">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-extension-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-extension-api"/>
+ </dependencies>
+ </project>
+
+ <!-- System -->
+
+ <project basedir="private/system/api">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-system-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-transit-main" tag="api"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/system/spi">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-system-spi</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-context-api"/>
+ <include key="dpml-logging-spi"/>
+ <include key="dpml-transit-main"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/system/impl">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-system-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-system-spi" tag="spi"/>
+ <include key="dpml-context-impl"/>
+ <include key="dpml-util-criteria"/>
+ <include key="dpml-util-defaults"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-util-cli"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/system/test">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-system-test</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-system-spi"/>
+ <include key="dpml-system-impl" build="false"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/system/demo">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-system-demo</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="commons-cli"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-logging-api" tag="api"/>
+ <include key="dpml-system-impl" build="false"/>
+ </dependencies>
+ </project>
+
+ <!-- Logging -->
+
+ <project basedir="private/logging/spi">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-logging-spi</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-api" tag="api"/>
+ <include key="dpml-logging-data" tag="api"/>
+ <include key="dpml-system-api" tag="api"/>
+ <include key="dpml-transit-main" tag="api"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/logging/criteria">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-logging-criteria</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-spi"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-util-criteria"/>
+ <include key="dpml-util-defaults"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/logging/providers/log4j/impl">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-logging-log4j</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-spi" tag="spi"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-logging-criteria"/>
+ <include key="dpml-configuration-api"/>
+ <include key="log4j"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/logging/providers/log4j/test">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-logging-log4j-test</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-logkit-api"/>
+ <include key="dpml-logging-log4j" test="false"/>
+ <include key="dpml-transit-main"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/logging/providers/logkit/api">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-logging-logkit-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-spi"/>
+ <include key="dpml-configuration-api"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/logging/providers/logkit/impl">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-logging-logkit-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-transit-main" runtime="false" tag="api"/>
+ <include key="dpml-logging-spi" tag="spi"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-util-exception"/>
+ <include key="dpml-logging-criteria"/>
+ <include key="dpml-logging-logkit-api"/>
+ <include key="dpml-configuration-impl"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/logging/providers/logkit/plugins/datagram">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-logging-logkit-datagram</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-logging-logkit-impl"/>
+ <include key="dpml-configuration-impl"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/logging/providers/logkit/plugins/socket">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-logging-logkit-socket</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-logging-logkit-impl"/>
+ <include key="dpml-configuration-impl"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/logging/providers/logkit/plugins/syslog">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-logging-logkit-syslog</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-configuration-impl"/>
+ <include key="dpml-logging-logkit-api"/>
+ <include key="dpml-logging-logkit-datagram"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/logging/providers/logkit/test">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-logging-logkit-test</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-logkit-impl" build="false" test="false"/>
+ <include key="dpml-logging-logkit-datagram" build="false"
test="false"/>
+ <include key="dpml-logging-logkit-socket" build="false" test="false"/>
+ <include key="dpml-logging-logkit-syslog" build="false" test="false"/>
+ <include key="dpml-transit-main"/>
+ <include key="dpml-logging-logkit-api"/>
+ </dependencies>
+ </project>
+
+ <!-- Meta -->
+
+ <project basedir="private/meta/spi">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-meta-spi</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-meta-api"/>
+ <include key="dpml-configuration-api"/>
+ <include key="dpml-parameters-api"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/meta/impl">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-meta-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-meta-spi"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-configuration-impl"/>
+ <include key="dpml-parameters-impl"/>
+ <include key="dpml-service-api"/>
+ </dependencies>
+ </project>
+
+
+ <!-- Composition -->
+
+ <project basedir="private/composition/spi">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-composition-spi</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-system-spi"/>
+ <include key="dpml-composition-api"/>
+ <include key="dpml-logging-spi"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/composition/impl">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-composition-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-transit-main" tag="api"/>
+ <include key="dpml-logging-api" tag="api"/>
+ <include key="dpml-activity-api" tag="api"/>
+ <include key="dpml-parameters-api" tag="api"/>
+ <include key="dpml-composition-api" tag="api"/>
+ <include key="dpml-configuration-api" tag="api"/>
+ <include key="dpml-service-api" tag="api"/>
+ <include key="dpml-meta-api" tag="api"/>
+ <include key="dpml-extension-api" tag="api"/>
+ <include key="dpml-composition-spi" tag="spi"/>
+ <include key="dpml-meta-spi" tag="spi"/>
+ <include key="dpml-configuration-impl"/>
+ <include key="dpml-meta-impl"/>
+ <include key="dpml-extension-api" tag="spi"/>
+ <include key="dpml-extension-impl"/>
+ <include key="dpml-util-exception"/>
+ <include key="dpml-context-impl"/>
+ <include key="dpml-util-criteria"/>
+ <include key="dpml-util-cli"/>
+ <include key="dpml-activation-impl" build="false"/>
+ <include key="dpml-test-playground" build="false"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/composition/test">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-composition-test</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-system-spi"/>
+ <include key="dpml-composition-spi"/>
+ <include key="dpml-composition-impl"/>
+ <include key="dpml-system-impl" test="false"/>
+ <include key="dpml-composition-impl" test="false"/>
+ <include key="dpml-util-exception"/>
+ <include key="dpml-test-testa" test="false"/>
+ <include key="dpml-test-testb" test="false"/>
+ <include key="dpml-test-testc" test="false"/>
+ <include key="dpml-test-testcyclic" test="false"/>
+ <include key="dpml-test-includes" test="false"/>
+ <include key="dpml-test-dynamics" test="false"/>
+ <include key="dpml-system-impl" build="false"/>
+ <include key="dpml-logging-logkit-impl" build="false"/>
+ <include key="dpml-test-testschema"/>
+ </dependencies>
+ </project>
+
+ <!--
+ DPML Activation.
+ -->
+
+ <project basedir="private/activation/api">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-activation-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-composition-spi"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/activation/providers/metro">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-activation-metro-provider</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-activation-api" tag="api"/>
+ <include key="dpml-activity-api" tag="api"/>
+ <include key="dpml-composition-api" tag="api"/>
+ <include key="dpml-composition-spi" tag="spi"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-util-defaults"/>
+ <include key="dpml-system-spi"/>
+ <include key="dpml-context-impl"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/activation/providers/avalon">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-activation-avalon-provider</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-activity-api" tag="api"/>
+ <include key="dpml-composition-api" tag="api"/>
+ <include key="avalon-framework-api" tag="api"/>
+ <include key="dpml-activation-api" tag="api"/>
+ <include key="dpml-system-spi" tag="spi"/>
+ <include key="dpml-composition-spi" tag="spi"/>
+ <include key="avalon-util-lifecycle" tag="api"/>
+ <include key="dpml-util-i18n"/>
+ <include key="dpml-util-defaults"/>
+ <include key="dpml-context-impl"/>
+ <include key="dpml-parameters-impl"/>
+ <include key="avalon-framework-impl"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/activation/impl">
+ <info>
+ <group>dpml/metro/private</group>
+ <name>dpml-activation-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-transit-main" tag="api"/>
+ <include key="dpml-activation-api" tag="api"/>
+ <include key="dpml-composition-api" tag="api"/>
+ <include key="dpml-activation-metro-provider" build="false"/>
+ <include key="dpml-activation-avalon-provider" build="false"/>
+ <include key="dpml-system-impl" build="false"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/activation/test">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-activation-test</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="dpml-composition-test"/>
+ <include key="dpml-activation-impl"/>
+ <include key="dpml-test-components"/>
+ </dependencies>
+ </project>
+
+ <!--
+ Metro Test.
+ -->
+
+ <project basedir="private/test/dynamics">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-dynamics</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-service-api"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="private/test/playground">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-playground</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-context-api"/>
+ <include key="dpml-configuration-api"/>
+ <include key="dpml-service-api"/>
+ <include key="dpml-activity-api"/>
+ <include key="dpml-composition-api"/>
+ <include key="dpml-context-impl"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="private/test/testa">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-testa</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-activity-api"/>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-context-api"/>
+ <include key="dpml-configuration-api"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="private/test/testb">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-testb</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-activity-api"/>
+ <include key="dpml-logging-api"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="private/test/testc">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-testc</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-test-testa"/>
+ <include key="dpml-test-testb"/>
+ <include key="dpml-activity-api"/>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-service-api"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="private/test/testd">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-testd</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-test-testa"/>
+ <include key="dpml-activity-api"/>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-service-api"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="private/test/teste">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-teste</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-test-testa"/>
+ <include key="dpml-activity-api"/>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-service-api"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="private/test/testcyclic">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-testcyclic</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-service-api"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="private/test/testschema">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-testschema</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-configuration-api"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="private/test/includes">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-includes</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-test-playground" build="false" runtime="false"/>
+ <include key="dpml-test-testa" build="false" runtime="false"/>
+ <include key="dpml-test-testb" build="false" runtime="false"/>
+ <include key="dpml-test-testc" build="false" runtime="false"/>
+ <include key="dpml-test-testd" build="false" runtime="false"/>
+ <include key="dpml-test-teste" build="false" runtime="false"/>
+ </dependencies>
+ </project>
+
+ <project basedir="private/test/components">
+ <info>
+ <group>dpml/test</group>
+ <name>dpml-test-components</name>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-logging-api"/>
+ <include key="dpml-context-api"/>
+ <include key="dpml-service-api"/>
+ </dependencies>
+ <plugins>
+ <include key="dpml-meta-tools"/>
+ </plugins>
+ </project>
+
+
+ <!-- EXTERNAL RESOURCES -->
+
+ <resource>
+ <info>
+ <group>qdox</group>
+ <name>qdox</name>
+ <version>1.4</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>log4j</group>
+ <name>log4j</name>
+ <version>1.2.8</version>
+ <type>jar</type>
+ </info>
+ <gump>
+ <alias>logging-log4j-12</alias>
+ </gump>
+ </resource>
+
+ <resource>
+ <info>
+ <group>qdox</group>
+ <name>qdox</name>
+ <version>1.4</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>avalon-framework</group>
+ <name>avalon-framework-api</name>
+ <version>4.2.0</version>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>avalon-framework</group>
+ <name>avalon-framework-impl</name>
+ <version>4.2.0</version>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>avalon/util</group>
+ <name>avalon-util-lifecycle</name>
+ <version>1.1.1</version>
+ </info>
+ </resource>
+

</index>

Added: development/main/metro/modules/private/build.xml
==============================================================================
--- (empty file)
+++ development/main/metro/modules/private/build.xml Thu Dec 16 15:19:34
2004
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-metro-private" default="docs" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+
+ <magic:import uri="artifact:template:dpml/magic/standard"/>
+
+ <target name="build" depends="standard.build">
+ <x:module>
+ <x:header>
+ <x:svn href="http://paris.dpml.net/svn/main/metro"/>
+ <x:home href="http://www.dpml.net/products/metro"/>
+ </x:header>
+ </x:module>
+ </target>
+
+ <target name="docs" depends="install">
+ <x:javadoc>
+ <link href="http://java.sun.com/j2se/1.4/docs/api"/>
+ <link href="http://www.dpml.net/commons-cli/api/1.0"/>
+ <group title="Activation API">
+ <package name="net.dpml.activation"/>
+ <package name="net.dpml.activation.*"/>
+ </group>
+ <group title="Composition API">
+ <package name="net.dpml.composition"/>
+ <package name="net.dpml.composition.*"/>
+ </group>
+ <group title="Logging System API">
+ <package name="net.dpml.logging"/>
+ <package name="net.dpml.logging.*"/>
+ </group>
+ <group title="Lifecycle Artifact API">
+ <package name="net.dpml.activity"/>
+ <package name="net.dpml.service"/>
+ <package name="net.dpml.context"/>
+ <package name="net.dpml.context.*"/>
+ <package name="net.dpml.configuration"/>
+ <package name="net.dpml.configuration.*"/>
+ <package name="net.dpml.parameters"/>
+ <package name="net.dpml.parameters.*"/>
+ </group>
+ <group title="Meta Info API">
+ <package name="net.dpml.meta"/>
+ <package name="net.dpml.meta.*"/>
+ </group>
+ <group title="System Context API">
+ <package name="net.dpml.system"/>
+ <package name="net.dpml.system.*"/>
+ </group>
+ <group title="Utilities">
+ <package name="net.dpml.cli"/>
+ <package name="net.dpml.criteria"/>
+ <package name="net.dpml.defaults"/>
+ <package name="net.dpml.extension"/>
+ <package name="net.dpml.extension.*"/>
+ </group>
+ </x:javadoc>
+ </target>
+
+</project>

Added: development/main/metro/modules/protected/build.xml
==============================================================================
--- (empty file)
+++ development/main/metro/modules/protected/build.xml Thu Dec 16 15:19:34
2004
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-metro-protected" default="docs" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+
+ <magic:import uri="artifact:template:dpml/magic/standard"/>
+
+ <target name="build" depends="standard.build">
+ <x:module/>
+ </target>
+
+ <target name="docs" depends="install">
+ <x:javadoc>
+ <link href="http://java.sun.com/j2se/1.4/docs/api"/>
+ <group title="Component API">
+ <package name="net.dpml.activity"/>
+ <package name="net.dpml.context"/>
+ <package name="net.dpml.configuration"/>
+ <package name="net.dpml.service"/>
+ <package name="net.dpml.parameters"/>
+ <package name="net.dpml.logging"/>
+ </group>
+ <group title="Facilities API">
+ <package name="net.dpml.composition"/>
+ <package name="net.dpml.composition.*"/>
+ <package name="net.dpml.extension*"/>
+ <package name="net.dpml.logging.data"/>
+ <package name="net.dpml.meta.info"/>
+ </group>
+ </x:javadoc>
+ </target>
+
+</project>

Added: development/main/metro/modules/public/build.xml
==============================================================================
--- (empty file)
+++ development/main/metro/modules/public/build.xml Thu Dec 16 15:19:34
2004
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-metro-public" default="docs" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+
+ <magic:import uri="artifact:template:dpml/magic/standard"/>
+
+ <target name="build" depends="standard.build">
+ <x:module/>
+ </target>
+
+ <target name="docs" depends="install">
+ <x:javadoc>
+ <link href="http://java.sun.com/j2se/1.4/docs/api"/>
+ </x:javadoc>
+ </target>
+
+</project>

Added: development/main/metro/modules/tools/build.xml
==============================================================================
--- (empty file)
+++ development/main/metro/modules/tools/build.xml Thu Dec 16 15:19:34
2004
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-metro-tools" default="docs" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+
+ <magic:import uri="artifact:template:dpml/magic/standard"/>
+
+ <target name="build" depends="standard.build">
+ <x:module/>
+ </target>
+
+ <target name="docs" depends="install">
+ <x:javadoc>
+ <link href="http://java.sun.com/j2se/1.4/docs/api"/>
+ <link href="http://www.dpml.net/asf/ant/1.6.2/api"/>
+ <link href="http://www.dpml.net/junit/junit/3.8.1/api"/>
+ <link href="http://www.dpml.net/commons-cli/api/1.0"/>
+ </x:javadoc>
+ </target>
+
+</project>

Modified: development/main/metro/private/activation/api/build.xml
==============================================================================
--- development/main/metro/private/activation/api/build.xml (original)
+++ development/main/metro/private/activation/api/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/activation/build.xml
==============================================================================
--- development/main/metro/private/activation/build.xml (original)
+++ development/main/metro/private/activation/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/activation/impl/build.xml
==============================================================================
--- development/main/metro/private/activation/impl/build.xml (original)
+++ development/main/metro/private/activation/impl/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/activation/providers/avalon/build.xml
==============================================================================
--- development/main/metro/private/activation/providers/avalon/build.xml
(original)
+++ development/main/metro/private/activation/providers/avalon/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/activation/providers/build.xml
==============================================================================
--- development/main/metro/private/activation/providers/build.xml
(original)
+++ development/main/metro/private/activation/providers/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/activation/providers/metro/build.xml
==============================================================================
--- development/main/metro/private/activation/providers/metro/build.xml
(original)
+++ development/main/metro/private/activation/providers/metro/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/activation/test/build.xml
==============================================================================
--- development/main/metro/private/activation/test/build.xml (original)
+++ development/main/metro/private/activation/test/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/build.xml
==============================================================================
--- development/main/metro/private/build.xml (original)
+++ development/main/metro/private/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/composition/build.xml
==============================================================================
--- development/main/metro/private/composition/build.xml (original)
+++ development/main/metro/private/composition/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

<target name="patch">
<replace summary="true" dir="."

Modified: development/main/metro/private/composition/impl/build.xml
==============================================================================
--- development/main/metro/private/composition/impl/build.xml (original)
+++ development/main/metro/private/composition/impl/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/composition/spi/build.xml
==============================================================================
--- development/main/metro/private/composition/spi/build.xml (original)
+++ development/main/metro/private/composition/spi/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/composition/test/build.xml
==============================================================================
--- development/main/metro/private/composition/test/build.xml (original)
+++ development/main/metro/private/composition/test/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/configuration/build.xml
==============================================================================
--- development/main/metro/private/configuration/build.xml (original)
+++ development/main/metro/private/configuration/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/context/build.xml
==============================================================================
--- development/main/metro/private/context/build.xml (original)
+++ development/main/metro/private/context/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/extension/build.xml
==============================================================================
--- development/main/metro/private/extension/build.xml (original)
+++ development/main/metro/private/extension/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/extension/impl/build.xml
==============================================================================
--- development/main/metro/private/extension/impl/build.xml (original)
+++ development/main/metro/private/extension/impl/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/index.xml
==============================================================================
--- development/main/metro/private/index.xml (original)
+++ development/main/metro/private/index.xml Thu Dec 16 15:19:34 2004
@@ -9,8 +9,12 @@
<import index="../protected/index.xml"
uri="artifact:module:dpml/metro/protected/dpml-metro-protected#SNAPSHOT"
/>

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

<import index="../../magic/index.xml"
uri="artifact:module:dpml/magic/dpml-magic#SNAPSHOT"/>

Modified: development/main/metro/private/logging/build.xml
==============================================================================
--- development/main/metro/private/logging/build.xml (original)
+++ development/main/metro/private/logging/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/logging/criteria/build.xml
==============================================================================
--- development/main/metro/private/logging/criteria/build.xml (original)
+++ development/main/metro/private/logging/criteria/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/logging/providers/build.xml
==============================================================================
--- development/main/metro/private/logging/providers/build.xml (original)
+++ development/main/metro/private/logging/providers/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/logging/providers/log4j/build.xml
==============================================================================
--- development/main/metro/private/logging/providers/log4j/build.xml
(original)
+++ development/main/metro/private/logging/providers/log4j/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified:
development/main/metro/private/logging/providers/log4j/impl/build.xml
==============================================================================
--- development/main/metro/private/logging/providers/log4j/impl/build.xml
(original)
+++ development/main/metro/private/logging/providers/log4j/impl/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/logging/providers/log4j/test/build.xml
==============================================================================
--- development/main/metro/private/logging/providers/log4j/test/build.xml
(original)
+++ development/main/metro/private/logging/providers/log4j/test/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/logging/providers/logkit/api/build.xml
==============================================================================
--- development/main/metro/private/logging/providers/logkit/api/build.xml
(original)
+++ development/main/metro/private/logging/providers/logkit/api/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/logging/providers/logkit/build.xml
==============================================================================
--- development/main/metro/private/logging/providers/logkit/build.xml
(original)
+++ development/main/metro/private/logging/providers/logkit/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified:
development/main/metro/private/logging/providers/logkit/impl/build.xml
==============================================================================
--- development/main/metro/private/logging/providers/logkit/impl/build.xml
(original)
+++ development/main/metro/private/logging/providers/logkit/impl/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/logging/providers/logkit/plugins/build.xml
==============================================================================
--- development/main/metro/private/logging/providers/logkit/plugins/build.xml
(original)
+++ development/main/metro/private/logging/providers/logkit/plugins/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified:
development/main/metro/private/logging/providers/logkit/plugins/datagram/build.xml
==============================================================================
---
development/main/metro/private/logging/providers/logkit/plugins/datagram/build.xml
(original)
+++
development/main/metro/private/logging/providers/logkit/plugins/datagram/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/logging/providers/logkit/plugins/socket/build.xml
==============================================================================
---
development/main/metro/private/logging/providers/logkit/plugins/socket/build.xml
(original)
+++
development/main/metro/private/logging/providers/logkit/plugins/socket/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/logging/providers/logkit/plugins/syslog/build.xml
==============================================================================
---
development/main/metro/private/logging/providers/logkit/plugins/syslog/build.xml
(original)
+++
development/main/metro/private/logging/providers/logkit/plugins/syslog/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified:
development/main/metro/private/logging/providers/logkit/test/build.xml
==============================================================================
--- development/main/metro/private/logging/providers/logkit/test/build.xml
(original)
+++ development/main/metro/private/logging/providers/logkit/test/build.xml
Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/logging/spi/build.xml
==============================================================================
--- development/main/metro/private/logging/spi/build.xml (original)
+++ development/main/metro/private/logging/spi/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/meta/build.xml
==============================================================================
--- development/main/metro/private/meta/build.xml (original)
+++ development/main/metro/private/meta/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/meta/impl/build.xml
==============================================================================
--- development/main/metro/private/meta/impl/build.xml (original)
+++ development/main/metro/private/meta/impl/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/meta/spi/build.xml
==============================================================================
--- development/main/metro/private/meta/spi/build.xml (original)
+++ development/main/metro/private/meta/spi/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/module.xml
==============================================================================
--- development/main/metro/private/module.xml (original)
+++ development/main/metro/private/module.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/private/parameters/build.xml
==============================================================================
--- development/main/metro/private/parameters/build.xml (original)
+++ development/main/metro/private/parameters/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/system/api/build.xml
==============================================================================
--- development/main/metro/private/system/api/build.xml (original)
+++ development/main/metro/private/system/api/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/system/build.xml
==============================================================================
--- development/main/metro/private/system/build.xml (original)
+++ development/main/metro/private/system/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/system/demo/build.xml
==============================================================================
--- development/main/metro/private/system/demo/build.xml (original)
+++ development/main/metro/private/system/demo/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

<target name="package" depends="standard.package">
<x:export class="net.dpml.system.demo.DemoPlugin"/>

Modified: development/main/metro/private/system/impl/build.xml
==============================================================================
--- development/main/metro/private/system/impl/build.xml (original)
+++ development/main/metro/private/system/impl/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/system/spi/build.xml
==============================================================================
--- development/main/metro/private/system/spi/build.xml (original)
+++ development/main/metro/private/system/spi/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/system/test/build.xml
==============================================================================
--- development/main/metro/private/system/test/build.xml (original)
+++ development/main/metro/private/system/test/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/test/build.xml
==============================================================================
--- development/main/metro/private/test/build.xml (original)
+++ development/main/metro/private/test/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/test/cli/build.xml
==============================================================================
--- development/main/metro/private/test/cli/build.xml (original)
+++ development/main/metro/private/test/cli/build.xml Thu Dec 16 15:19:34
2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/private/test/components/build.xml
==============================================================================
--- development/main/metro/private/test/components/build.xml (original)
+++ development/main/metro/private/test/components/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/test/dynamics/build.xml
==============================================================================
--- development/main/metro/private/test/dynamics/build.xml (original)
+++ development/main/metro/private/test/dynamics/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/test/includes/build.xml
==============================================================================
--- development/main/metro/private/test/includes/build.xml (original)
+++ development/main/metro/private/test/includes/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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


Modified: development/main/metro/private/test/playground/build.xml
==============================================================================
--- development/main/metro/private/test/playground/build.xml (original)
+++ development/main/metro/private/test/playground/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/private/test/testa/build.xml
==============================================================================
--- development/main/metro/private/test/testa/build.xml (original)
+++ development/main/metro/private/test/testa/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/test/testb/build.xml
==============================================================================
--- development/main/metro/private/test/testb/build.xml (original)
+++ development/main/metro/private/test/testb/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/test/testc/build.xml
==============================================================================
--- development/main/metro/private/test/testc/build.xml (original)
+++ development/main/metro/private/test/testc/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/test/testcyclic/build.xml
==============================================================================
--- development/main/metro/private/test/testcyclic/build.xml (original)
+++ development/main/metro/private/test/testcyclic/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/test/testd/build.xml
==============================================================================
--- development/main/metro/private/test/testd/build.xml (original)
+++ development/main/metro/private/test/testd/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/test/teste/build.xml
==============================================================================
--- development/main/metro/private/test/teste/build.xml (original)
+++ development/main/metro/private/test/teste/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/test/testschema/build.xml
==============================================================================
--- development/main/metro/private/test/testschema/build.xml (original)
+++ development/main/metro/private/test/testschema/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/util/build.xml
==============================================================================
--- development/main/metro/private/util/build.xml (original)
+++ development/main/metro/private/util/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/util/criteria/build.xml
==============================================================================
--- development/main/metro/private/util/criteria/build.xml (original)
+++ development/main/metro/private/util/criteria/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/private/util/defaults/build.xml
==============================================================================
--- development/main/metro/private/util/defaults/build.xml (original)
+++ development/main/metro/private/util/defaults/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/protected/build.xml
==============================================================================
--- development/main/metro/protected/build.xml (original)
+++ development/main/metro/protected/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/protected/composition/build.xml
==============================================================================
--- development/main/metro/protected/composition/build.xml (original)
+++ development/main/metro/protected/composition/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/protected/extension/build.xml
==============================================================================
--- development/main/metro/protected/extension/build.xml (original)
+++ development/main/metro/protected/extension/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/protected/logging/build.xml
==============================================================================
--- development/main/metro/protected/logging/build.xml (original)
+++ development/main/metro/protected/logging/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/protected/meta/build.xml
==============================================================================
--- development/main/metro/protected/meta/build.xml (original)
+++ development/main/metro/protected/meta/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/protected/module.xml
==============================================================================
--- development/main/metro/protected/module.xml (original)
+++ development/main/metro/protected/module.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/public/activity/build.xml
==============================================================================
--- development/main/metro/public/activity/build.xml (original)
+++ development/main/metro/public/activity/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/public/build.xml
==============================================================================
--- development/main/metro/public/build.xml (original)
+++ development/main/metro/public/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/public/configuration/build.xml
==============================================================================
--- development/main/metro/public/configuration/build.xml (original)
+++ development/main/metro/public/configuration/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/public/context/build.xml
==============================================================================
--- development/main/metro/public/context/build.xml (original)
+++ development/main/metro/public/context/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/public/logging/build.xml
==============================================================================
--- development/main/metro/public/logging/build.xml (original)
+++ development/main/metro/public/logging/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/public/module.xml
==============================================================================
--- development/main/metro/public/module.xml (original)
+++ development/main/metro/public/module.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/public/parameters/build.xml
==============================================================================
--- development/main/metro/public/parameters/build.xml (original)
+++ development/main/metro/public/parameters/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/public/service/build.xml
==============================================================================
--- development/main/metro/public/service/build.xml (original)
+++ development/main/metro/public/service/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tools/build.xml
==============================================================================
--- development/main/metro/tools/build.xml (original)
+++ development/main/metro/tools/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tools/main/build.xml
==============================================================================
--- development/main/metro/tools/main/build.xml (original)
+++ development/main/metro/tools/main/build.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/tools/meta/build.xml
==============================================================================
--- development/main/metro/tools/meta/build.xml (original)
+++ development/main/metro/tools/meta/build.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/tools/meta/src/main/net/dpml/meta/info/ant/MetaBuildListener.java
==============================================================================
---
development/main/metro/tools/meta/src/main/net/dpml/meta/info/ant/MetaBuildListener.java
(original)
+++
development/main/metro/tools/meta/src/main/net/dpml/meta/info/ant/MetaBuildListener.java
Thu Dec 16 15:19:34 2004
@@ -35,7 +35,7 @@
public class MetaBuildListener implements BuildListener
{
private static final String PREPARE_TASK_KEY =
- "antlib:net.dpml.magic:prepare";
+ "plugin:dpml/magic/dpml-magic-core:prepare";

private boolean m_flag = false;


Modified: development/main/metro/tools/module.xml
==============================================================================
--- development/main/metro/tools/module.xml (original)
+++ development/main/metro/tools/module.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tools/unit/build.xml
==============================================================================
--- development/main/metro/tools/unit/build.xml (original)
+++ development/main/metro/tools/unit/build.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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"/>
- <transit:plugin uri="${mdoc.spec}">
+ <magic:plugin uri="${mdoc.spec}">
<task class="net.dpml.magic.mdoc.ModuleDocTask" name="doc"/>
- </transit:plugin>
+ </magic: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/tutorials/build.xml
==============================================================================
--- development/main/metro/tutorials/build.xml (original)
+++ development/main/metro/tutorials/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tutorials/composition/application/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/application/build.xml
(original)
+++ development/main/metro/tutorials/composition/application/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified:
development/main/metro/tutorials/composition/application/impl/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/application/impl/build.xml
(original)
+++ development/main/metro/tutorials/composition/application/impl/build.xml
Thu Dec 16 15:19:34 2004
@@ -2,9 +2,9 @@

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

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

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

Modified: development/main/metro/tutorials/composition/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/build.xml (original)
+++ development/main/metro/tutorials/composition/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tutorials/composition/location/api/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/location/api/build.xml
(original)
+++ development/main/metro/tutorials/composition/location/api/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tutorials/composition/location/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/location/build.xml
(original)
+++ development/main/metro/tutorials/composition/location/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tutorials/composition/location/impl/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/location/impl/build.xml
(original)
+++ development/main/metro/tutorials/composition/location/impl/build.xml
Thu Dec 16 15:19:34 2004
@@ -2,9 +2,9 @@

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

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

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

Modified: development/main/metro/tutorials/composition/publisher/api/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/publisher/api/build.xml
(original)
+++ development/main/metro/tutorials/composition/publisher/api/build.xml
Thu Dec 16 15:19:34 2004
@@ -2,8 +2,8 @@

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

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

</project>

Modified: development/main/metro/tutorials/composition/publisher/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/publisher/build.xml
(original)
+++ development/main/metro/tutorials/composition/publisher/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified:
development/main/metro/tutorials/composition/publisher/impl/build.xml
==============================================================================
--- development/main/metro/tutorials/composition/publisher/impl/build.xml
(original)
+++ development/main/metro/tutorials/composition/publisher/impl/build.xml
Thu Dec 16 15:19:34 2004
@@ -2,9 +2,9 @@

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

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

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

Modified: development/main/metro/tutorials/configuration/block/build.xml
==============================================================================
--- development/main/metro/tutorials/configuration/block/build.xml
(original)
+++ development/main/metro/tutorials/configuration/block/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/configuration/build.xml
==============================================================================
--- development/main/metro/tutorials/configuration/build.xml (original)
+++ development/main/metro/tutorials/configuration/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tutorials/configuration/defaults/build.xml
==============================================================================
--- development/main/metro/tutorials/configuration/defaults/build.xml
(original)
+++ development/main/metro/tutorials/configuration/defaults/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/configuration/injection/build.xml
==============================================================================
--- development/main/metro/tutorials/configuration/injection/build.xml
(original)
+++ development/main/metro/tutorials/configuration/injection/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/configuration/override/build.xml
==============================================================================
--- development/main/metro/tutorials/configuration/override/build.xml
(original)
+++ development/main/metro/tutorials/configuration/override/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/context/alias/build.xml
==============================================================================
--- development/main/metro/tutorials/context/alias/build.xml (original)
+++ development/main/metro/tutorials/context/alias/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/context/build.xml
==============================================================================
--- development/main/metro/tutorials/context/build.xml (original)
+++ development/main/metro/tutorials/context/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tutorials/context/casting/build.xml
==============================================================================
--- development/main/metro/tutorials/context/casting/build.xml (original)
+++ development/main/metro/tutorials/context/casting/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/context/custom/build.xml
==============================================================================
--- development/main/metro/tutorials/context/custom/build.xml (original)
+++ development/main/metro/tutorials/context/custom/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/context/injection/build.xml
==============================================================================
--- development/main/metro/tutorials/context/injection/build.xml
(original)
+++ development/main/metro/tutorials/context/injection/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/context/phased/build.xml
==============================================================================
--- development/main/metro/tutorials/context/phased/build.xml (original)
+++ development/main/metro/tutorials/context/phased/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/context/strategy/build.xml
==============================================================================
--- development/main/metro/tutorials/context/strategy/build.xml (original)
+++ development/main/metro/tutorials/context/strategy/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/dependencies/auto/build.xml
==============================================================================
--- development/main/metro/tutorials/dependencies/auto/build.xml
(original)
+++ development/main/metro/tutorials/dependencies/auto/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/dependencies/build.xml
==============================================================================
--- development/main/metro/tutorials/dependencies/build.xml (original)
+++ development/main/metro/tutorials/dependencies/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tutorials/dependencies/manual/build.xml
==============================================================================
--- development/main/metro/tutorials/dependencies/manual/build.xml
(original)
+++ development/main/metro/tutorials/dependencies/manual/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/dynamics/build.xml
==============================================================================
--- development/main/metro/tutorials/dynamics/build.xml (original)
+++ development/main/metro/tutorials/dynamics/build.xml Thu Dec 16 15:19:34
2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/hello/build.xml
==============================================================================
--- development/main/metro/tutorials/hello/build.xml (original)
+++ development/main/metro/tutorials/hello/build.xml Thu Dec 16 15:19:34
2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/index.xml
==============================================================================
--- development/main/metro/tutorials/index.xml (original)
+++ development/main/metro/tutorials/index.xml Thu Dec 16 15:19:34 2004
@@ -2,8 +2,13 @@

<index>

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

<!--
Hello Tutorial.

Modified: development/main/metro/tutorials/lifecycle/build.xml
==============================================================================
--- development/main/metro/tutorials/lifecycle/build.xml (original)
+++ development/main/metro/tutorials/lifecycle/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/metro/tutorials/lifecycle/modern/build.xml
==============================================================================
--- development/main/metro/tutorials/lifecycle/modern/build.xml (original)
+++ development/main/metro/tutorials/lifecycle/modern/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/main/build.xml
==============================================================================
--- development/main/metro/tutorials/main/build.xml (original)
+++ development/main/metro/tutorials/main/build.xml Thu Dec 16 15:19:34
2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/parameterization/build.xml
==============================================================================
--- development/main/metro/tutorials/parameterization/build.xml (original)
+++ development/main/metro/tutorials/parameterization/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/profiles/build.xml
==============================================================================
--- development/main/metro/tutorials/profiles/build.xml (original)
+++ development/main/metro/tutorials/profiles/build.xml Thu Dec 16 15:19:34
2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/metro/tutorials/selection/build.xml
==============================================================================
--- development/main/metro/tutorials/selection/build.xml (original)
+++ development/main/metro/tutorials/selection/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/planet/build.xml
==============================================================================
--- development/main/planet/build.xml (original)
+++ development/main/planet/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16 15:19:34
2004
@@ -17,8 +17,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,8 +17,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,8 +17,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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
Dec 16 15:19:34 2004
@@ -3,9 +3,9 @@
<project name="dpml-planet-console-default"
default="install"
basedir="."
- xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
+ xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,8 +17,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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
Dec 16 15:19:34 2004
@@ -17,8 +17,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,8 +17,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34
2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

<target name="build" depends="standard.build">
<x:property name="hsql.spec" key="dpml-planet-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 Dec 16
15:19:34 2004
@@ -16,9 +16,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34
2004
@@ -16,8 +16,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -16,9 +16,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -16,9 +16,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,8 +17,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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
Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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/demo/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/demo/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/demo/build.xml Thu
Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

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

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


Modified: development/main/planet/facilities/http/blocks/examples/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/examples/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/examples/build.xml Thu
Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

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

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

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
Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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
Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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
Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

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

<target name="build" depends="standard.build">
<x:block name="default-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
Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

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

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

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
Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

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

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

Modified: development/main/planet/facilities/http/build.xml
==============================================================================
--- development/main/planet/facilities/http/build.xml (original)
+++ development/main/planet/facilities/http/build.xml Thu Dec 16 15:19:34
2004
@@ -17,8 +17,8 @@
-->

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

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

</project>

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 Dec 16
15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

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

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


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 Dec 16
15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -16,8 +16,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

<target name="build" depends="standard.build">
<x:property name="mx4j.spec" key="dpml-planet-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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16 15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,8 +17,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/reactor"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,8 +17,8 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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 Dec 16
15:19:34 2004
@@ -17,9 +17,9 @@
-->

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

- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic: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
Dec 16 15:19:34 2004
@@ -17,8 +17,8 @@
-->

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

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

</project>

Modified: development/main/transit/build.xml
==============================================================================
--- development/main/transit/build.xml (original)
+++ development/main/transit/build.xml Thu Dec 16 15:19:34 2004
@@ -20,8 +20,8 @@


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

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

</project>

Modified: development/main/transit/module.xml
==============================================================================
--- development/main/transit/module.xml (original)
+++ development/main/transit/module.xml Thu Dec 16 15:19:34 2004
@@ -18,11 +18,11 @@
-->

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

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

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

Modified: development/main/transit/plugin/build.xml
==============================================================================
--- development/main/transit/plugin/build.xml (original)
+++ development/main/transit/plugin/build.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/transit/tutorials/artifact/build.xml
==============================================================================
--- development/main/transit/tutorials/artifact/build.xml (original)
+++ development/main/transit/tutorials/artifact/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/transit/tutorials/build.xml
==============================================================================
--- development/main/transit/tutorials/build.xml (original)
+++ development/main/transit/tutorials/build.xml Thu Dec 16 15:19:34
2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/transit/tutorials/extension/build.xml
==============================================================================
--- development/main/transit/tutorials/extension/build.xml (original)
+++ development/main/transit/tutorials/extension/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/transit/tutorials/plugins/build.xml
==============================================================================
--- development/main/transit/tutorials/plugins/build.xml (original)
+++ development/main/transit/tutorials/plugins/build.xml Thu Dec 16
15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/transit/tutorials/plugins/cli/build.xml
==============================================================================
--- development/main/transit/tutorials/plugins/cli/build.xml (original)
+++ development/main/transit/tutorials/plugins/cli/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/transit/tutorials/plugins/controller/build.xml
==============================================================================
--- development/main/transit/tutorials/plugins/controller/build.xml
(original)
+++ development/main/transit/tutorials/plugins/controller/build.xml Thu
Dec 16 15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/transit/tutorials/plugins/simple/build.xml
==============================================================================
--- development/main/transit/tutorials/plugins/simple/build.xml (original)
+++ development/main/transit/tutorials/plugins/simple/build.xml Thu Dec 16
15:19:34 2004
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

Modified: development/main/util/build.xml
==============================================================================
--- development/main/util/build.xml (original)
+++ development/main/util/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/util/cli/build.xml
==============================================================================
--- development/main/util/cli/build.xml (original)
+++ development/main/util/cli/build.xml Thu Dec 16 15:19:34 2004
@@ -1,13 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:init>
- <map urn="antlib:net.dpml.magic"
- uri="artifact:meta:dpml/magic/dpml-magic-core#SNAPSHOT"/>
- </transit:init>
-
- <transit:import uri="artifact:template:dpml/magic/standard"/>
+ <magic:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/util/criteria/build.xml
==============================================================================
--- development/main/util/criteria/build.xml (original)
+++ development/main/util/criteria/build.xml Thu Dec 16 15:19:34 2004
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

- <transit:init/>
- <import file="${dpml.templates}/standard.xml"/>
+ <magic:import uri="artifact:template:dpml/magic/standard"/>

</project>

Modified: development/main/util/exception/build.xml
==============================================================================
--- development/main/util/exception/build.xml (original)
+++ development/main/util/exception/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/util/i18n/build.xml
==============================================================================
--- development/main/util/i18n/build.xml (original)
+++ development/main/util/i18n/build.xml Thu Dec 16 15:19:34 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

</project>

Modified: development/main/util/module.xml
==============================================================================
--- development/main/util/module.xml (original)
+++ development/main/util/module.xml Thu Dec 16 15:19:34 2004
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>

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

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

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

---

• svn commit: r1187 - in development/main: . central central/install central/site central/site/src/docs/guide/deployment/plugins/simple central/site/src/docs/guide/setup central/site/src/docs/products/magic/antlib central/site/src/docs/products/magic/tasks central/site/src/docs/products/transit/tasks magic magic/bootstrap/src/main/net/dpml/magic magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/bootstrap/src/main/net/dpml/transit magic/core magic/core/etc/deliverables/templates magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/tasks magic/spells magic/spells/bar magic/spells/checkstyle magic/spells/checkstyle/etc/deliverables/templates magic/spells/doc magic/spells/doc/task magic/spells/doc/themes magic/spells/doc/themes/docbook.sf.net magic/spells/doc/themes/modern magic/spells/example magic/spells/example/src/main/net/dpml/magic/example magic/spells/publish magic/spells/style magic/spells/upload magic/spells/upload/etc/deliverables/templates magic/test metro metro/activation metro/composition metro/context metro/extension metro/logging metro/meta metro/modules metro/modules/private metro/modules/protected metro/modules/public metro/modules/tools metro/parameters metro/private metro/private/activation metro/private/activation/api metro/private/activation/impl metro/private/activation/providers metro/private/activation/providers/avalon metro/private/activation/providers/metro metro/private/activation/test metro/private/composition metro/private/composition/impl metro/private/composition/spi metro/private/composition/test metro/private/configuration metro/private/context metro/private/extension metro/private/extension/impl metro/private/logging metro/private/logging/criteria metro/private/logging/providers metro/private/logging/providers/log4j metro/private/logging/providers/log4j/impl metro/private/logging/providers/log4j/test metro/private/logging/providers/logkit metro/private/logging/providers/logkit/api metro/private/logging/providers/logkit/impl metro/private/logging/providers/logkit/plugins metro/private/logging/providers/logkit/plugins/datagram metro/private/logging/providers/logkit/plugins/socket metro/private/logging/providers/logkit/plugins/syslog metro/private/logging/providers/logkit/test metro/private/logging/spi metro/private/meta metro/private/meta/impl metro/private/meta/spi metro/private/parameters metro/private/system metro/private/system/api metro/private/system/demo metro/private/system/impl metro/private/system/spi metro/private/system/test metro/private/test metro/private/test/cli metro/private/test/components metro/private/test/dynamics metro/private/test/includes metro/private/test/playground metro/private/test/testa metro/private/test/testb metro/private/test/testc metro/private/test/testcyclic metro/private/test/testd metro/private/test/teste metro/private/test/testschema metro/private/util metro/private/util/criteria metro/private/util/defaults metro/protected metro/protected/composition metro/protected/extension metro/protected/logging metro/protected/meta metro/public metro/public/activity metro/public/configuration metro/public/context metro/public/logging metro/public/parameters metro/public/service metro/system metro/test metro/tools metro/tools/main metro/tools/meta metro/tools/meta/src/main/net/dpml/meta/info/ant metro/tools/unit metro/tutorials metro/tutorials/composition metro/tutorials/composition/application metro/tutorials/composition/application/impl metro/tutorials/composition/location metro/tutorials/composition/location/api metro/tutorials/composition/location/impl metro/tutorials/composition/publisher metro/tutorials/composition/publisher/api metro/tutorials/composition/publisher/impl metro/tutorials/configuration metro/tutorials/configuration/block metro/tutorials/configuration/defaults metro/tutorials/configuration/injection metro/tutorials/configuration/override metro/tutorials/context metro/tutorials/context/alias metro/tutorials/context/casting metro/tutorials/context/custom metro/tutorials/context/injection metro/tutorials/context/phased metro/tutorials/context/strategy metro/tutorials/dependencies metro/tutorials/dependencies/auto metro/tutorials/dependencies/manual metro/tutorials/dynamics metro/tutorials/hello metro/tutorials/lifecycle metro/tutorials/lifecycle/modern metro/tutorials/main metro/tutorials/parameterization metro/tutorials/profiles metro/tutorials/selection metro/util 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/demo planet/facilities/http/blocks/examples 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/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 transit/plugin transit/tutorials transit/tutorials/artifact transit/tutorials/extension transit/tutorials/plugins transit/tutorials/plugins/cli transit/tutorials/plugins/controller transit/tutorials/plugins/simple util util/cli util/criteria util/exception util/i18n, mcconnell, 12/16/2004

---

Archive powered by MHonArc 2.6.24.