notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r1161 - in development/main: . magic magic/bootstrap magic/bootstrap/etc magic/bootstrap/etc/deliverables magic/bootstrap/etc/main magic/bootstrap/etc/test magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/bootstrap/src/test magic/core magic/core/etc/main magic/core/etc/test magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/tasks transit transit/handler transit/handler/etc/deliverables transit/handler/etc/main

From: mcconnell AT netcompartner.com
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r1161 - in development/main: . magic magic/bootstrap magic/bootstrap/etc magic/bootstrap/etc/deliverables magic/bootstrap/etc/main magic/bootstrap/etc/test magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/bootstrap/src/test magic/core magic/core/etc/main magic/core/etc/test magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/tasks transit transit/handler transit/handler/etc/deliverables transit/handler/etc/main
Date: Sat, 11 Dec 2004 21:11:13 +0100

Author: mcconnell
Date: Sat Dec 11 21:11:13 2004
New Revision: 1161

Added:
development/main/magic/bootstrap/etc/
development/main/magic/bootstrap/etc/deliverables/
development/main/magic/bootstrap/etc/main/
development/main/magic/bootstrap/etc/test/
development/main/magic/bootstrap/src/test/
development/main/magic/core/etc/main/
development/main/magic/core/etc/test/
development/main/transit/handler/etc/deliverables/
development/main/transit/handler/etc/main/
Removed:
development/main/magic/bootstrap/bootstrap.properties
Modified:
development/main/magic/bootstrap/build.properties
development/main/magic/bootstrap/build.xml

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

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

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

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

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

development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
development/main/magic/core/build.properties
development/main/magic/core/build.xml
development/main/magic/core/src/main/net/dpml/magic/Index.java
development/main/magic/core/src/main/net/dpml/magic/antlib.xml
development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java

development/main/magic/core/src/main/net/dpml/magic/tasks/InitializeTask.java
development/main/magic/index.xml
development/main/setup.properties
development/main/setup.xml
development/main/transit/handler/build.xml
development/main/transit/index.xml
Log:
housekeeping - please note that $ ant setup will fail - please use $ ant
-file setup.xml

Modified: development/main/magic/bootstrap/build.properties
==============================================================================
--- development/main/magic/bootstrap/build.properties (original)
+++ development/main/magic/bootstrap/build.properties Sat Dec 11 21:11:13
2004
@@ -1,8 +1,11 @@

-project.name = dpml-transit-task
+project.name = dpml-magic-bootstrap
project.version = SNAPSHOT
-project.group = dpml/transit
+project.group = dpml/magic

project.filename = ${project.name}-${project.version}.jar
project.antlib = ${project.name}.jar

+dpml-transit-handler.filename = dpml-transit-main-SNAPSHOT.jar
+
+

Modified: development/main/magic/bootstrap/build.xml
==============================================================================
--- development/main/magic/bootstrap/build.xml (original)
+++ development/main/magic/bootstrap/build.xml Sat Dec 11 21:11:13 2004
@@ -1,61 +1,63 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-transit-task" default="install" basedir="." >
+<project name="dpml-magic-bootstrap" default="install" basedir="." >

- <import file="../../bootstrap.xml"/>
+ <import file="../../bootstrap.xml"/>

- <target name="init" depends="bootstrap.init">
- <echo>
+ <available classname="junit.framework.TestCase"
property="junit.available"/>
+
+ <target name="init" depends="bootstrap.init">
+ <echo>

#----------------------------------------------------------------------------------
-# Bootstrap build of Transit for Ant
+# Magic Bootstrap

#----------------------------------------------------------------------------------
- </echo>
- </target>
+ </echo>
+ </target>

- <target name="build" depends="prepare">
- <javac srcdir="target/build/main" destdir="target/classes"
debug="true">
- <classpath>
- <pathelement
location="${user.home}/.ant/lib/dpml-transit-main.jar"/>
- </classpath>
- </javac>
- </target>
-
- <target name="build-tests" depends="prepare,build">
- <mkdir dir="target/test-classes"/>
- <javac srcdir="target/build/test"
- destdir="target/test-classes"
- debug="true">
- <classpath>
- <pathelement
location="${user.home}/.ant/lib/dpml-transit-main.jar"/>
- <pathelement location="target/classes"/>
- </classpath>
- </javac>
- </target>
-
- <target name="test" depends="build-tests" >
- <mkdir dir="target/test-reports"/>
- <junit printsummary="yes" haltonfailure="yes" showoutput="true"
- dir="${basedir}" fork="true" forkmode="perBatch">
- <classpath>
- <pathelement location="target/classes"/>
- <pathelement location="target/test-classes"/>
- <pathelement
location="${user.home}/.ant/lib/dpml-transit-main.jar"/>
- </classpath>
- <formatter type="plain"/>
- <batchtest fork="yes" todir="target/test-reports">
- <fileset dir="target/build/test">
- <include name="**/*TestCase.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="install" depends="bootstrap.install">
- <echo>Installing to: ${user.home}/.ant/lib</echo>
- <copy toFile="${user.home}/.ant/lib/${project.antlib}"
- file="${basedir}/target/deliverables/jars/${project.filename}">
- </copy>
- </target>
+ <target name="build" depends="prepare">
+ <javac srcdir="target/build/main" destdir="target/classes" debug="true">
+ <classpath>
+ <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="build-tests" depends="prepare,build">
+ <mkdir dir="target/test-classes"/>
+ <javac srcdir="target/build/test"
+ destdir="target/test-classes"
+ debug="true">
+ <classpath>
+ <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement location="target/classes"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="test" depends="build-tests" if="junit.available">
+ <mkdir dir="target/test-reports"/>
+ <junit printsummary="yes" haltonfailure="yes" showoutput="true"
+ dir="${basedir}" fork="true" forkmode="perBatch">
+ <classpath>
+ <pathelement location="target/classes"/>
+ <pathelement location="target/test-classes"/>
+ <pathelement location="${user.home}/.ant/lib/dpml-transit-main.jar"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest fork="yes" todir="target/test-reports">
+ <fileset dir="target/build/test">
+ <include name="**/*TestCase.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="install" depends="bootstrap.install">
+ <echo>Installing to: ${user.home}/.ant/lib</echo>
+ <copy toFile="${user.home}/.ant/lib/${project.antlib}"
+ file="${basedir}/target/deliverables/jars/${project.filename}">
+ </copy>
+ </target>

</project>

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/AntAdapter.java
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/AntAdapter.java
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/AntAdapter.java
Sat Dec 11 21:11:13 2004
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.transit.task;
+package net.dpml.magic.bootstrap;

import java.net.URL;

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
Sat Dec 11 21:11:13 2004
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.transit.task;
+package net.dpml.magic.bootstrap;

import java.io.File;

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/PluginManager.java
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/PluginManager.java
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/PluginManager.java
Sat Dec 11 21:11:13 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package net.dpml.transit.task;
+package net.dpml.magic.bootstrap;

import net.dpml.transit.Transit;
import net.dpml.transit.artifact.Artifact;

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/PluginTask.java
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/PluginTask.java
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/PluginTask.java
Sat Dec 11 21:11:13 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package net.dpml.transit.task;
+package net.dpml.magic.bootstrap;

import java.io.InputStream;
import java.net.URI;

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TargetFactory.java
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TargetFactory.java
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TargetFactory.java
Sat Dec 11 21:11:13 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package net.dpml.transit.task;
+package net.dpml.magic.bootstrap;

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

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
Sat Dec 11 21:11:13 2004
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.transit.task;
+package net.dpml.magic.bootstrap;

import java.io.File;
import java.io.InputStream;

Modified: development/main/magic/core/build.properties
==============================================================================
--- development/main/magic/core/build.properties (original)
+++ development/main/magic/core/build.properties Sat Dec 11 21:11:13
2004
@@ -7,3 +7,8 @@

project.filename = ${project.name}-${project.version}.jar
project.antlib = ${project.name}.jar
+
+
+dpml-transit-handler.filename = dpml-transit-main-SNAPSHOT.jar
+dpml-magic-bootstrap.filename = dpml-magic-bootstrap-SNAPSHOT.jar
+junit.filename = junit-3.8.1.jar

Modified: development/main/magic/core/build.xml
==============================================================================
--- development/main/magic/core/build.xml (original)
+++ development/main/magic/core/build.xml Sat Dec 11 21:11:13 2004
@@ -5,13 +5,14 @@
<import file="../../bootstrap.xml"/>

<available classname="net.dpml.transit.Main" property="transit.available"/>
+ <available classname="junit.framework.TestCase"
property="junit.available"/>

<filter token="PROJECT-PLUGIN-URI" value="${project.plugin.uri}"/>

<target name="init" depends="bootstrap.init">
<echo>

#----------------------------------------------------------------------------------
-# Bootstrap build of Magic
+# Magic Core

#----------------------------------------------------------------------------------
</echo>
</target>
@@ -22,14 +23,14 @@
<target name="build" depends="prepare">
<javac srcdir="target/build/main" destdir="target/classes" debug="true">
<classpath>
- <pathelement location="${user.home}/.ant/lib/dpml-transit-main.jar"/>
- <pathelement location="${user.home}/.ant/lib/dpml-transit-task.jar"/>
+ <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
</classpath>
</javac>
<taskdef name="export" classname="net.dpml.magic.tasks.ExportTask">
<classpath>
- <pathelement location="${user.home}/.ant/lib/dpml-transit-main.jar"/>
- <pathelement location="${user.home}/.ant/lib/dpml-transit-task.jar"/>
+ <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
<pathelement location="target/classes"/>
</classpath>
</taskdef>
@@ -38,28 +39,41 @@
</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>
+ </copy>
+ </target>
+
<target name="build-tests" depends="prepare,build">
<mkdir dir="target/test-classes"/>
<javac srcdir="target/build/test"
destdir="target/test-classes"
debug="true">
<classpath>
- <pathelement location="${user.home}/.ant/lib/dpml-transit-main.jar"/>
- <pathelement location="${user.home}/.ant/lib/dpml-transit-task.jar"/>
+ <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
<pathelement location="target/classes"/>
</classpath>
</javac>
</target>

- <target name="test" depends="build-tests" >
+ <target name="test" depends="build-tests" if="junit.available">
<mkdir dir="target/test-reports"/>
<junit printsummary="yes" haltonfailure="yes" showoutput="true"
dir="${basedir}" fork="true" forkmode="perBatch">
<classpath>
<pathelement location="target/classes"/>
<pathelement location="target/test-classes"/>
- <pathelement location="${user.home}/.ant/lib/dpml-transit-main.jar"/>
- <pathelement location="${user.home}/.ant/lib/dpml-transit-task.jar"/>
+ <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
+ <pathelement
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>

Modified: development/main/magic/core/src/main/net/dpml/magic/Index.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/Index.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/Index.java Sat
Dec 11 21:11:13 2004
@@ -18,34 +18,38 @@

package net.dpml.magic;

+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Hashtable;
+
import net.dpml.magic.builder.ElementHelper;
import net.dpml.magic.builder.IndexBuilder;
import net.dpml.magic.builder.XMLDefinitionBuilder;
import net.dpml.magic.model.Definition;
import net.dpml.magic.model.Resource;
import net.dpml.magic.model.ResourceRef;
+
import net.dpml.transit.Transit;
import net.dpml.transit.TransitException;
import net.dpml.transit.artifact.Handler;
import net.dpml.transit.repository.Repository;
import net.dpml.transit.repository.StandardLoader;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Location;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Property;
import org.apache.tools.ant.types.DataType;
+
import org.w3c.dom.Element;
+
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
/**
* A Index is an immutable data object that aggregates a suite of buildable
* project defintions relative to local and external dependencies.

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 Sat
Dec 11 21:11:13 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="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/core/src/main/net/dpml/magic/tasks/ExportTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java
Sat Dec 11 21:11:13 2004
@@ -18,16 +18,6 @@

package net.dpml.magic.tasks;

-import net.dpml.magic.model.Definition;
-import net.dpml.magic.model.Info;
-import net.dpml.magic.model.Resource;
-import net.dpml.magic.model.ResourceRef;
-import net.dpml.magic.project.Context;
-import net.dpml.magic.project.DeliverableHelper;
-import net.dpml.transit.task.PluginTask;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -37,6 +27,18 @@
import java.util.ArrayList;
import java.util.Date;

+import net.dpml.magic.model.Definition;
+import net.dpml.magic.model.Info;
+import net.dpml.magic.model.Resource;
+import net.dpml.magic.model.ResourceRef;
+import net.dpml.magic.project.Context;
+import net.dpml.magic.project.DeliverableHelper;
+
+import net.dpml.magic.bootstrap.PluginTask;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+
/**
* Create a repository plugin meta data descriptor in the form of a
* properties file.

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
Sat Dec 11 21:11:13 2004
@@ -17,15 +17,18 @@

package net.dpml.magic.tasks;

+import java.net.URI;
+
import net.dpml.magic.model.Definition;
import net.dpml.magic.model.Resource;
import net.dpml.magic.model.ResourceRef;
+import net.dpml.magic.bootstrap.PluginTask;
+
import net.dpml.transit.repository.Plugin;
-import net.dpml.transit.task.PluginTask;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildListener;

-import java.net.URI;

/**
* The initialize task loads and plugins that a project

Modified: development/main/magic/index.xml
==============================================================================
--- development/main/magic/index.xml (original)
+++ development/main/magic/index.xml Sat Dec 11 21:11:13 2004
@@ -45,6 +45,20 @@
Magic and associated spells.
-->

+ <project basedir="bootstrap">
+ <info>
+ <group>dpml/magic</group>
+ <name>dpml-magic-bootstrap</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="dpml-transit-main"/>
+ <include key="ant"/>
+ </dependencies>
+ </project>
+
<project basedir="core">
<info>
<group>dpml/magic</group>
@@ -54,7 +68,7 @@
<type>jar</type>
</info>
<dependencies>
- <include key="dpml-transit-task"/>
+ <include key="dpml-magic-bootstrap"/>
<include key="ant-junit"/>
</dependencies>
</project>
@@ -109,7 +123,6 @@
</info>
<dependencies>
<include key="dpml-magic-core"/>
- <include key="dpml-transit-task"/>
<include key="saxon" runtime="true" build="true" test="true" />
</dependencies>
</project>

Modified: development/main/setup.properties
==============================================================================
--- development/main/setup.properties (original)
+++ development/main/setup.properties Sat Dec 11 21:11:13 2004
@@ -15,6 +15,3 @@
ant.jar = ant-1.6.2.jar
ant-nodeps.jar = ant-nodeps-1.6.2.jar
ant-junit.jar = ant-junit-1.6.2.jar
-
-transit.jar = dpml-transit-main.jar
-magic.jar = dpml-magic-core.jar

Modified: development/main/setup.xml
==============================================================================
--- development/main/setup.xml (original)
+++ development/main/setup.xml Sat Dec 11 21:11:13 2004
@@ -72,82 +72,24 @@
# Installing JUnit

#----------------------------------------------------------------------------------
</echo>
- 
- <mkdir dir="${user.home}/.ant/lib"/>
+ <mkdir dir="${dpml.home}/main/junit/jars"/>
<get src="${junit.url}" usetimestamp="true"
- dest="${user.home}/.ant/lib/${junit.jar}"/>
- <echo>
-#----------------------------------------------------------------------------------
-# WARNING: Setup has installed JUnit but your setup is not complete.
-# Please run 'ant setup' to complete the bootstrapping phase.
-#----------------------------------------------------------------------------------
- </echo>
- </target>
-
+ dest="${dpml.home}/main/junit/jars/${junit.jar}"/>

- <target name="magic-check" if="magic.available">
- <echo>
-#----------------------------------------------------------------------------------
-# WARNING: Setup has detected an installed version of Magic under the ant lib
-# directory: ${user.home}/.ant/lib.
-#
-# The latest version of Magic is now loaded as a plugin by Transit and the
magic jar
-# in your .ant/lib directory will cause a conflict. In order for setup to
proceeed
-# please delete the magic jar file from .ant/lib.
-#----------------------------------------------------------------------------------
- </echo>
- <fail message="Please delete the Magic jar file from
${user.home}/.ant/lib."/>
+ <mkdir dir="${user.home}/.ant/lib"/>
+ <copy toDir="${user.home}/.ant/lib">
+ <fileset dir="${dpml.home}/main/junit/jars">
+ <include name="${junit.jar}"/>
+ </fileset>
+ </copy>
</target>

- <target name="setup" depends="init,junit-install,magic-check"
- if="junit.available">
+ <target name="setup" depends="init,junit-install">

<ant dir="transit/handler"/>
- <ant dir="transit/task"/>
+ <ant dir="magic/bootstrap"/>
<ant dir="magic/core"/>

- <mkdir dir="${dpml.home}/docs"/>
- <mkdir dir="${dpml.home}/templates"/>
-
-
-
- <copy toDir="${dpml.home}">
- <fileset dir="magic/core/target/deliverables">
- <include name="templates/**"/>
- <include name="themes/**"/>
- <include name="processes/**"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="transit-clean" if="transit.available">
- <echo>
-#----------------------------------------------------------------------------------
-# WARNING:
-# ${user.home}/.ant/lib/${transit.jar}
-# Setup has detected an old version of transit. To complete the
-# installation please delete the file and re-start setup with the following
command:
-# $ ant setup
-#----------------------------------------------------------------------------------
- </echo>
- <fail message="Remove ${user.home}/.ant/lib/${transit.jar} to
continue."/>
- </target>
-
- <target name="magic-clean" if="magic.available">
- <echo>
-#----------------------------------------------------------------------------------
-# WARNING:
-# ${user.home}/.ant/lib/${magic.jar}
-# Setup has detected an old version of magic. To complete the
-# installation please delete the file and re-start setup with the following
command:
-# $ ant setup
-#----------------------------------------------------------------------------------
- </echo>
- <fail message="Remove ${user.home}/.ant/lib/${magic.jar} to continue."/>
</target>

</project>

Modified: development/main/transit/handler/build.xml
==============================================================================
--- development/main/transit/handler/build.xml (original)
+++ development/main/transit/handler/build.xml Sat Dec 11 21:11:13 2004
@@ -7,7 +7,7 @@
<target name="init" depends="bootstrap.init">
<echo>

#----------------------------------------------------------------------------------
-# Bootstrap build of Transit
+# Transit Protocol Handler

#----------------------------------------------------------------------------------
</echo>
<mkdir dir="${dpml.home}/transit"/>

Modified: development/main/transit/index.xml
==============================================================================
--- development/main/transit/index.xml (original)
+++ development/main/transit/index.xml Sat Dec 11 21:11:13 2004
@@ -54,20 +54,6 @@
</info>
</project>

- <project basedir="task">
- <info>
- <group>dpml/transit</group>
- <name>dpml-transit-task</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <type>jar</type>
- </info>
- <dependencies>
- <include key="dpml-transit-main"/>
- <include key="ant"/>
- </dependencies>
- </project>
-
<project basedir="plugin">
<info>
<group>dpml/transit</group>

svn commit: r1161 - in development/main: . magic magic/bootstrap magic/bootstrap/etc magic/bootstrap/etc/deliverables magic/bootstrap/etc/main magic/bootstrap/etc/test magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/bootstrap/src/test magic/core magic/core/etc/main magic/core/etc/test magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/tasks transit transit/handler transit/handler/etc/deliverables transit/handler/etc/main, mcconnell, 12/11/2004