Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1750 - in development/main: . home home/transit home/transit/handler/src/main/net/dpml/transit/artifact magic metro metro/main metro/main/etc/bin metro/main/etc/deliverables/bin

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1750 - in development/main: . home home/transit home/transit/handler/src/main/net/dpml/transit/artifact magic metro metro/main metro/main/etc/bin metro/main/etc/deliverables/bin
  • Date: Mon, 07 Feb 2005 10:24:39 +0100

Author: mcconnell
Date: Mon Feb 7 10:24:39 2005
New Revision: 1750

Added:
development/main/metro/main/etc/bin/
- copied from r1746, development/main/metro/main/etc/deliverables/bin/
development/main/metro/main/etc/bin/metro
- copied unchanged from r1749,
development/main/metro/main/etc/deliverables/bin/metro
development/main/metro/main/etc/bin/metro.bat
- copied unchanged from r1749,
development/main/metro/main/etc/deliverables/bin/metro.bat
Removed:
development/main/metro/main/etc/deliverables/bin/
Modified:
development/main/ (props changed)
development/main/home/build.xml
development/main/home/common.properties
development/main/home/transit/ (props changed)

development/main/home/transit/handler/src/main/net/dpml/transit/artifact/FileCacheHandler.java
development/main/magic/index.xml
development/main/magic/module.xml
development/main/metro/index.xml
development/main/metro/main/build.xml
development/main/metro/module.xml
Log:
Correction to a number of project definitions to include multiple types were
applicable (in particular under the magic module). Update to module files to
generate working distributions. Move bin directory in metro/main out of
deliverables. Some other minor bumping and tweaking based on installer
feedback.

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml (original)
+++ development/main/home/build.xml Mon Feb 7 10:24:39 2005
@@ -21,13 +21,20 @@

<project name="dpml-home" default="install" basedir=".">

- <property file="${basedir}/build.properties"/>
- <import file="${home}/standard.xml"/>
-
+ <import file="${basedir}/standard.xml"/>
<property name="bundle" value="${basedir}/target/bundle"/>
+ <property name="dist" location="${basedir}/target/dist"/>
+
+ <condition property="nsi.available" value="false">
+ <isset property="makensis.exe"/>
+ </condition>
+
+ <target name="init" depends="standard.init">
+ <filter token="PROJECT-NAME" value="${project.name}"/>
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
+ </target>

<target name="install" depends="standard.install,bundle">
- <property name="dist" location="${basedir}/target/dist"/>
<mkdir dir="${dist}"/>
<antcall target="install.zip"/>
<antcall target="install.tar"/>
@@ -36,6 +43,7 @@
<copy todir="${export}">
<fileset dir="${dist}"/>
</copy>
+ <antcall target="install-antlib"/>
</target>

<target name="install.zip">
@@ -96,7 +104,7 @@
</exec>
</target>

- <target name="bundle" depends="install.children">
+ <target name="bundle" depends="init,install.children">
<delete dir="${basedir}/target/bundle"/>
<mkdir dir="${bundle}/cache"/>
<!-- create the transit configuration directory -->
@@ -114,6 +122,12 @@
<copy todir="${local}/${commons-cli.parent}">
<fileset dir="${dpml.cache}/${commons-cli.parent}"/>
</copy>
+ <mkdir dir="${local}/${transit-ant.parent}"/>
+ <copy todir="${local}/${transit-ant.parent}">
+ <fileset dir="${dpml.cache}/${transit-ant.parent}">
+ <include name="${transit-ant.filename}"/>
+ </fileset>
+ </copy>
<copy todir="${local}/dpml/util">
<fileset dir="${basedir}/util/target/deliverables"/>
<fileset dir="${basedir}/util/cli/target/deliverables"/>
@@ -177,10 +191,21 @@
<target name="update" depends="install">
<echo>

#----------------------------------------------------------------------------------
+# Updating DPML installation. ${dpml.home}
+#----------------------------------------------------------------------------------
+ </echo>
+ <copy todir="${dpml.home}">
+ <fileset dir="${bundle}"/>
+ </copy>
+ </target>
+
+ <target name="install-antlib" depends="init">
+ <echo>
+#----------------------------------------------------------------------------------
# Updating Ant. ${user.dir}/.ant/lib

#----------------------------------------------------------------------------------
</echo>
- <delete verbose="true">
+ <delete verbose="true" failonerror="false">
<fileset dir="${user.home}/.ant/lib">
<include name="dpml-*.*"/>
<exclude name="dpml-transit-main.jar"/>
@@ -191,14 +216,6 @@

file="${bundle}/local/${project.version}/dpml/transit/jars/dpml-transit-main-${project.version}.jar"/>
<copy tofile="${user.home}/.ant/lib/dpml-transit-tools.jar"

file="${bundle}/local/${project.version}/dpml/transit/jars/dpml-transit-tools-${project.version}.jar"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating DPML installation. ${dpml.home}
-#----------------------------------------------------------------------------------
- </echo>
- <copy todir="${dpml.home}">
- <fileset dir="${bundle}"/>
- </copy>
</target>

<target name="clean">

Modified: development/main/home/common.properties
==============================================================================
--- development/main/home/common.properties (original)
+++ development/main/home/common.properties Mon Feb 7 10:24:39 2005
@@ -1,13 +1,17 @@

+dpml.repository = http://repository.dpml.net/classic
+
+junit.filename = junit-3.8.1.jar
+
commons-cli.version = 1.0
commons-cli.filename = commons-cli-${commons-cli.version}.jar
commons-cli.parent = commons-cli/jars
commons-cli.path = ${commons-cli.parent}/${commons-cli.filename}
commons-cli.uri = artifact:jar:commons-cli/commons-cli#${commons-cli.version}

-dpml.repository = http://repository.dpml.net/classic
-
-junit.filename = junit-3.8.1.jar
-
-ant.uri = artifact:jar:ant/ant#1.6.2
+transit-ant.version = 1.6.2
+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}


Modified:
development/main/home/transit/handler/src/main/net/dpml/transit/artifact/FileCacheHandler.java
==============================================================================
---
development/main/home/transit/handler/src/main/net/dpml/transit/artifact/FileCacheHandler.java
(original)
+++
development/main/home/transit/handler/src/main/net/dpml/transit/artifact/FileCacheHandler.java
Mon Feb 7 10:24:39 2005
@@ -118,6 +118,7 @@
String path = artifact.getPath();
File destination = new File( m_cacheDir, path );
boolean exist = destination.exists();
+
ResourceHost known = findKnownGroupHost( artifact, destination );

boolean success = download( known, artifact, destination );

Modified: development/main/magic/index.xml
==============================================================================
--- development/main/magic/index.xml (original)
+++ development/main/magic/index.xml Mon Feb 7 10:24:39 2005
@@ -44,22 +44,6 @@
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>
@@ -84,7 +68,10 @@
<name>dpml-magic-bar</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
- <type>jar</type>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-magic-core"/>
@@ -97,65 +84,42 @@
<name>dpml-magic-publish</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
- <type>jar</type>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-magic-core"/>
</dependencies>
</project>

- <!--
- <project basedir="spells/checkstyle">
- <info>
- <group>dpml/magic</group>
- <name>dpml-magic-checkstyle</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <type>jar</type>
- </info>
- <dependencies>
- <include key="checkstyle"/>
- <include key="dpml-magic-core"/>
- <include key="dpml-magic-style"/>
- </dependencies>
- </project>
- -->
-
<project basedir="spells/eclipse">
<info>
<group>dpml/magic</group>
<name>dpml-magic-eclipse</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
- <type>jar</type>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-magic-core"/>
</dependencies>
</project>

- <!--
- <project basedir="spells/style">
- <info>
- <group>dpml/magic</group>
- <name>dpml-magic-style</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <type>jar</type>
- </info>
- <dependencies>
- <include key="dpml-transit-main"/>
- </dependencies>
- </project>
- -->
-
<project basedir="spells/doc/task">
<info>
<group>dpml/magic</group>
<name>dpml-magic-doc</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
- <type>jar</type>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-magic-core"/>
@@ -195,7 +159,10 @@
<name>dpml-magic-upload</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
- <type>jar</type>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-magic-core"/>
@@ -210,7 +177,10 @@
<name>dpml-magic-example</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
- <type>jar</type>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-magic-core"/>

Modified: development/main/magic/module.xml
==============================================================================
--- development/main/magic/module.xml (original)
+++ development/main/magic/module.xml Mon Feb 7 10:24:39 2005
@@ -45,15 +45,48 @@

<target name="dist" depends="init">
<property name="bundle" value="${basedir}/target/bundle"/>
- <property name="anchor" value="${bundle}/${project.version}"/>
+ <property name="anchor" value="${bundle}/local/${project.version}"/>
<x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
<x:replicate refid="module.path" toDir="${anchor}" />
<copy todir="${anchor}/${project.group}">
<fileset dir="target/deliverables"/>
</copy>
+ <!--
+ Eeek - because we have non-versioned templates and a few other
non-versioned things
+ we need to workaround non-inclusion of these artifacts in the
replication path. This
+ means reaching into the cache and pulling in the resources manually.
The long-term
+ solution to this is to untroduce urn to uri mapping within transit.
+ -->
+ <copy todir="${anchor}/${project.group}">
+ <fileset dir="${dpml.cache}/dpml/magic">
+ <include name="eclipses/**"/>
+ <include name="templates/**"/>
+ <include name="formats/**"/>
+ <include name="licenses/**"/>
+ <include name="processes/**"/>
+ <include name="themes/**"/>
+ </fileset>
+ </copy>
+ <!--
+ Add the javadoc to the dist.
+ -->
+ <property name="docs.src"
location="${dpml.docs}/api/${project.group}/${project.version}"/>
+ <property name="docs.dest"
location="${bundle}/docs/api/${project.group}/${project.version}"/>
+ <mkdir dir="${docs.dest}"/>
+ <copy todir="${docs.dest}">
+ <fileset dir="${docs.src}"/>
+ </copy>
+ <!--
+ Package the bundle into a compressed archive is place under ${dpml.dist}.
+ -->
<x:dist compression="gzip">
<fileset dir="${bundle}"/>
</x:dist>
+ <property name="export"
location="${dpml.dist}/${project.group}/${project.version}"/>
+ <mkdir dir="${export}"/>
+ <copy todir="${export}">
+ <fileset dir="target/dist"/>
+ </copy>
</target>

<target name="javadoc" depends="package">

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml (original)
+++ development/main/metro/index.xml Mon Feb 7 10:24:39 2005
@@ -182,6 +182,10 @@
<name>dpml-meta-tools</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-meta-impl"/>
@@ -198,8 +202,11 @@
<group>dpml/metro/tools</group>
<name>dpml-metro-main</name>
<version>1.0.0</version>
- <type>jar</type>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-logging-api" tag="api"/>
@@ -306,6 +313,10 @@
<name>dpml-composition-impl</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-transit-main" tag="api"/>
@@ -406,6 +417,10 @@
<name>dpml-system-impl</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-system-spi" tag="spi"/>
@@ -477,6 +492,10 @@
<name>dpml-logging-log4j</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-logging-spi" tag="spi"/>
@@ -538,6 +557,10 @@
<name>dpml-logging-logkit-datagram</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-util-i18n"/>
@@ -552,6 +575,10 @@
<name>dpml-logging-logkit-socket</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-util-i18n"/>
@@ -566,6 +593,10 @@
<name>dpml-logging-logkit-syslog</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-util-i18n"/>
@@ -602,6 +633,9 @@
<name>dpml-activation-api</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ </types>
</info>
<dependencies>
<include key="dpml-composition-spi"/>
@@ -614,6 +648,10 @@
<name>dpml-activation-metro-provider</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-activation-api" tag="api"/>
@@ -633,6 +671,10 @@
<name>dpml-activation-avalon-provider</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-activity-api" tag="api"/>
@@ -656,6 +698,10 @@
<name>dpml-activation-impl</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
</info>
<dependencies>
<include key="dpml-transit-main" tag="api"/>

Modified: development/main/metro/main/build.xml
==============================================================================
--- development/main/metro/main/build.xml (original)
+++ development/main/metro/main/build.xml Mon Feb 7 10:24:39 2005
@@ -31,7 +31,7 @@
<target name="bin" depends="prepare">
<mkdir dir="${dpml.home}/bin"/>
<copy todir="${dpml.home}/bin" overwrite="true">
- <fileset dir="target/deliverables/bin"/>
+ <fileset dir="target/bin"/>
</copy>
<chmod file="${dpml.home}/bin/metro" perm="755"/>
<chmod file="${dpml.home}/bin/transit" perm="755"/>

Modified: development/main/metro/module.xml
==============================================================================
--- development/main/metro/module.xml (original)
+++ development/main/metro/module.xml Mon Feb 7 10:24:39 2005
@@ -33,7 +33,49 @@
</target>

<target name="install" depends="docs,standard.install">
- <x:replicate toDir="${dpml.home}/local/${project.version}" />
+ <!--<x:replicate toDir="${dpml.home}/local/${project.version}" />-->
+ <antcall target="dist"/>
+ </target>
+
+ <target name="dist" depends="init">
+ <property name="bundle" value="${basedir}/target/bundle"/>
+ <property name="anchor" value="${bundle}/local/${project.version}"/>
+ <x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
+ <x:replicate refid="module.path" toDir="${anchor}" />
+ <copy todir="${anchor}/${project.group}">
+ <fileset dir="target/deliverables"/>
+ </copy>
+
+ <!--
+ Add the non-version bin files to the bin directory.
+ -->
+ <copy todir="${bundle}/bin">
+ <fileset dir="${basedir}/main/target/bin"/>
+ </copy>
+ <chmod file="${bundle}/bin/metro" perm="755"/>
+
+ <!--
+ Add the javadoc to the dist.
+ -->
+ <property name="docs.src"
location="${dpml.docs}/api/${project.group}/${project.version}"/>
+ <property name="docs.dest"
location="${bundle}/docs/api/${project.group}/${project.version}"/>
+ <mkdir dir="${docs.dest}"/>
+ <copy todir="${docs.dest}">
+ <fileset dir="${docs.src}"/>
+ </copy>
+
+ <!--
+ Package the bundle into a compressed archive is place under ${dpml.dist}.
+ -->
+ <x:dist compression="gzip">
+ <fileset dir="${bundle}"/>
+ </x:dist>
+
+ <property name="export"
location="${dpml.dist}/${project.group}/${project.version}"/>
+ <mkdir dir="${export}"/>
+ <copy todir="${export}">
+ <fileset dir="target/dist"/>
+ </copy>
</target>

<target name="docs" depends="javadocs,junit-report"/>



  • svn commit: r1750 - in development/main: . home home/transit home/transit/handler/src/main/net/dpml/transit/artifact magic metro metro/main metro/main/etc/bin metro/main/etc/deliverables/bin, mcconnell, 02/07/2005

Archive powered by MHonArc 2.6.24.

Top of Page