notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r1599 - in development/main: . central/site/src/docs/about/community/people/mcconnell magic/bootstrap magic/core transit transit/handler

From: mcconnell AT netcompartner.com
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r1599 - in development/main: . central/site/src/docs/about/community/people/mcconnell magic/bootstrap magic/core transit transit/handler
Date: Sat, 29 Jan 2005 04:25:27 +0100

Author: mcconnell
Date: Sat Jan 29 04:25:26 2005
New Revision: 1599

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

development/main/central/site/src/docs/about/community/people/mcconnell/background.xml
development/main/magic/bootstrap/build.xml
development/main/magic/core/build.xml
development/main/setup.xml
development/main/transit/dist.xml
development/main/transit/handler/build.properties
development/main/transit/handler/build.xml
Log:
Update the boostrap sequence to build the transit core, magic bootstrap
package, and magic core as separate builds from the main build. Add a
dist.xml to handle the construction of a binary distribution.

Modified: development/main/bootstrap.xml
==============================================================================
--- development/main/bootstrap.xml (original)
+++ development/main/bootstrap.xml Sat Jan 29 04:25:26 2005
@@ -22,8 +22,8 @@

<property environment="ENV"/>

+ <property file="bootstrap.properties"/>
<property file="build.properties"/>
-
<property name="project.name" value="UNKNOWN"/>
<property name="project.type" value="jar"/>

Modified:
development/main/central/site/src/docs/about/community/people/mcconnell/background.xml
==============================================================================
---
development/main/central/site/src/docs/about/community/people/mcconnell/background.xml
(original)
+++
development/main/central/site/src/docs/about/community/people/mcconnell/background.xml
Sat Jan 29 04:25:26 2005
@@ -6,32 +6,48 @@
</properties>
<body>
<section name="Stephen McConnell">
+
<subsection name="Background">
+
<p>
- Chaired the Object Management Group Electronic Commerce Domain Task
Force
- from 1996 through to 1999, during which time he facilitated the
+ Chaired the <a href="http://www.ong.org";>Object Management Group</a>
+ Electronic Commerce Domain Task Force
+ from 1996 through to 2000, during which time he facilitated the
establishment of a common reference architecture and technology
adoption process
- covering B2B community collaboration standards (receiving an OMG
+ covering <a
href="http://www.omg.org/technology/documents/formal/negotiation.htm";>
+ B2B community collaboration standards</a> (receiving an OMG
Distinguished Service Award in 2000). Over the last six years, he's
been
responsible for the coordination of a number of collaborative research
and
development activities related to the delivery of a distributed
service
management platform (OSM, France) and the <i>osm.planet</i> global
service
management architecture.
</p>
+
<p>
International experience in business development
across the United States, Europe and Japan. He's been responsible for
ground
breaking technology developments within the Australian, North American
and
European IT industry. He's successfully managed the delivery of
commercial
products in the Computer Aided Design industry, high-end proprietary
simulation
- applications in the pharmaceuticals industry (Pilkington Glass, US),
production
- systems in the ceramics industry (Caroma, Aust), and world-class
innovations in
- simulation related to underground and open-cut mining industries
(Newmont Mining,
+ applications in the pharmaceuticals industry (<a
href="http://www.sola.com.au";>
+ Sola International</a> Australia, <a href="http://www.pilkington.com/";>
+ Pilkington Glass</a>, US). He has managed production trials in the
ceramics industry
+ (<a href="http://www.caroma.com.au/company/index.html";>Caroma</a>,
Aust), delivered
+ world-class innovations in simulation related to underground and
open-cut mining
+ industries (<a href="http://www.newmont.com/en/";>Newmont Mining</a>,
Aust). He's also led several international projects dealing with
distributed
- service management in the B2B and financial services domain.
+ service management in B2B and financial services, embedded system
+ in the transport sector (EU digital tachograph recommendations for
+ smartcard based onboard driver logging), and the development of
+ <a href="http://archive.museophile.lsbu.ac.uk/osaf/";>common
architecture
+ guidelines</a> for embedded system under the European Community OMI
Programme.
</p>
- </subsection>
+
+ </subsection>
+
</section>
+
</body>
+
</document>

Added: development/main/magic/bootstrap/bootstrap.properties
==============================================================================
--- (empty file)
+++ development/main/magic/bootstrap/bootstrap.properties Sat Jan 29
04:25:26 2005
@@ -0,0 +1,6 @@
+
+project.group = dpml/magic
+project.name = dpml-magic-bootstrap
+project.antlib = ${project.name}.jar
+junit-filename = junit-3.8.1.jar
+

Added: development/main/magic/bootstrap/bootstrap.xml
==============================================================================
--- (empty file)
+++ development/main/magic/bootstrap/bootstrap.xml Sat Jan 29 04:25:26
2005
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+
+<project name="dpml-magic-bootstrap" default="install" basedir="." >
+
+ <import file="../../bootstrap.xml"/>
+
+ <available classname="junit.framework.TestCase"
property="junit.available"/>
+
+ <target name="init" depends="bootstrap.init">
+ <echo>
+#----------------------------------------------------------------------------------
+# Magic Bootstrap
+#----------------------------------------------------------------------------------
+ </echo>
+ </target>
+
+ <target name="build" depends="prepare">
+ <javac srcdir="target/build/main" destdir="target/classes" debug="true">
+ <classpath>
+ <pathelement
location="${dpml.home}/cache/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}/cache/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="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ </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/build.xml
==============================================================================
--- development/main/magic/bootstrap/build.xml (original)
+++ development/main/magic/bootstrap/build.xml Sat Jan 29 04:25:26 2005
@@ -18,63 +18,9 @@
limitations under the License.
-->

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

- <import file="../../bootstrap.xml"/>
-
- <available classname="junit.framework.TestCase"
property="junit.available"/>
-
- <target name="init" depends="bootstrap.init">
- <echo>
-#----------------------------------------------------------------------------------
-# Magic Bootstrap
-#----------------------------------------------------------------------------------
- </echo>
- </target>
-
- <target name="build" depends="prepare">
- <javac srcdir="target/build/main" destdir="target/classes" debug="true">
- <classpath>
- <pathelement
location="${dpml.home}/cache/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}/cache/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="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- </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>
+ <magic:import uri="artifact:template:dpml/magic/standard"/>

</project>

Added: development/main/magic/core/bootstrap.properties
==============================================================================
--- (empty file)
+++ development/main/magic/core/bootstrap.properties Sat Jan 29 04:25:26
2005
@@ -0,0 +1,5 @@
+
+project.group = dpml/magic
+project.name = dpml-magic-core
+project.antlib = ${project.name}.jar
+junit-filename = junit-3.8.1.jar

Added: development/main/magic/core/bootstrap.xml
==============================================================================
--- (empty file)
+++ development/main/magic/core/bootstrap.xml Sat Jan 29 04:25:26 2005
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+
+<project name="dpml-magic-core" default="dist" basedir=".">
+
+ <import file="../../bootstrap.xml"/>
+
+ <available classname="net.dpml.transit.Main" property="transit.available"/>
+ <available classname="junit.framework.TestCase"
property="junit.available"/>
+
+ <target name="init" depends="bootstrap.init">
+ <echo>
+#----------------------------------------------------------------------------------
+# Magic Core
+#----------------------------------------------------------------------------------
+ </echo>
+
+ <property name="dpml-magic-core.uri"
+
value="artifact:plugin:dpml/magic/dpml-magic-core#${project.version}"/>
+
+ <echo>HANDLER FILENAME: ${dpml-transit-handler.filename}</echo>
+ <echo>BOOT FILENAME: ${dpml-magic-bootstrap.filename}</echo>
+ <echo>MAGIC URI: ${dpml-magic-core.uri}</echo>
+
+ <filter token="PROJECT-PLUGIN-URN"
value="plugin:dpml/magic/dpml-magic-core"/>
+ <filter token="PROJECT-PLUGIN-URI" value="${dpml-magic-core.uri}"/>
+ </target>
+
+ 
+ <target name="build" depends="prepare">
+ <javac srcdir="target/build/main" destdir="target/classes" debug="true">
+ <classpath>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
+ </classpath>
+ </javac>
+ <taskdef name="export" classname="net.dpml.magic.tasks.ExportTask">
+ <classpath>
+ <pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
+ <pathelement location="target/classes"/>
+ </classpath>
+ </taskdef>
+ <export>
+ <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"/>
+ <copy toDir="${dpml.home}">
+ <fileset dir="target/deliverables">
+ <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="${dpml.home}/cache/junit/jars/${junit-filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.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="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
+ <pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
+ </classpath>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <batchtest fork="yes" todir="target/test-reports">
+ <fileset dir="target/build/test">
+ <include name="**/*TestCase.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="dist" depends="install">
+ <jar jarfile="${basedir}/target/deliverables/jars/dpml-magic-LATEST.jar"
>
+ <fileset dir="${user.home}" >
+ <include name=".ant/lib/dpml-magic-bootstrap.jar" />
+ <include name=".ant/lib/junit-3.8.1.jar" />
+ </fileset>
+ </jar>
+ </target>
+</project>
+

Modified: development/main/magic/core/build.xml
==============================================================================
--- development/main/magic/core/build.xml (original)
+++ development/main/magic/core/build.xml Sat Jan 29 04:25:26 2005
@@ -1,123 +1,30 @@
<?xml version="1.0" encoding="UTF-8" ?>
-

-<project name="dpml-magic-core" default="dist" basedir=".">
-
- <import file="../../bootstrap.xml"/>
-
- <available classname="net.dpml.transit.Main" property="transit.available"/>
- <available classname="junit.framework.TestCase"
property="junit.available"/>
-
- <target name="init" depends="bootstrap.init">
- <echo>
-#----------------------------------------------------------------------------------
-# Magic Core
-#----------------------------------------------------------------------------------
- </echo>
-
- <property name="dpml-magic-core.uri"
-
value="artifact:plugin:dpml/magic/dpml-magic-core#${project.version}"/>
-
- <echo>HANDLER FILENAME: ${dpml-transit-handler.filename}</echo>
- <echo>BOOT FILENAME: ${dpml-magic-bootstrap.filename}</echo>
- <echo>MAGIC URI: ${dpml-magic-core.uri}</echo>
+<project name="dpml-magic-core" default="install" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

- <filter token="PROJECT-PLUGIN-URN"
value="plugin:dpml/magic/dpml-magic-core"/>
- <filter token="PROJECT-PLUGIN-URI" value="${dpml-magic-core.uri}"/>
- </target>
-
- 
- <target name="build" depends="prepare">
- <javac srcdir="target/build/main" destdir="target/classes" debug="true">
- <classpath>
- <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
- </classpath>
- </javac>
- <taskdef name="export" classname="net.dpml.magic.tasks.ExportTask">
- <classpath>
- <pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
- <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
- <pathelement location="target/classes"/>
- </classpath>
- </taskdef>
- <export>
- <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"/>
- <copy toDir="${dpml.home}">
- <fileset dir="target/deliverables">
- <include name="themes/**"/>
- <include name="processes/**"/>
- </fileset>
- </copy>
- </target>
+ <magic:import uri="artifact:template:dpml/magic/standard"/>

- <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}/cache/junit/jars/${junit-filename}"/>
- <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
- <pathelement location="target/classes"/>
- </classpath>
- </javac>
+ <target name="package" depends="standard.package">
+ <x:export resource="net/dpml/magic/plugin.xml"
urn="plugin:dpml/magic/dpml-magic-core"/>
</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="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
- <pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
- </classpath>
- <formatter type="plain"/>
- <formatter type="xml"/>
- <batchtest fork="yes" todir="target/test-reports">
- <fileset dir="target/build/test">
- <include name="**/*TestCase.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="dist" depends="install">
- <jar jarfile="${basedir}/target/deliverables/jars/dpml-magic-LATEST.jar"
>
- <fileset dir="${user.home}" >
- <include name=".ant/lib/dpml-magic-bootstrap.jar" />
- <include name=".ant/lib/junit-3.8.1.jar" />
- </fileset>
- </jar>
- </target>
</project>
-

Modified: development/main/setup.xml
==============================================================================
--- development/main/setup.xml (original)
+++ development/main/setup.xml Sat Jan 29 04:25:26 2005
@@ -85,15 +85,15 @@
</target>

<target name="setup" depends="init,junit-install">
- <ant dir="transit/handler"/>
- <ant dir="magic/bootstrap"/>
- <ant dir="magic/core"/>
+ <ant dir="transit/handler" antfile="bootstrap.xml"/>
+ <ant dir="magic/bootstrap" antfile="bootstrap.xml"/>
+ <ant dir="magic/core" antfile="bootstrap.xml"/>
</target>

<target name="clean">
- <ant dir="transit/handler" target="clean"/>
- <ant dir="magic/bootstrap" target="clean"/>
- <ant dir="magic/core" target="clean"/>
+ <ant dir="transit/handler" target="clean" antfile="bootstrap.xml"/>
+ <ant dir="magic/bootstrap" target="clean" antfile="bootstrap.xml"/>
+ <ant dir="magic/core" target="clean" antfile="bootstrap.xml"/>
</target>

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

Modified: development/main/transit/dist.xml
==============================================================================
--- development/main/transit/dist.xml (original)
+++ development/main/transit/dist.xml Sat Jan 29 04:25:26 2005
@@ -17,23 +17,27 @@
limitations under the License.
-->

-<project name="dpml-transit-dist" default="install" basedir="."
+<project name="dpml-transit" default="install" 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="install">
- <property name="dist" value="${basedir}/target/dist"/>
- <delete dir="${dist}"/>
- <property name="root" value="${dist}/transit"/>
+ <target name="prepare">
+ <property name="work" value="${basedir}/target/work"/>
+ <delete dir="${work}"/>
+ <mkdir dir="${work}"/>
+ </target>
+
+ <target name="build" depends="prepare">
+ <property name="root" value="${work}/transit"/>
<echo>Adding application properties to ${root}</echo>
<mkdir dir="${root}"/>
<copy todir="${root}">
<fileset dir="handler/target/setup"/>
</copy>
<x:property name="util.version" id="dpml-util" feature="version"/>
- <property name="local" value="${dist}/local"/>
+ <property name="local" value="${work}/local"/>
<echo>Creating local cache content</echo>
<mkdir dir="${local}"/>
<copy todir="${local}">
@@ -50,14 +54,14 @@
<include name="modules/*.*"/>
</fileset>
</copy>
- <property name="bin" value="${dist}/bin"/>
+ <property name="bin" value="${work}/bin"/>
<echo>Adding scripts from ${bin}</echo>
<mkdir dir="${bin}"/>
<copy todir="${bin}">
<fileset dir="plugin/target/bin"/>
</copy>
<echo>${dpml.docs}</echo>
- <property name="api" value="${dist}/docs/api"/>
+ <property name="api" value="${work}/docs/api"/>
<echo>Adding api documentation from ${api}</echo>
<mkdir dir="${api}"/>
<copy todir="${api}">
@@ -68,4 +72,13 @@
</copy>
</target>

+ <target name="package" depends="build">
+ <property name="dist" value="${basedir}/target/dist"/>
+ <delete dir="${dist}"/>
+ <mkdir dir="${dist}"/>
+ <zip destfile="${dist}/${project.name}-${project.version}.zip"
basedir="${work}"/>
+ </target>
+
+ <target name="install" depends="package"/>
+
</project>

Added: development/main/transit/handler/bootstrap.properties
==============================================================================
--- (empty file)
+++ development/main/transit/handler/bootstrap.properties Sat Jan 29
04:25:26 2005
@@ -0,0 +1,6 @@
+
+project.group = dpml/transit
+project.name = dpml-transit-main
+project.antlib = ${project.name}.jar
+junit-filename = junit-3.8.1.jar
+

Added: development/main/transit/handler/bootstrap.xml
==============================================================================
--- (empty file)
+++ development/main/transit/handler/bootstrap.xml Sat Jan 29 04:25:26
2005
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+
+<project name="dpml-transit-main" default="install" basedir="." >
+
+ <import file="../../bootstrap.xml"/>
+
+ <target name="init" depends="bootstrap.init">
+ <filter token="TRANSIT-CONTROLLER-PLUGIN"
+
value="artifact:plugin:dpml/transit/dpml-transit-plugin#${project.version}"/>
+ <filter token="TRANSIT-INSTALLER-PLUGIN"
+ value="artifact:plugin:osm/util/osm-util-installer#CURRENT"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Transit Protocol Handler
+#----------------------------------------------------------------------------------
+ </echo>
+ <mkdir dir="${dpml.home}/transit"/>
+ </target>
+
+ <target name="package" depends="build">
+ <mkdir dir="${target.deliverables.jars.dir}"/>
+ <mkdir dir="${basedir}/target/classes/transit"/>
+ <copy todir="${basedir}/target/classes/transit">
+ <fileset dir="${basedir}/target/setup"/>
+ </copy>
+ <jar destfile="${target.deliverables.jars.dir}/${project.filename}"
+ basedir="${target.classes.dir}"
+ includes="**/*.*" excludes="**/*.html">
+ <manifest>
+ <attribute name="Main-Class" value="${project.jar.main.class}"/>
+ </manifest>
+ </jar>
+ </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}"
overwrite="true">
+ </copy>
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
+ <copy toDir="${dpml.home}/transit" overwrite="true" filtering="true">
+ <fileset dir="${target.dir}/setup"/>
+ </copy>
+ </target>
+
+</project>
+

Modified: development/main/transit/handler/build.properties
==============================================================================
--- development/main/transit/handler/build.properties (original)
+++ development/main/transit/handler/build.properties Sat Jan 29 04:25:26
2005
@@ -1,11 +1,3 @@

-project.group = dpml/transit
-project.name = dpml-transit-main
-
-project.antlib = ${project.name}.jar
-
project.test.fork = true
-
-junit-filename = junit-3.8.1.jar
-
-project.jar.main.class=net.dpml.transit.Installer
\ No newline at end of file
+project.jar.main.class=net.dpml.transit.Installer

Modified: development/main/transit/handler/build.xml
==============================================================================
--- development/main/transit/handler/build.xml (original)
+++ development/main/transit/handler/build.xml Sat Jan 29 04:25:26 2005
@@ -18,48 +18,11 @@
limitations under the License.
-->

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

- <import file="../../bootstrap.xml"/>
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
+ <magic:import uri="artifact:template:dpml/magic/standard"/>

- <target name="init" depends="bootstrap.init">
- <filter token="TRANSIT-CONTROLLER-PLUGIN"
-
value="artifact:plugin:dpml/transit/dpml-transit-plugin#${project.version}"/>
- <filter token="TRANSIT-INSTALLER-PLUGIN"
- value="artifact:plugin:osm/util/osm-util-installer#CURRENT"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Transit Protocol Handler
-#----------------------------------------------------------------------------------
- </echo>
- <mkdir dir="${dpml.home}/transit"/>
- </target>
-
- <target name="package" depends="build">
- <mkdir dir="${target.deliverables.jars.dir}"/>
- <mkdir dir="${basedir}/target/classes/transit"/>
- <copy todir="${basedir}/target/classes/transit">
- <fileset dir="${basedir}/target/setup"/>
- </copy>
- <jar destfile="${target.deliverables.jars.dir}/${project.filename}"
- basedir="${target.classes.dir}"
- includes="**/*.*" excludes="**/*.html">
- <manifest>
- <attribute name="Main-Class" value="${project.jar.main.class}"/>
- </manifest>
- </jar>
- </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}"
overwrite="true">
- </copy>
- <filter token="PROJECT-VERSION" value="${project.version}"/>
- <copy toDir="${dpml.home}/transit" overwrite="true" filtering="true">
- <fileset dir="${target.dir}/setup"/>
- </copy>
- </target>

</project>
-

svn commit: r1599 - in development/main: . central/site/src/docs/about/community/people/mcconnell magic/bootstrap magic/core transit transit/handler, mcconnell, 01/28/2005