DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Sun Dec 12 02:02:22 2004
New Revision: 1163

Added:
   development/main/magic/bootstrap/src/main/net/dpml/transit/
   development/main/magic/bootstrap/src/main/net/dpml/transit/antlib.xml   
(contents, props changed)
Removed:
   development/main/magic/bootstrap/src/main/net/dpml/magic/antlib.xml
Modified:
   development/main/build.xml
   development/main/magic/core/src/main/net/dpml/magic/antlib.xml
   development/main/magic/module.xml
   
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTargetFactory.java
   
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTask.java
   development/main/metro/tools/main/build.xml
   development/main/setup.xml
Log:


Modified: development/main/build.xml
==============================================================================
--- development/main/build.xml  (original)
+++ development/main/build.xml  Sun Dec 12 02:02:22 2004
@@ -20,29 +20,9 @@
 
 
 <project name="dpml-main" 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"/>
 
-  <target name="default" depends="reactor.default,bin"/>
-
-  <target name="bin">
-    <echo>
-#----------------------------------------------------------------------------------
-# Updating DPML HOME bin directory.
-# Directory: ${dpml.home}/bin
-#----------------------------------------------------------------------------------
-    </echo>
-    <x:property name="metro.group" key="dpml-metro-main" feature="group"/>
-    <!-- copy scripts to ${dpml.home}/bin -->
-    <mkdir dir="${dpml.home}/bin"/>
-    <copy todir="${dpml.home}/bin">
-      <fileset dir="${dpml.home}/main/${metro.group}/bin"/>
-    </copy>
-    <chmod file="${dpml.home}/bin/metro" perm="755"/>
-    <chmod file="${dpml.home}/bin/transit" perm="755"/>
-    <chmod dir="${dpml.home}/bin" includes="*.sh" perm="755"/>
-  </target>
-
 </project>

Added: development/main/magic/bootstrap/src/main/net/dpml/transit/antlib.xml
==============================================================================
--- (empty file)
+++ development/main/magic/bootstrap/src/main/net/dpml/transit/antlib.xml     
  Sun Dec 12 02:02:22 2004
@@ -0,0 +1,5 @@
+<?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"/> 
+</antlib>

Modified: development/main/magic/core/src/main/net/dpml/magic/antlib.xml
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/antlib.xml      
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/antlib.xml      Sun 
Dec 12 02:02:22 2004
@@ -11,7 +11,7 @@
   <taskdef name="filter"     classname="net.dpml.magic.tasks.FilterTask"/>
   <taskdef name="index"      classname="net.dpml.magic.tasks.IndexTask"/>
   <taskdef name="info"       classname="net.dpml.magic.tasks.InfoTask"/>
-  <!--<taskdef name="init"       
classname="net.dpml.magic.tasks.InitializeTask"/>-->
+  <taskdef name="init"       
classname="net.dpml.magic.tasks.InitializeTask"/>
   <taskdef name="install"    classname="net.dpml.magic.tasks.InstallTask"/>
   <taskdef name="jar"        classname="net.dpml.magic.tasks.JarTask"/>
   <taskdef name="javac"      classname="net.dpml.magic.tasks.JavacTask"/>

Modified: development/main/magic/module.xml
==============================================================================
--- development/main/magic/module.xml   (original)
+++ development/main/magic/module.xml   Sun Dec 12 02:02:22 2004
@@ -43,6 +43,9 @@
     <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"/>
+      <group title="Magic Bootstrap">
+        <package name="net.dpml.magic.bootstrap"/>
+      </group>
       <group title="Magic Core">
         <package name="net.dpml.magic"/>
         <package name="net.dpml.magic.builder"/>
@@ -55,6 +58,7 @@
         <package name="net.dpml.magic.doc"/>
         <package name="net.dpml.magic.publish"/>
         <package name="net.dpml.magic.upload"/>
+        <package name="net.dpml.magic.checkstyle"/>
       </group>
     </x:javadoc>
   </target>

Modified: 
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTargetFactory.java
==============================================================================
--- 
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTargetFactory.java
    (original)
+++ 
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTargetFactory.java
    Sun Dec 12 02:02:22 2004
@@ -22,7 +22,8 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.Location;
-import net.dpml.transit.task.TargetFactory;
+
+import net.dpml.magic.bootstrap.TargetFactory;
 
 import java.net.URI;
 

Modified: 
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTask.java
==============================================================================
--- 
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTask.java
     (original)
+++ 
development/main/magic/spells/doc/task/src/main/net/dpml/magic/doc/DocTask.java
     Sun Dec 12 02:02:22 2004
@@ -19,12 +19,6 @@
 
 package net.dpml.magic.doc;
 
-import net.dpml.magic.tasks.ProjectTask;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Copy;
-import org.apache.tools.ant.types.FileSet;
-
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
@@ -40,6 +34,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import net.dpml.magic.tasks.ProjectTask;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.types.FileSet;
 
 public class DocTask extends ProjectTask
 {

Modified: development/main/metro/tools/main/build.xml
==============================================================================
--- development/main/metro/tools/main/build.xml (original)
+++ development/main/metro/tools/main/build.xml Sun Dec 12 02:02:22 2004
@@ -18,10 +18,9 @@
     <x:export class="net.dpml.metro.Metro"/>
   </target>
 
-  <target name="install" depends="package-system,standard.install"/>
-
-  <target name="package-system" depends="standard.package">
+  <target name="install" depends="bin,update,standard.install"/>
 
+  <target name="update" depends="package">
     <x:replicate/>
     <copy todir="target/replicate/${project.group}/jars">
       <fileset dir="target/deliverables/jars">
@@ -30,6 +29,16 @@
     </copy>
   </target>
 
+  <target name="bin" depends="prepare">
+    <mkdir dir="${dpml.home}/bin"/>
+    <copy todir="${dpml.home}/bin">
+      <fileset dir="target/deliverables/bin"/>
+    </copy>
+    <chmod file="${dpml.home}/bin/metro" perm="755"/>
+    <chmod file="${dpml.home}/bin/transit" perm="755"/>
+    <chmod dir="${dpml.home}/bin" includes="*.sh" perm="755"/>
+  </target>
+
   <!--
   <target name="binary" depends="package-system">
     <property name="project.zip" value="${project.short-filename}.zip"/>

Modified: development/main/setup.xml
==============================================================================
--- development/main/setup.xml  (original)
+++ development/main/setup.xml  Sun Dec 12 02:02:22 2004
@@ -5,24 +5,13 @@
   <property environment="ENV"/>
   <property file="setup.properties"/>
 
-  <property name="magic.root" value="magic/core"/>
+  <available classname="junit.framework.TestCase" 
property="junit.available"/>
   <property name="junit.url" value="${dpml.host}/junit/jars/${junit.jar}"/>
-  <property name="ant.url" value="${dpml.host}/ant/jars/${ant.jar}"/>
-  <property name="ant-nodeps.url" 
value="${dpml.host}/ant/jars/${ant-nodeps.jar}"/>
-  <property name="ant-junit.url" 
value="${dpml.host}/ant/jars/${ant-junit.jar}"/>
-
   <condition property="dpml.env.declared" value="false">
     <isset property="ENV.DPML_HOME"/>
   </condition>
 
-  <available classname="junit.framework.TestCase" 
property="junit.available"/>
-  <available classname="net.dpml.transit.Main" property="transit.available"/>
-  <available classname="net.dpml.magic.Index" property="magic.available"/>
-
-  <target name="init"
-      
depends="setup-proxy,check-dpml-home,declare-dpml-home,create-dpml-home">
-    <echo message="Setup complete."/>
-  </target>
+  <target name="init" 
depends="setup-proxy,check-dpml-home,declare-dpml-home,create-dpml-home"/>
 
   <target name="declare-dpml-home" if="dpml.env.declared">
     <property name="dpml.home" value="${ENV.DPML_HOME}"/>
@@ -33,25 +22,18 @@
   </target>
 
   <target name="create-dpml-home">
-
     <echo>
 
#----------------------------------------------------------------------------------
 # Preparing DPML home: ${dpml.home}
 
#----------------------------------------------------------------------------------
     </echo>
-
     <mkdir dir="${dpml.home}"/>
-
-    <!-- Create the artifact cache. -->
     <property name="dpml.cache" value="${dpml.home}/main"/>
     <echo message="Using cache: ${dpml.cache}"/>
     <mkdir dir="${dpml.cache}"/>
-
-    <!-- Create the docs cache. -->
     <property name="dpml.docs" value="${dpml.home}/docs"/>
     <echo message="Using doc repository: ${dpml.docs}"/>
     <mkdir dir="${dpml.docs}"/>
-
   </target>
 
   <condition property="dpml.proxy.declared" value="false">
@@ -75,7 +57,6 @@
     <mkdir dir="${dpml.home}/main/junit/jars"/>
     <get src="${junit.url}" usetimestamp="true"
       dest="${dpml.home}/main/junit/jars/${junit.jar}"/>
-
     <mkdir dir="${user.home}/.ant/lib"/>
     <copy toDir="${user.home}/.ant/lib">
       <fileset dir="${dpml.home}/main/junit/jars">