notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1177 - trunk/main

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1177 - trunk/main
Date: Tue, 14 Mar 2006 17:13:09 +0100

Author: mcconnell
Date: 2006-03-14 17:13:08 +0100 (Tue, 14 Mar 2006)
New Revision: 1177

Added:
trunk/main/bootstrap.properties
trunk/main/bootstrap.xml
Modified:
trunk/main/bootstrap
trunk/main/bootstrap.bat
trunk/main/build.xml
trunk/main/library.xml
Log:
update bootstrap procedures

Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2006-03-14 16:12:43 UTC (rev 1176)
+++ trunk/main/bootstrap 2006-03-14 16:13:08 UTC (rev 1177)
@@ -37,6 +37,48 @@
cd .
}

+dpmlCommon()
+{
+ cd lang/common
+ build clean install
+ cd ../..
+}
+
+dpmlModule()
+{
+ cd lang/module
+ build clean install
+ cd ../..
+}
+
+dpmlPart()
+{
+ cd lang/part
+ build clean install
+ cd ../..
+}
+
+dpmlState()
+{
+ cd lang/state
+ build clean install
+ cd ../..
+}
+
+dpmlComonent()
+{
+ cd lang/component
+ build clean install
+ cd ../..
+}
+
+dpmlType()
+{
+ cd lang/type
+ build clean install
+ cd ../..
+}
+
transitMain()
{
cd transit/core
@@ -53,16 +95,16 @@

depotLibrary()
{
- cd depot/library/common
+ cd depot/library
build clean install
- cd ../../..
+ cd ../..
}

depotAntBuilder()
{
cd depot/tools/builder
build clean install
- cd ../../..
+ cd ../..
}

externalModules()
@@ -79,27 +121,33 @@
cd ../..
}

-depotLibraryConsole()
+depotBuild()
{
- cd depot/library/console
+ cd depot/build
build clean install
- cd ../../..
+ cd ../..
}

depotCoreConsole()
{
cd depot/core/console
- build clean bootstrap
+ build clean install
cd ../../..
}

ID=$1
antlibCleanup
+dpmlCommon
+dpmlPart
+dpmlModule
+dpmlState
+dpmlComponent
+dpmlType
transitMain
transitTools
depotLibrary
depotAntBuilder
externalModules
utilCli
-depotLibraryConsole
+depotBuild
depotCoreConsole

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-03-14 16:12:43 UTC (rev 1176)
+++ trunk/main/bootstrap.bat 2006-03-14 16:13:08 UTC (rev 1177)
@@ -13,11 +13,23 @@
set ID=%1
CALL :antlib-cleanup
IF ERRORLEVEL 1 GOTO :exit
+CALL :dpml-common
+IF ERRORLEVEL 1 GOTO :exit
+CALL :dpml-part
+IF ERRORLEVEL 1 GOTO :exit
+CALL :dpml-module
+IF ERRORLEVEL 1 GOTO :exit
+CALL :dpml-state
+IF ERRORLEVEL 1 GOTO :exit
+CALL :dpml-component
+IF ERRORLEVEL 1 GOTO :exit
+CALL :dpml-type
+IF ERRORLEVEL 1 GOTO :exit
CALL :transit-main
IF ERRORLEVEL 1 GOTO :exit
CALL :transit-tools
IF ERRORLEVEL 1 GOTO :exit
-CALL :depot-library
+CALL :dpml-library
IF ERRORLEVEL 1 GOTO :exit
CALL :depot-ant-builder
IF ERRORLEVEL 1 GOTO :exit
@@ -25,7 +37,7 @@
IF ERRORLEVEL 1 GOTO :exit
CALL :util-cli
IF ERRORLEVEL 1 GOTO :exit
-CALL :depot-library-console
+CALL :depot-build
IF ERRORLEVEL 1 GOTO :exit
CALL :depot-core-console
IF ERRORLEVEL 1 GOTO :exit
@@ -41,6 +53,42 @@
POPD
GOTO :EOF

+:dpml-common
+PUSHD lang\common
+CALL :build clean install
+POPD
+GOTO :EOF
+
+:dpml-module
+PUSHD lang\module
+CALL :build clean install
+POPD
+GOTO :EOF
+
+:dpml-part
+PUSHD lang\part
+CALL :build clean install
+POPD
+GOTO :EOF
+
+:dpml-state
+PUSHD lang\state
+CALL :build clean install
+POPD
+GOTO :EOF
+
+:dpml-component
+PUSHD lang\component
+CALL :build clean install
+POPD
+GOTO :EOF
+
+:dpml-type
+PUSHD lang\type
+CALL :build clean install
+POPD
+GOTO :EOF
+
:transit-main
PUSHD transit\core
CALL :build clean install
@@ -53,8 +101,8 @@
POPD
GOTO :EOF

-:depot-library
-PUSHD depot\library\common
+:dpml-library
+PUSHD depot\library
CALL :build clean install
POPD
GOTO :EOF
@@ -77,21 +125,25 @@
POPD
GOTO :EOF

-:depot-library-console
-PUSHD depot\library\console
+:depot-build
+PUSHD depot\build
CALL :build clean install
POPD
GOTO :EOF

:depot-core-console
PUSHD depot\core\console
-CALL :build clean bootstrap
+CALL :build clean install
POPD
GOTO :EOF

:build
IF "%ID%" == "" set ID=SNAPSHOT
set BUILD_ID=-Dbuild.signature=%ID%
+ECHO ### START BUILD ###
+@echo on
+cd
+@echo off
ECHO building project with release ID [%BUILD_ID%]
CALL ant %BUILD_ID% %*
set BUILD_ID=""

Copied: trunk/main/bootstrap.properties (from rev 1151,
trunk/main/transit/common.properties)
===================================================================
--- trunk/main/transit/common.properties 2006-02-28 23:21:19 UTC (rev
1151)
+++ trunk/main/bootstrap.properties 2006-03-14 16:13:08 UTC (rev 1177)
@@ -0,0 +1,19 @@
+
+dpml.xsd.version = 1.0
+dpml.repository = http://repository.dpml.net/classic
+
+junit.version = 3.8.1
+junit.filename = junit-${junit.version}.jar
+junit.uri = artifact:jar:junit/junit#${junit.version}
+junit.url = ${dpml.repository}/junit/jars/${junit.filename}
+
+transit-ant.version = 1.6.5
+transit-ant.filename = ant-${transit-ant.version}.jar
+transit-ant.parent = ant/jars
+transit-ant.path = ${transit-ant.parent}/${transit-ant.filename}
+ant.uri = artifact:jar:ant/ant#${transit-ant.version}
+
+ant.junit.filename = ant-junit-${transit-ant.version}.jar
+ant.junit.uri = artifact:jar:ant/ant-junit#${transit-ant.version}
+
+

Copied: trunk/main/bootstrap.xml (from rev 1151,
trunk/main/transit/bootstrap.xml)
===================================================================
--- trunk/main/transit/bootstrap.xml 2006-02-28 23:21:19 UTC (rev 1151)
+++ trunk/main/bootstrap.xml 2006-03-14 16:13:08 UTC (rev 1177)
@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+
+<project name="bootstrap">
+
+ <tstamp/>
+
+ 
+
+ <property environment="ENV"/>
+
+ <property file="${user.home}/ant.properties"/>
+ <property file="${basedir}/user.properties"/>
+ <property file="${home}/user.properties"/>
+ <property file="${basedir}/build.properties"/>
+ <property file="${home}/bootstrap.properties"/>
+
+ <property name="junit.url"
value="http://repository.dpml.net/classic/junit/jars/junit-3.8.1.jar"/>
+
+ <condition property="dpml.appdata.declared" value="true">
+ <isset property="ENV.APPDATA"/>
+ </condition>
+
+ <condition property="dpml.home.declared" value="true">
+ <isset property="ENV.DPML_HOME"/>
+ </condition>
+
+ <condition property="dpml.system.declared" value="true">
+ <isset property="ENV.DPML_SYSTEM"/>
+ </condition>
+
+ <condition property="gpg.declared" value="true">
+ <isset property="project.gpg.exe"/>
+ </condition>
+
+ <condition property="isWindows" value="true">
+ <os family="windows"/>
+ </condition>
+
+ <target name="setup" depends="dpml-setup,junit-setup"/>
+
+ <target name="dpml-setup"
depends="dpml-home,dpml-data,dpml-prefs,dpml-system"/>
+
+ <target name="dpml-home-environment" if="dpml.home.declared">
+ <property name="dpml.home" location="${ENV.DPML_HOME}"/>
+ </target>
+
+ <target name="dpml-appdata-environment" depends="dpml-home-environment"
unless="dpml.home.declared" if="dpml.appdata.declared">
+ <property name="dpml.home" location="${ENV.APPDATA}/DPML"/>
+ </target>
+
+ <target name="dpml-home-default" depends="dpml-appdata-environment"
unless="dpml.home.declared">
+ <property name="dpml.home" location="${user.home}/.dpml"/>
+ </target>
+
+ <target name="dpml-home" depends="dpml-home-default">
+ <mkdir dir="${dpml.home}"/>
+ </target>
+
+ <target name="dpml-data" depends="dpml-home">
+ <property name="dpml.data" location="${dpml.home}/data"/>
+ <echo>$${dpml.data} set to ${dpml.data}</echo>
+ <mkdir dir="${dpml.data}"/>
+ <property name="dpml.local.cache" location="${dpml.data}/cache"/>
+ <property name="dpml.docs" location="${dpml.data}/docs"/>
+ <property name="dpml.logs" location="${dpml.data}/logs"/>
+ <echo>$${dpml.local.cache} set to ${dpml.local.cache}</echo>
+ <echo>$${dpml.docs} set to ${dpml.docs}</echo>
+ <echo>$${dpml.logs} set to ${dpml.logs}</echo>
+ <mkdir dir="${dpml.local.cache}"/>
+ <mkdir dir="${dpml.docs}"/>
+ <mkdir dir="${dpml.logs}"/>
+ <available property="junit.cache.available"
file="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ </target>
+
+ <target name="dpml-prefs" depends="dpml-home">
+ <property name="dpml.prefs" location="${dpml.home}/prefs"/>
+ <mkdir dir="${dpml.prefs}"/>
+ </target>
+
+ <target name="dpml-system-environment" if="dpml.system.declared">
+ <property name="dpml.system" location="${ENV.DPML_SYSTEM}"/>
+ </target>
+
+ <target name="dpml-system" depends="dpml-system-environment,dpml-home">
+ <property name="dpml.system" location="${dpml.home}/share"/>
+ <mkdir dir="${dpml.system}"/>
+ </target>
+
+ <target name="junit-download" depends="dpml-data"
unless="junit.cache.available">
+ <mkdir dir="${dpml.local.cache}/junit/jars"/>
+ <get src="${junit.url}" usetimestamp="true"
dest="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ </target>
+
+ <target name="junit-test" depends="junit-download">
+ <available property="junit.available"
file="${user.home}/.ant/lib/junit.jar"/>
+ </target>
+
+ <target name="junit-setup" depends="junit-test" unless="junit.available">
+ <property name="junit.url"
value="${dpml.repository}/junit/jars/${junit.filename}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Installing JUnit
+#----------------------------------------------------------------------------------
+ </echo>
+ <mkdir dir="${dpml.local.cache}/junit/jars"/>
+ <get src="${junit.url}" usetimestamp="true"
dest="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ <mkdir dir="${user.home}/.ant/lib"/>
+ <copy tofile="${user.home}/.ant/lib/junit.jar"
file="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# The build procedure has updated the contents of the .ant/lib directory.
In order
+# to include the junit file within ant's classloader please restart the
build.
+#----------------------------------------------------------------------------------
+ </echo>
+ <fail status="99" message="Ant lib updated (restart may be required)."/>
+ </target>
+
+ 
+
+ <property name="project.name" value="UNKNOWN"/>
+ <property name="project.type" value="jar"/>
+ <property name="project.dir" location="${basedir}/target/test"/>
+
+ <condition property="signature.declared" value="true">
+ <isset property="build.signature"/>
+ </condition>
+
+ <property name="src" value="src"/>
+ <property name="src.main" value="main"/>
+ <property name="src.main.dir" value="${src}/${src.main}"/>
+ <property name="src.test" value="test"/>
+ <property name="src.test.dir" value="${src}/${src.test}"/>
+
+ <property name="etc" value="etc"/>
+ <property name="etc.main" value="${etc}/main"/>
+ <property name="etc.deliverables" value="${etc}/deliverables"/>
+ <property name="etc.test" value="${etc}/test"/>
+
+ <property name="target" value="target"/>
+ <property name="target.dir" location="${basedir}/${target}"/>
+
+ <property name="target.build.dir" location="${target.dir}/build"/>
+ <property name="target.build.test.dir"
location="${target.build.dir}/test"/>
+ <property name="target.build.main.dir"
location="${target.build.dir}/main"/>
+
+ <property name="target.classes.dir" location="${target.dir}/classes/main"/>
+ <property name="target.test-classes.dir"
location="${target.dir}/classes/test"/>
+ <property name="target.test-reports.dir"
location="${target.dir}/reports/test"/>
+ <property name="target.test.dir" location="${target.dir}/test"/>
+
+ <property name="target.deliverables.dir"
location="${target.dir}/deliverables"/>
+ <property name="target.deliverables.jars.dir"
location="${target.deliverables.dir}/jars"/>
+
+ <target name="setupReleaseFilename" if="signature.declared">
+ <property name="project.version" value="${build.signature}"/>
+ </target>
+
+ <target name="init" depends="setup,setupReleaseFilename">
+ <property name="project.version" value="SNAPSHOT"/>
+ <property name="build.signature" value="SNAPSHOT"/>
+ <property name="project.filename"
value="${project.name}-${project.version}.${project.type}"/>
+ <property name="dpml-transit-handler.filename"
value="dpml-transit-main-${project.version}.jar"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# ${project.group}/${project.name}#${project.version}
+#----------------------------------------------------------------------------------
+ </echo>
+ <filter value="${project.version}" token="PROJECT-VERSION"/>
+ <filter value="http://www.dpml.net"; token="PUBLISHER-URL"/>
+ <filter value="The Digital Product Meta Library" token="PUBLISHER-NAME"/>
+ </target>
+
+ <target name="setup-path" depends="init">
+ <path id="project.main.path">
+ <pathelement location="${ENV.ANT_HOME}/lib/ant.jar"/>
+ <pathelement location="${target.classes.dir}"/>
+ </path>
+ <path id="project.test.path">
+ <path refid="project.main.path"/>
+ <pathelement location="${ENV.ANT_HOME}/lib/ant-junit.jar"/>
+ <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ </path>
+ </target>
+
+ <available file="${etc.deliverables}"
property="etc.deliverables.available"/>
+ <target name="prepare-etc-deliverable" if="etc.deliverables.available">
+ <mkdir dir="${target.deliverables.dir}"/>
+ <copy toDir="${target.deliverables.dir}" filtering="on"
failonerror="false">
+ <fileset dir="${etc.deliverables}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <available file="${etc.main}" property="etc.main.available"/>
+ <target name="prepare-etc-main" if="etc.main.available">
+ <mkdir dir="${target.build.main.dir}"/>
+ <copy toDir="${target.build.main.dir}" filtering="on"
failonerror="false">
+ <fileset dir="${etc.main}">
+ <include name="**/*"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.jpeg"/>
+ <exclude name="**/*.png"/>
+ <exclude name="**/*.gif"/>
+ </fileset>
+ </copy>
+ <copy toDir="${target.build.main.dir}" filtering="off"
failonerror="false">
+ <fileset dir="${etc.main}">
+ <include name="**/*.jpg"/>
+ <include name="**/*.jpeg"/>
+ <include name="**/*.png"/>
+ <include name="**/*.gif"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <available file="${etc.test}" property="etc.test.available"/>
+ <target name="prepare-etc-test" if="etc.test.available">
+ 
+ <mkdir dir="${target.test.dir}"/>
+ <copy toDir="${target.test.dir}" filtering="on" failonerror="false">
+ <fileset dir="${etc.test}">
+ <include name="**/*"/>
+ <exclude name="**/*.jar"/>
+ </fileset>
+ </copy>
+ <copy toDir="${target.test.dir}" filtering="off" failonerror="false">
+ <fileset dir="${etc.test}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <available file="${etc}" property="etc.available"/>
+ <target name="prepare-etc" depends="init" if="etc.available">
+ 
+ <copy toDir="${target.dir}" filtering="on" failonerror="false">
+ <fileset dir="${etc}">
+ <exclude name="${etc.main}/*"/>
+ <exclude name="${etc.test}/*"/>
+ <exclude name="${etc.deliverables}/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <available file="${src.main.dir}" property="src.main.available"/>
+ <target name="prepare-src-main" depends="setup" if="src.main.available">
+ 
+ <mkdir dir="${target.build.main.dir}"/>
+ <copy toDir="${target.build.main.dir}" filtering="on"
failonerror="false">
+ <fileset dir="${src.main.dir}">
+ <include name="**/*"/>
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.png"/>
+ <exclude name="**/*.jpeg"/>
+ <exclude name="**/*.jpg"/>
+ </fileset>
+ </copy>
+ <copy toDir="${target.build.main.dir}" filtering="off"
failonerror="false">
+ <fileset dir="${src.main.dir}">
+ <include name="**/*.gif"/>
+ <include name="**/*.png"/>
+ <include name="**/*.jpeg"/>
+ <include name="**/*.jpg"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <available file="${src.test.dir}" property="src.test.available"/>
+ <target name="prepare-src-test" if="src.test.available">
+ 
+ <mkdir dir="${target.build.test.dir}"/>
+ <copy toDir="${target.build.test.dir}" filtering="on"
failonerror="false">
+ <fileset dir="${src.test.dir}">
+ <include name="**/*"/>
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.png"/>
+ <exclude name="**/*.jpeg"/>
+ <exclude name="**/*.jpg"/>
+ </fileset>
+ </copy>
+ <copy toDir="${target.build.test.dir}" filtering="off"
failonerror="false">
+ <fileset dir="${src.test.dir}">
+ <include name="**/*.gif"/>
+ <include name="**/*.png"/>
+ <include name="**/*.jpeg"/>
+ <include name="**/*.jpg"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="prepare-build-main" if="src.main.available">
+ 
+ <mkdir dir="${target.classes.dir}"/>
+ <copy toDir="${target.classes.dir}" failonerror="false">
+ <fileset dir="${target.build.main.dir}">
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="prepare-build-test" if="src.test.available">
+ 
+ <mkdir dir="${target.test-classes.dir}"/>
+ <copy toDir="${target.test-classes.dir}" failonerror="false">
+ <fileset dir="${target.build.test.dir}">
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="prepare"
depends="init,prepare-etc-deliverable,prepare-etc-main,
+ prepare-etc-test,prepare-etc, prepare-src-main, prepare-src-test,
+ prepare-build-main, prepare-build-test">
+ <tstamp/>
+ </target>
+
+ <target name="build.setup" depends="prepare" if="src.main.available">
+ <available file="${target.build.main.dir}"
property="build.main.available"/>
+ </target>
+
+ <target name="build" depends="build.setup,setup-path"
if="build.main.available">
+ 
+ <javac srcdir="${target.build.main.dir}" destdir="${target.classes.dir}"
debug="true"
+ source="1.4" target="1.4">
+ <classpath refid="project.main.path"/>
+ </javac>
+ </target>
+
+ <target name="package.setup" depends="build" if="src.main.available">
+ <available file="${target.classes.dir}"
property="target.classes.available"/>
+ </target>
+
+ <target name="package" depends="jar.asc"/>
+
+ <target name="jar" depends="package.setup" if="target.classes.available">
+ <mkdir dir="${target.deliverables.jars.dir}"/>
+ <jar destfile="${target.deliverables.jars.dir}/${project.filename}"
+ basedir="${target.classes.dir}"
+ includes="**/*.class,**/*.xml,**/*.properties,**/*.dtd"
+ excludes="**/*.html,**/*.gif,**/*.png">
+ <manifest>
+ <attribute name="Created-By" value="The Digital Product Meta
Library."/>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Extension-Name" value="${project.name}"/>
+ <attribute name="Specification-Vendor" value="DPML"/>
+ <attribute name="Specification-Version"
value="${project.specification.version}"/>
+ <attribute name="Implementation-Vendor" value="DPML"/>
+ <attribute name="Implementation-Vendor-Id" value="net.dpml"/>
+ <attribute name="Implementation-Version"
value="${project.version}"/>
+ </manifest>
+ </jar>
+ <checksum fileext=".md5"
file="${target.deliverables.jars.dir}/${project.filename}"/>
+ </target>
+
+ <target name="jar.check" depends="jar">
+ <available file="${target.deliverables.jars.dir}/${project.filename}"
property="jar.available"/>
+ </target>
+
+ <target name="jar.asc" depends="jar.check" if="jar.available">
+ <antcall target="execute.jar.asc"/>
+ </target>
+
+ <target name="execute.jar.asc" if="gpg.declared">
+ <echo message="Generating ASC"/>
+ <delete file="${target.deliverables.jars.dir}/${project.filename}.asc"/>
+ <exec executable="${project.gpg.exe}">
+ <arg value="-a"/>
+ <arg value="-b"/>
+ <arg value="-o"/>
+ <arg value="${target.deliverables.jars.dir}/${project.filename}.asc"/>
+ <arg value="${target.deliverables.jars.dir}/${project.filename}"/>
+ </exec>
+ </target>
+
+ 
+ <target name="build-tests" depends="package" if="src.test.available">
+ <mkdir dir="${target.test-classes.dir}"/>
+ <javac srcdir="${target.build.test.dir}"
+ destdir="${target.test-classes.dir}"
+ debug="true"
+ source="1.4" target="1.4">
+ <classpath refid="project.test.path"/>
+ </javac>
+ </target>
+
+ 
+ <target name="test" depends="build-tests" if="src.test.available">
+ <mkdir dir="${target.test.dir}"/>
+ <mkdir dir="${target.test-reports.dir}"/>
+ <junit fork="true" dir="${basedir}"
+ printsummary="yes"
+ showoutput="true"
+ haltonfailure="yes" failureproperty="junit.failure"
+ haltonerror="yes" errorproperty="junit.error">
+ <sysproperty key="build.signature" value="${build.signature}"/>
+ <sysproperty key="project.test.dir" value="${target.test.dir}"/>
+ <classpath>
+ <path refid="project.test.path"/>
+ <pathelement location="${target.test-classes.dir}"/>
+ </classpath>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <batchtest fork="yes" todir="${target.test-reports.dir}">
+ <fileset dir="${target.build.test.dir}">
+ <include name="**/*TestCase.java"/>
+ <exclude name="**/Abstract*.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ 
+ </target>
+
+ <target name="install.setup" depends="test">
+ <available file="${target.deliverables.dir}"
property="deliverables.available"/>
+ </target>
+
+ <target name="install" depends="install.setup" if="deliverables.available">
+ 
+ <echo>Installing to: ${dpml.local.cache}/${project.group}</echo>
+ <mkdir dir="${dpml.local.cache}/${project.group}"/>
+ <copy toDir="${dpml.local.cache}/${project.group}" overwrite="true">
+ <fileset dir="${target.deliverables.dir}"/>
+ </copy>
+ </target>
+
+ <target name="clean">
+ <delete dir="${target.dir}"/>
+ </target>
+
+</project>
+
+

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-03-14 16:12:43 UTC (rev 1176)
+++ trunk/main/build.xml 2006-03-14 16:13:08 UTC (rev 1177)
@@ -37,7 +37,7 @@
</target>

<target name="build" depends="standard.build">
- <x:plugin uri="link:plugin:dpml/metro/dpml-metro-tools"/>
+ <x:plugin uri="link:part:dpml/metro/dpml-metro-tools"/>
<c:catalog title="DPML Catalog">
<fileset dir="${basedir}">
<include name="**/target/classes/main/**/*.type"/>
@@ -60,9 +60,7 @@

<target name="replicate" depends="standard.install">
<property name="share.local" location="${share}/local"/>
- <x:replicate self="true" verbose="false" toDir="${share.local}"
layout="modern">
- <include ref="jgoodies"/>
- </x:replicate>
+ <x:replicate self="true" verbose="false" toDir="${share.local}"
layout="modern"/>
</target>

<target name="zip" depends="bundle,replicate" description="Creates a
binary w32 distribution.">
@@ -209,7 +207,7 @@
<copy todir="${share.bin}" filtering="false">
<fileset dir="transit/console/target/bin"/>
<fileset dir="depot/core/console/target/bin"/>
- <fileset dir="depot/library/console/target/bin"/>
+ <fileset dir="depot/build/target/bin"/>
<fileset dir="metro/station/console/target/bin"/>
<fileset dir="metro/station/server/target/bin"/>
<fileset dir="metro/exec/target/bin"/>
@@ -281,7 +279,7 @@
<target name="checkstyle" depends="prepare">
<property name="checkstyle.dir"
location="${basedir}/target/reports/checkstyle"/>
<property name="checkstyle.data"
location="${checkstyle.dir}/checkstyle.xml"/>
- <x:plugin uri="link:plugin:dpml/depot/dpml-depot-checkstyle">
+ <x:plugin uri="link:part:dpml/depot/dpml-depot-checkstyle">
<task class="net.dpml.tools.checkstyle.CheckstyleTask"
name="checkstyle"/>
</x:plugin>
<mkdir dir="${checkstyle.dir}"/>

Modified: trunk/main/library.xml
===================================================================
--- trunk/main/library.xml 2006-03-14 16:12:43 UTC (rev 1176)
+++ trunk/main/library.xml 2006-03-14 16:13:08 UTC (rev 1177)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE library PUBLIC "-//DPML//DTD Library 1.0//EN"
"http://download.dpml.net/dtds/library_1_0.dtd"; >
+<library xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">

-<library>
-
<imports>
<import uri="link:module:junit"/>
<import uri="link:module:ant"/>
- <import uri="link:module:jgoodies"/>
</imports>

<modules>
@@ -29,11 +28,12 @@
<type id="module" alias="true"/>
</types>

- <module file="transit/module.xml"/>
- <module file="metro/module.xml"/>
- <module file="depot/module.xml"/>
- <module file="util/module.xml"/>
- <module file="planet/module.xml"/>
+ <import file="lang/module.xml"/>
+ <import file="transit/module.xml"/>
+ <import file="metro/module.xml"/>
+ <import file="depot/module.xml"/>
+ <import file="util/module.xml"/>
+ <import file="planet/module.xml"/>

<project name="central" basedir="central"/>

r1177 - trunk/main, mcconnell at BerliOS, 03/14/2006