DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Sun Dec 12 06:24:50 2004
New Revision: 1166

Added:
   
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/ImportArtifactTask.java
   (contents, props changed)
   development/main/magic/core/etc/deliverables/templates/reactor.template
   development/main/magic/core/etc/deliverables/templates/standard.template
Modified:
   development/main/magic/bootstrap/src/main/net/dpml/transit/antlib.xml
   development/main/magic/build.xml
   development/main/magic/module.xml
   development/main/magic/spells/bar/build.xml
   development/main/magic/spells/checkstyle/build.xml
   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/publish/build.xml
   development/main/magic/spells/upload/build.xml
   development/main/magic/test/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/exception/build.xml
   development/main/util/i18n/build.xml
   development/main/util/module.xml
Log:
Update the boostrap package to include an import task that takes an artifact 
uri as the imported temple source.  Also updated the magic core templates to 
include standard.template and reactor.template.

Added: 
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/ImportArtifactTask.java
==============================================================================
--- (empty file)
+++ 
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/ImportArtifactTask.java
  Sun Dec 12 06:24:50 2004
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2004 Stephen J. McConnell.
+ *
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.magic.bootstrap;
+
+import java.io.File;
+import java.net.URL;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.ImportTask;
+
+import net.dpml.transit.artifact.Handler;
+
+/**
+ * Ant task that provides support for the import of build file templates
+ * via an artifact url.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product 
Meta Library</a>
+ */
+public class ImportArtifactTask extends ImportTask
+{
+
+    // 
------------------------------------------------------------------------
+    // Task
+    // 
------------------------------------------------------------------------
+
+   /**
+    * set the artifact to import.
+    * @param uri the artifact to import into the build file
+    * @exception BuildException if an error occurs while attempting to 
+    *   resolve the artifact uri
+    */
+    public void setUri( String uri ) throws BuildException
+    {
+        try
+        {
+            URL url = new URL( null, uri, new Handler() );
+            File local = (File) url.getContent( new Class[]{File.class} );
+            super.setFile( local.getAbsolutePath() );
+        }
+        catch( Throwable e )
+        {
+            final String error = 
+              "Could not import the resource from the uri ["
+              + uri 
+              + "]";
+            throw new BuildException( error, e );
+        }
+    }
+}
+

Modified: 
development/main/magic/bootstrap/src/main/net/dpml/transit/antlib.xml
==============================================================================
--- development/main/magic/bootstrap/src/main/net/dpml/transit/antlib.xml     
  (original)
+++ development/main/magic/bootstrap/src/main/net/dpml/transit/antlib.xml     
  Sun Dec 12 06:24:50 2004
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <antlib xmlns:current="ant:current">
-  <taskdef name="init" classname="net.dpml.magic.bootstrap.MainTask"/>
+  <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/build.xml
==============================================================================
--- development/main/magic/build.xml    (original)
+++ development/main/magic/build.xml    Sun Dec 12 06:24:50 2004
@@ -19,10 +19,9 @@
 -->
 
 <project name="dpml-magic" basedir="." default="default"
-    xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
+    xmlns:transit="antlib:net.dpml.transit">
 
-  <transit:init/>  
-  <import file="${dpml.templates}/reactor.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/reactor"/>
 
   <target name="patch">
     <replace summary="true" dir="."

Added: development/main/magic/core/etc/deliverables/templates/reactor.template
==============================================================================
--- (empty file)
+++ development/main/magic/core/etc/deliverables/templates/reactor.template   
  Sun Dec 12 06:24:50 2004
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Copyright 2004 Apache Software Foundation
+  Licensed  under the  Apache License,  Version 2.0  (the "License");
+  you may not use  this file  except in  compliance with the License.
+  You may obtain a copy of the License at 
+  
+    http://www.dpml.net/central/about/legal/
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed  under the  License is distributed on an "AS IS" BASIS,
+  WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+  implied.
+  
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project name="reactor"
+    xmlns:transit="antlib:net.dpml.transit" 
+    xmlns:x="antlib:net.dpml.magic">
+
+  <transit:init/>
+
+  <target name="init">
+    <x:reactor target="init"/>
+  </target>
+
+  <target name="clean">
+    <x:reactor target="clean"/>
+  </target>
+
+  <target name="prepare">
+    <x:reactor target="prepare"/>
+  </target>
+
+  <target name="build">
+    <x:reactor target="build"/>
+  </target>
+
+  <target name="package">
+    <x:reactor target="package"/>
+  </target>
+
+  <target name="test">
+    <x:reactor target="test"/>
+  </target>
+
+  <target name="install">
+    <x:reactor target="install"/>
+  </target>
+
+  <target name="default">
+    <x:reactor/>
+  </target>
+
+</project>
+

Added: 
development/main/magic/core/etc/deliverables/templates/standard.template
==============================================================================
--- (empty file)
+++ development/main/magic/core/etc/deliverables/templates/standard.template  
  Sun Dec 12 06:24:50 2004
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Copyright 2004 Apache Software Foundation
+  Licensed  under the  Apache License,  Version 2.0  (the "License");
+  you may not use  this file  except in  compliance with the License.
+  You may obtain a copy of the License at 
+  
+    http://www.dpml.net/central/about/legal/
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed  under the  License is distributed on an "AS IS" BASIS,
+  WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+  implied.
+  
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project name="standard" 
+    xmlns:transit="antlib:net.dpml.transit" 
+    xmlns:x="antlib:net.dpml.magic">
+
+  <transit:init/>
+
+  <target name="info">
+    <x:info/>
+  </target>
+
+  <target name="init" depends="info">
+    <x:init/>
+  </target>
+
+  <target name="clean" depends="info">
+    <x:clean/>
+  </target>
+
+  <target name="prepare" depends="init">
+    <x:prepare/>
+  </target>
+
+  <target name="build" depends="prepare">
+    <x:javac/>
+  </target>
+
+  <target name="package" depends="build">
+    <x:jar/>
+  </target>
+
+  <target name="test" depends="package">
+    <x:junit/>
+  </target>
+
+  <target name="install" depends="test">
+    <x:install/>
+  </target>
+
+  <target name="javadoc" depends="prepare">
+    <x:javadoc title="${project.name}">
+      <link href="http://java.sun.com/j2se/1.4/docs/api"; />
+      <link href="http://www.dpml.net/asf/ant/docs/1.6.2"; />
+    </x:javadoc>
+  </target>
+
+</project>
+

Modified: development/main/magic/module.xml
==============================================================================
--- development/main/magic/module.xml   (original)
+++ development/main/magic/module.xml   Sun Dec 12 06:24:50 2004
@@ -22,9 +22,7 @@
 <project name="dpml-magic" default="docs" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
-  <import file="${dpml.templates}/checkstyle/checkstyle.xml" 
optional="true"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <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 Sun Dec 12 06:24:50 2004
@@ -21,8 +21,7 @@
 <project name="dpml-magic-bar" default="install" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="package" depends="standard.package">
     <x:export class="net.dpml.magic.bar.BarTask"/>

Modified: development/main/magic/spells/checkstyle/build.xml
==============================================================================
--- development/main/magic/spells/checkstyle/build.xml  (original)
+++ development/main/magic/spells/checkstyle/build.xml  Sun Dec 12 06:24:50 
2004
@@ -21,8 +21,7 @@
 <project name="dpml-magic-checkstyle" default="install" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="init" depends="standard.init">
     <x:filter feature="plugin" token="PLUGIN-URI"/>

Modified: development/main/magic/spells/doc/build.xml
==============================================================================
--- development/main/magic/spells/doc/build.xml (original)
+++ development/main/magic/spells/doc/build.xml Sun Dec 12 06:24:50 2004
@@ -20,9 +20,8 @@
 
 
 <project name="dpml-magic-spells-doc" default="default" basedir="." 
-    xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
+    xmlns:transit="antlib:net.dpml.transit">
 
-  <transit:init/>  
-  <import file="${dpml.templates}/reactor.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/reactor"/>
 
 </project>

Modified: development/main/magic/spells/doc/task/build.xml
==============================================================================
--- development/main/magic/spells/doc/task/build.xml    (original)
+++ development/main/magic/spells/doc/task/build.xml    Sun Dec 12 06:24:50 
2004
@@ -21,9 +21,7 @@
 <project name="dpml-magic-doc" default="install" basedir="."
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
-
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="package" depends="standard.package">
     <!-- x:export class="net.dpml.magic.doc.DocTask"/ -->

Modified: development/main/magic/spells/doc/themes/build.xml
==============================================================================
--- development/main/magic/spells/doc/themes/build.xml  (original)
+++ development/main/magic/spells/doc/themes/build.xml  Sun Dec 12 06:24:50 
2004
@@ -3,7 +3,6 @@
 <project name="dpml-magic-spells-doc-themes" default="default" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/reactor.xml"/>
+  <transit: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   Sun 
Dec 12 06:24:50 2004
@@ -3,8 +3,7 @@
 <project name="dpml-magic-themes-docbook.sf.net" default="install" 
basedir="."
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <!-- target name="doc" depends="prepare">
     <x:property name="spec" feature="plugin" key="dpml-magic-doc"/>

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   Sun Dec 12 
06:24:50 2004
@@ -3,7 +3,6 @@
 <project name="dpml-magic-themes-modern" default="install" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit: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     Sun Dec 12 06:24:50 
2004
@@ -3,8 +3,7 @@
 <project name="dpml-magic-example" default="install" basedir="."
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="init" depends="standard.init">
     <x:filter feature="path" token="MESSAGE"/>

Modified: development/main/magic/spells/publish/build.xml
==============================================================================
--- development/main/magic/spells/publish/build.xml     (original)
+++ development/main/magic/spells/publish/build.xml     Sun Dec 12 06:24:50 
2004
@@ -3,8 +3,7 @@
 <project name="dpml-magic-publish" default="install" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="package" depends="standard.package">
     <x:export class="net.dpml.magic.publish.PublishTask">

Modified: development/main/magic/spells/upload/build.xml
==============================================================================
--- development/main/magic/spells/upload/build.xml      (original)
+++ development/main/magic/spells/upload/build.xml      Sun Dec 12 06:24:50 
2004
@@ -21,8 +21,7 @@
 <project name="dpml-magic-upload" default="install" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="package" depends="standard.package">
     <x:export class="net.dpml.magic.upload.UploadTask"/>

Modified: development/main/magic/test/build.xml
==============================================================================
--- development/main/magic/test/build.xml       (original)
+++ development/main/magic/test/build.xml       Sun Dec 12 06:24:50 2004
@@ -3,14 +3,13 @@
 <project name="dpml-magic-test" default="install" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
+  <transit: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}"/>
 
-  <import file="${dpml.templates}/standard.xml"/>
-
   <target name="package" depends="standard.package">
     <x:export class="net.dpml.magic.SomePlugin"/>
     <x:replicate/>

Modified: development/main/transit/build.xml
==============================================================================
--- development/main/transit/build.xml  (original)
+++ development/main/transit/build.xml  Sun Dec 12 06:24:50 2004
@@ -22,7 +22,6 @@
 <project name="dpml-runtime" default="default" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/reactor.xml"/>
+  <transit: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 Sun Dec 12 06:24:50 2004
@@ -21,10 +21,7 @@
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic"
     xmlns:checkstyle="antlib:net.dpml.magic.checkstyle">
 
-  <transit:init/>
-
-  <import file="${dpml.templates}/standard.xml"/>
-  <import file="${dpml.templates}/checkstyle/checkstyle.xml" 
optional="true"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <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   Sun Dec 12 06:24:50 2004
@@ -3,8 +3,7 @@
 <project name="dpml-transit-plugin" default="bin" basedir="."
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit: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       Sun Dec 12 
06:24:50 2004
@@ -1,9 +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:x="antlib:net.dpml.magic" >
+    xmlns:transit="antlib:net.dpml.transit">
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit: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        Sun Dec 12 06:24:50 
2004
@@ -3,7 +3,6 @@
 <project name="dpml-transit-tutorials" default="default" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/reactor.xml"/>
+  <transit: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      Sun Dec 12 
06:24:50 2004
@@ -1,12 +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:x="antlib:net.dpml.magic" >
-
-  <transit:init/>
+    xmlns:transit="antlib:net.dpml.transit">
 
   <property name="project.test.fork" value="true"/>
-
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit: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        Sun Dec 12 
06:24:50 2004
@@ -3,7 +3,6 @@
 <project name="dpml-transit-plugins-tutorials" default="default" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/reactor.xml"/>
+  <transit: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    Sun Dec 12 
06:24:50 2004
@@ -3,8 +3,7 @@
 <project name="dpml-transit-tutorial-plugin-cli" default="install" 
basedir="."
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit: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     Sun 
Dec 12 06:24:50 2004
@@ -3,8 +3,7 @@
 <project name="dpml-transit-tutorial-plugin-controller" default="install" 
basedir="."
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
   <target name="init" depends="standard.init">
     <x:filter key="dpml-transit-tutorial-plugin-cli" 

Modified: development/main/transit/tutorials/plugins/simple/build.xml
==============================================================================
--- development/main/transit/tutorials/plugins/simple/build.xml (original)
+++ development/main/transit/tutorials/plugins/simple/build.xml Sun Dec 12 
06:24:50 2004
@@ -3,8 +3,7 @@
 <project name="dpml-transit-tutorial-plugin-simple" default="install" 
basedir="."
     xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit: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     Sun Dec 12 06:24:50 2004
@@ -3,8 +3,6 @@
 <project name="dpml-util" default="default" basedir="." 
     xmlns:transit="antlib:net.dpml.transit" >
 
-  <transit:init/>
-  <import file="${dpml.templates}/reactor.xml"/>
-
+  <transit: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 Sun Dec 12 06:24:50 2004
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <project name="dpml-util-cli" default="install" basedir="."
-    xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
+    xmlns:transit="antlib:net.dpml.transit">
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit: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   Sun Dec 12 06:24:50 2004
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <project name="dpml-util-exception" default="install" basedir="."
-    xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
+    xmlns:transit="antlib:net.dpml.transit">
 
-  <transit:init/>
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit: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        Sun Dec 12 06:24:50 2004
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <project name="dpml-util-i18n" default="install" basedir="."
-    xmlns:transit="antlib:net.dpml.transit" xmlns:x="antlib:net.dpml.magic" >
+    xmlns:transit="antlib:net.dpml.transit">
 
-  <transit:init/>
-
-  <import file="${dpml.templates}/standard.xml"/>
+  <transit: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    Sun Dec 12 06:24:50 2004
@@ -4,9 +4,8 @@
     xmlns:transit="antlib:net.dpml.transit" 
     xmlns:x="antlib:net.dpml.magic" >
 
-  <transit:init/>
+  <transit:import uri="artifact:template:dpml/magic/standard"/>
 
-  <import file="${dpml.templates}/standard.xml"/>
   <!--<import file="${dpml.templates}/checkstyle/checkstyle.xml" 
optional="true"/>-->
 
   <target name="build" depends="standard.build">