notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r1786 - in development/main: home home/transit home/transit/handler home/transit/handler/etc/conf home/transit/handler/etc/setup/authority home/transit/handler/src/main/net/dpml/io home/transit/handler/src/main/net/dpml/transit home/transit/handler/src/main/net/dpml/transit/monitors home/transit/plugin home/transit/plugin/etc/bin home/transit/tools/src/main/net/dpml/transit/tools home/util magic magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/tasks metro metro/main metro/main/etc/conf

From: mcconnell AT netcompartner.com
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r1786 - in development/main: home home/transit home/transit/handler home/transit/handler/etc/conf home/transit/handler/etc/setup/authority home/transit/handler/src/main/net/dpml/io home/transit/handler/src/main/net/dpml/transit home/transit/handler/src/main/net/dpml/transit/monitors home/transit/plugin home/transit/plugin/etc/bin home/transit/tools/src/main/net/dpml/transit/tools home/util magic magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/tasks metro metro/main metro/main/etc/conf
Date: Wed, 16 Feb 2005 10:50:54 +0100

Author: mcconnell
Date: Wed Feb 16 10:50:52 2005
New Revision: 1786

Added:
development/main/home/TRANSIT.TXT
- copied unchanged from r1773, development/main/home/README.TXT
development/main/magic/MAGIC.TXT
- copied unchanged from r1773, development/main/magic/README.TXT
development/main/metro/METRO.TXT
- copied unchanged from r1773, development/main/metro/README.TXT
Removed:
development/main/home/README.TXT
development/main/home/transit/handler/etc/conf/
development/main/magic/README.TXT
development/main/metro/README.TXT
development/main/metro/main/etc/conf/
Modified:
development/main/home/build.xml
development/main/home/standard.xml
development/main/home/transit/build.xml
development/main/home/transit/handler/build.xml
development/main/home/transit/handler/etc/setup/authority/hosts.xml

development/main/home/transit/handler/src/main/net/dpml/io/ResourceHelper.java

development/main/home/transit/handler/src/main/net/dpml/transit/Transit.java

development/main/home/transit/handler/src/main/net/dpml/transit/monitors/SystemMonitor.java
development/main/home/transit/plugin/build.xml
development/main/home/transit/plugin/etc/bin/transit.bat

development/main/home/transit/tools/src/main/net/dpml/transit/tools/GetTask.java
development/main/home/util/build.xml
development/main/magic/core/src/main/net/dpml/magic/Index.java
development/main/magic/core/src/main/net/dpml/magic/tasks/InstallTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/ProjectTask.java
development/main/magic/module.xml
development/main/metro/main/build.xml
development/main/metro/module.xml
Log:
Updated the build procedure (was an incorrct reference that was causing a bad
ant distribution in the shared repository). Removed the generation
transit.exe and metro.exe in favout of PATH mungling using the NSIS
installer. Added ${dpml.prefs}/magic/magic.properties to magic, updated the
Javadoc task to generate locally then replicate to shared doc repository,
lots a tweaks and improvements to the build procedure, and some updates to
the transit internal system monitoring.

NOTE - this commit will break nix scripts.
During the build scripts are placed under ${dpml.system}/bin
${dpml.system} now defaults to ${dpml.home}/share if $DPML_SYSTEM if
undefined.
Someone with nix skills need to update all of the nix scripts to reflect the
above.
Windows scripts are ok.

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml (original)
+++ development/main/home/build.xml Wed Feb 16 10:50:52 2005
@@ -61,7 +61,7 @@

<copy todir="${bundle}" filtering="true">
<fileset dir="${basedir}">
- <include name="README.TXT"/>
+ <include name="TRANSIT.TXT"/>
<include name="LICENSE.TXT"/>
<include name="NOTICE.TXT"/>
</fileset>
@@ -84,7 +84,8 @@
</copy>


- <property name="local" value="${bundle}/local"/>
+ <property name="share" value="${bundle}/share"/>
+ <property name="local" value="${share}/local"/>
<echo>Creating local repository ${local}</echo>
<mkdir dir="${local}/dpml/util"/>
<mkdir dir="${local}/${commons-cli.parent}"/>
@@ -118,21 +119,15 @@
</copy>


- <property name="bin" value="${bundle}/bin"/>
+ <property name="bin" value="${share}/bin"/>
<echo>Adding scripts from ${bin}</echo>
<mkdir dir="${bin}"/>
<copy todir="${bin}">
<fileset dir="${basedir}/transit/plugin/target/bin"/>
</copy>
- <mkdir dir="${bin}/win32"/>
- <copy toDir="${bin}">
- <fileset dir="${basedir}/transit/handler/target">
- <include name="win32/**"/>
- </fileset>
- </copy>


- <property name="api" value="${bundle}/docs/api"/>
+ <property name="api" value="${share}/docs/api"/>
<echo>Adding api documentation to ${api}</echo>
<mkdir dir="${api}/dpml/util/${project.version}"/>
<copy todir="${api}/dpml/util/${project.version}">
@@ -158,7 +153,7 @@

#----------------------------------------------------------------------------------
</echo>
<copy todir="${dpml.system}" preservelastmodified="true">
- <fileset dir="${bundle}">
+ <fileset dir="${share}">
<include name="bin/**"/>
</fileset>
</copy>
@@ -170,6 +165,10 @@
<mkdir dir="${dpml.cache}/dpml/transit/templates"/>
<copy toFile="${dpml.cache}/dpml/transit/templates/standard.template"
file="${basedir}/standard.xml"/>
+ <mkdir dir="${dpml.docs}/api"/>
+ <copy todir="${dpml.docs}/api" preservelastmodified="true">
+ <fileset dir="${api}"/>
+ </copy>
<echo>

#----------------------------------------------------------------------------------
# Updating DPML PREFS installation. ${dpml.prefs}
@@ -203,10 +202,18 @@
<target name="install.zip">
<echo message="Generating ZIP dist"/>
<zip destfile="${dist}/${project.name}-${project.version}.zip"
whenempty="create">
- <zipfileset dir="${bundle}/bin" prefix="bin"/>
- <zipfileset dir="${bundle}/prefs" prefix="Preferences"/>
- <zipfileset dir="${bundle}/data" prefix="Data"/>
<zipfileset dir="${bundle}">
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.TXT"/>
+ <include name="TRANSIT.TXT"/>
+ </zipfileset>
+ <zipfileset dir="${share}/bin" prefix="Shared/bin">
+ <include name="**/*.bat"/>
+ <include name="**/security.properties"/>
+ </zipfileset>
+ <zipfileset dir="${prefs}" prefix="Preferences"/>
+ <zipfileset dir="${bundle}/data" prefix="Data"/>
+ <zipfileset dir="${share}" prefix="Shared">
<include name="**/*"/>
<exclude name="bin/**"/>
<exclude name="prefs/**"/>
@@ -231,17 +238,15 @@
<target name="install.tar">
<echo message="Generating TAR dist"/>
<tar destfile="${dist}/${project.name}-${project.version}.tar.gz"
compression="gzip" longfile="gnu">
- <tarfileset dir="${bundle}/bin" prefix="bin">
+ <tarfileset dir="${bin}" prefix="share/bin">
<include name="security.policy"/>
- <include name="*.bat"/>
</tarfileset>
- <tarfileset dir="${bundle}/bin" prefix="bin" mode="755">
+ <tarfileset dir="${bin}" prefix="share/bin" mode="755">
<include name="*.sh"/>
<include name="transit"/>
</tarfileset>
<tarfileset dir="${bundle}">
- <include name="**/*"/>
- <exclude name="bin/**"/>
+ <exclude name="share/bin/**"/>
</tarfileset>
</tar>
<checksum fileext=".md5"
file="${dist}/${project.name}-${project.version}.tar.gz"/>
@@ -268,26 +273,6 @@
</taskdef>
</target>

- <target name="install.junit.check" depends="transit.setup">
- <available property="cache.junit.available"
file="${dpml.cache}/junit/jars/${junit.filename}"/>
- </target>
-
- <target name="install.junit" depends="install.junit.check"
unless="cache.junit.available">
- <echo>Installing Junit.</echo>
- <get xmlns="antlib:net.dpml.transit" property="junit.path"
- uri="${junit.uri}"/>
- </target>
-
- <target name="install.ant.junit.check" depends="transit.setup">
- <available property="ant.junit.available"
file="${dpml.cache}/ant/jars/${ant.junit.filename}"/>
- </target>
-
- <target name="install.ant.junit" depends="install.ant.junit.check"
unless="ant.junit.available">
- <echo>Installing Ant Junit adapter.</echo>
- <get xmlns="antlib:net.dpml.transit" property="ant-junit.path"
- uri="${ant.junit.uri}"/>
- </target>
-
<target name="update" depends="install"/>

<target name="clean">

Modified: development/main/home/standard.xml
==============================================================================
--- development/main/home/standard.xml (original)
+++ development/main/home/standard.xml Wed Feb 16 10:50:52 2005
@@ -113,8 +113,16 @@
<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}"/>
+ <target name="dpml-system-windows"
depends="dpml-system-environment,dpml-home" if="isWindows">
+ <property name="dpml.system" location="${dpml.home}/Shared"/>
+ <mkdir dir="${dpml.system}"/>
+ </target>
+
+ <target name="dpml-system-nix" depends="dpml-system-environment,dpml-home"
unless="isWindows">
+ <property name="dpml.system" location="${dpml.home}/share"/>
+ </target>
+
+ <target name="dpml-system" depends="dpml-system-nix,dpml-system-windows">
<mkdir dir="${dpml.system}"/>
</target>

Modified: development/main/home/transit/build.xml
==============================================================================
--- development/main/home/transit/build.xml (original)
+++ development/main/home/transit/build.xml Wed Feb 16 10:50:52 2005
@@ -71,7 +71,7 @@
<get xmlns="antlib:net.dpml.transit" property="exception.path"
uri="artifact:jar:dpml/util/dpml-util-exception#${project.version}"/>

- <property name="api.dir" location="${basedir}/target/api"/>
+ <property name="api.dir" location="target/api"/>

<mkdir dir="${api.dir}"/>
<javadoc overview="overview.html" destdir="${api.dir}" use="true">

Modified: development/main/home/transit/handler/build.xml
==============================================================================
--- development/main/home/transit/handler/build.xml (original)
+++ development/main/home/transit/handler/build.xml Wed Feb 16 10:50:52
2005
@@ -24,18 +24,12 @@

<import file="${home}/standard.xml"/>

- <condition property="project.l4j.declared" value="false">
- <isset property="project.l4j.exe"/>
- </condition>
-
<target name="init" depends="standard.init">
<filter token="PROJECT-VERSION" value="${project.version}"/>
<filter token="TRANSIT-CONTROLLER-PLUGIN"

value="artifact:plugin:dpml/transit/dpml-transit-plugin#${project.version}"/>
<filter token="TRANSIT-INSTALLER-PLUGIN"
value="artifact:plugin:osm/depot/osm-depot-setup#SNAPSHOT"/>
- <filter token="PROJECT-JAR-PATH"
value="target\deliverables\jars\${project.filename}"/>
- <filter token="PROJECT-EXE-FILENAME" value="transit.exe"/>
<filter token="PROJECT-NAME" value="${project.name}"/>
</target>

@@ -59,13 +53,6 @@
<mkdir dir="target/dist"/>
</target>

- <target name="install" depends="standard.install,exe"/>
-
- <target name="exe" if="project.l4j.declared">
- <mkdir dir="target/win32"/>
- <exec executable="${project.l4j.exe}" failonerror="true">
- <arg line="target\conf\standard.cfg"/>
- </exec>
- </target>
+ <target name="install" depends="standard.install"/>

</project>

Modified: development/main/home/transit/handler/etc/setup/authority/hosts.xml
==============================================================================
--- development/main/home/transit/handler/etc/setup/authority/hosts.xml
(original)
+++ development/main/home/transit/handler/etc/setup/authority/hosts.xml Wed
Feb 16 10:50:52 2005
@@ -2,14 +2,6 @@

<hosts>

- 
-
<host dir="${dpml.system}/local">
<priority>20</priority>
<trusted>true</trusted>
@@ -17,7 +9,7 @@
</host>

<host href="http://repository.dpml.net/classic";>
- <priority>50</priority>
+ <priority>40</priority>
</host>

<host href="http://www.ibiblio.org/maven";>

Modified:
development/main/home/transit/handler/src/main/net/dpml/io/ResourceHelper.java
==============================================================================
---
development/main/home/transit/handler/src/main/net/dpml/io/ResourceHelper.java
(original)
+++
development/main/home/transit/handler/src/main/net/dpml/io/ResourceHelper.java
Wed Feb 16 10:50:52 2005
@@ -44,7 +44,7 @@

/**
* Unpack a resource into a destination file.
- * @param resoruce the resource to unpack
+ * @param resource the resource to unpack
* @param destination the destination file
* @exception IOException if something goes wrong
*/

Modified:
development/main/home/transit/handler/src/main/net/dpml/transit/Transit.java
==============================================================================
---
development/main/home/transit/handler/src/main/net/dpml/transit/Transit.java
(original)
+++
development/main/home/transit/handler/src/main/net/dpml/transit/Transit.java
Wed Feb 16 10:50:52 2005
@@ -407,7 +407,15 @@
return new File( home );
}

- return dir;
+ String os = System.getProperty( "os.name" ).toLowerCase();
+ if( os.indexOf( "win" ) >= 0 )
+ {
+ return new File( dir, "Shared" );
+ }
+ else
+ {
+ return new File( dir, "share" );
+ }

/*
String os = System.getProperty( "os.name" ).toLowerCase();

Modified:
development/main/home/transit/handler/src/main/net/dpml/transit/monitors/SystemMonitor.java
==============================================================================
---
development/main/home/transit/handler/src/main/net/dpml/transit/monitors/SystemMonitor.java
(original)
+++
development/main/home/transit/handler/src/main/net/dpml/transit/monitors/SystemMonitor.java
Wed Feb 16 10:50:52 2005
@@ -41,7 +41,6 @@

/**
* Creation of a new bootstrap monitor.
- * @param trace the trace enable flag
*/
public SystemMonitor()
{
@@ -50,11 +49,11 @@

/**
* Creation of a new bootstrap monitor.
- * @param trace the trace enable flag
+ * @param monitor the trace monitor
*/
- public SystemMonitor( Monitor logger )
+ public SystemMonitor( Monitor monitor )
{
- m_logger = logger;
+ m_logger = monitor;
}

/**

Modified: development/main/home/transit/plugin/build.xml
==============================================================================
--- development/main/home/transit/plugin/build.xml (original)
+++ development/main/home/transit/plugin/build.xml Wed Feb 16 10:50:52
2005
@@ -26,15 +26,15 @@
<target name="init" depends="standard.init">
<filter token="TRANSIT-PLUGIN-URI"

value="artifact:plugin:dpml/transit/dpml-transit-plugin#${project.version}" />
- <filter token="WINDOWS-CLI-MAIN-PATH"
-
value="%DPML_HOME%\local\dpml\transit\jars\dpml-transit-main-${project.version}.jar"
/>
- <filter token="UNIX-CLI-MAIN-PATH"
-
value="$DPML_HOME/local/dpml/transit/jars/dpml-transit-main-${project.version}.jar"
/>
<filter token="TRANSIT_VERSION" value="${project.version}"/>
+ <property name="transit.w32.main"
value="dpml\transit\jars\dpml-transit-main-${project.version}.jar"/>
<filter token="WINDOWS-CLI-CLASSPATH"
-
value="%DPML_SYSTEM%\local\dpml\transit\jars\dpml-transit-main-${project.version}.jar"
/>
+
value="%DPML_HOME%\cache\${transit.w32.main};%DPML_SYSTEM%\local\${transit.w32.main}"
/>
+ <property name="transit.nix.main"
value="dpml/transit/jars/dpml-transit-main-${project.version}.jar"/>
<filter token="UNIX-CLI-CLASSPATH"

value="$DPML_HOME/local/dpml/transit/jars/dpml-transit-main-${project.version}.jar"
/>
+ <filter token="UNIX-CLI-CLASSPATH"
+
value="%DPML_HOME%/cache/${transit.nix.main}:%DPML_SYSTEM%/local/${transit.nix.main}"
/>
</target>

<target name="setup-path" depends="init">
@@ -48,7 +48,7 @@
<pathelement location="${target.classes.dir}"/>
</path>
</target>
-
+
<target name="prepare" depends="setup-path,standard.prepare">
<copy toDir="${target.dir}/bin" filtering="on" failonerror="false"
overwrite="true">
<fileset dir="${etc}/bin">

Modified: development/main/home/transit/plugin/etc/bin/transit.bat
==============================================================================
--- development/main/home/transit/plugin/etc/bin/transit.bat (original)
+++ development/main/home/transit/plugin/etc/bin/transit.bat Wed Feb 16
10:50:52 2005
@@ -16,7 +16,7 @@

:SET_METRO
if "%DPML_HOME%" == "" set DPML_HOME=%APPDATA%\DPML
-if "%DPML_SYSTEM%" == "" set DPML_SYSTEM=%DPML_HOME%
+if "%DPML_SYSTEM%" == "" set DPML_SYSTEM=%DPML_HOME%\Shared
if "%DPML_TRANSIT_CLASSPATH%" == "" set
DPML_TRANSIT_CLASSPATH=@WINDOWS-CLI-CLASSPATH@
if "%TRANSIT_PLUGIN%" == "" set TRANSIT_PLUGIN=@TRANSIT-PLUGIN-URI@

Modified:
development/main/home/transit/tools/src/main/net/dpml/transit/tools/GetTask.java
==============================================================================
---
development/main/home/transit/tools/src/main/net/dpml/transit/tools/GetTask.java
(original)
+++
development/main/home/transit/tools/src/main/net/dpml/transit/tools/GetTask.java
Wed Feb 16 10:50:52 2005
@@ -57,7 +57,7 @@
}

/**
- * Set the name of a property into which the local file path will be
adssigned.
+ * Set the name of a property into which the local file path will be
assigned.
* @param name the ant property name
*/
public void setProperty( String name )
@@ -121,6 +121,7 @@
try
{
String spec = getURI().toString();
+ log( "artifact: " + spec );
URL url = new URL( (URL) null, spec, new Handler() );
File file = (File) url.getContent( new Class[]{ File.class } );
getProject().setNewProperty( name, file.getAbsolutePath() );
@@ -129,7 +130,8 @@
{
final String error =
"Unexpected error while attempting to resolve artifact uri ["
- + m_uri;
+ + m_uri
+ + "]";
throw new BuildException( error, e, getLocation() );
}
}

Modified: development/main/home/util/build.xml
==============================================================================
--- development/main/home/util/build.xml (original)
+++ development/main/home/util/build.xml Wed Feb 16 10:50:52 2005
@@ -52,7 +52,7 @@
<target name="install" depends="standard.install,javadoc"/>

<target name="javadoc" depends="prepare">
- <property name="api.dir" location="${basedir}/target/api"/>
+ <property name="api.dir" location="target/api"/>
<mkdir dir="${api.dir}"/>
<javadoc overview="overview.html" destdir="${api.dir}" use="true">
<doctitle><![CDATA[<h1>${project.name} API, Build
${project.version}</h1>]]></doctitle>

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 Wed
Feb 16 10:50:52 2005
@@ -150,6 +150,13 @@
loadProperties( project, magic );

//
+ // load the system wide properties
+ //
+
+ File siteProperties = new File( Transit.DPML_PREFS,
"magic/magic.properties" );
+ loadProperties( project, siteProperties );
+
+ //
// build the index
//

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/InstallTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/InstallTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/InstallTask.java
Wed Feb 16 10:50:52 2005
@@ -71,20 +71,7 @@
fileset.createInclude().setName( "**/*" );
final String group = definition.getInfo().getGroup();
final File destination = new File( cache, group );
- copy( destination, fileset );
+ copy( destination, fileset, true );
}
}
-
- private void copy( final File destination, final FileSet fileset )
- {
- mkDir( destination );
- final Copy copy = (Copy) getProject().createTask( "copy" );
- copy.setTaskName( getTaskName() );
- //copy.setPreserveLastModified( true );
- copy.setTodir( destination );
- copy.addFileset( fileset );
- copy.setOverwrite( true );
- copy.init();
- copy.execute();
- }
}

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
Wed Feb 16 10:50:52 2005
@@ -29,6 +29,7 @@
import org.apache.tools.ant.taskdefs.Javadoc;
import org.apache.tools.ant.types.DirSet;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.FileSet;
import org.w3c.dom.Element;

import java.io.File;
@@ -110,8 +111,8 @@

log( "Generating javadoc for project: " + def, Project.MSG_VERBOSE );

- File docs = getIndex().getDocsDirectory();
- File destination = new File( docs, def.getInfo().getJavadocPath() );
+ File api = new File( getContext().getTargetDirectory(), "api" );
+ mkDir( api );

//
// construct the classpath by getting all of the classpaths for
@@ -119,7 +120,22 @@
//

final Path classpath = def.getClassPath( getProject() );
- process( def, classpath, destination );
+ process( def, classpath, api );
+
+ File docs = getIndex().getDocsDirectory();
+ File destination = new File( docs, def.getInfo().getJavadocPath() );
+ install( api, destination );
+ }
+
+ private void install( final File source, final File destination )
+ {
+ if( source.exists() )
+ {
+ log( "Installing api", Project.MSG_VERBOSE );
+ final FileSet fileset = new FileSet();
+ fileset.setDir( source );
+ copy( destination, fileset, true );
+ }
}

//-----------------------------------------------------------------------
@@ -267,7 +283,6 @@

private Link getModuleLink( Definition def, Resource resource )
{
-
if( !"module".equals( resource.getInfo().getType() ) )
{
final String error =

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/ProjectTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/ProjectTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/ProjectTask.java
Wed Feb 16 10:50:52 2005
@@ -23,6 +23,8 @@
import net.dpml.transit.repository.Repository;
import org.apache.tools.ant.taskdefs.Mkdir;
import org.apache.tools.ant.taskdefs.Delete;
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.types.FileSet;

import java.io.File;

@@ -79,4 +81,17 @@
task.init();
task.execute();
}
+
+ public void copy( final File destination, final FileSet fileset, boolean
preserve )
+ {
+ mkDir( destination );
+ final Copy copy = (Copy) getProject().createTask( "copy" );
+ copy.setTaskName( getTaskName() );
+ copy.setPreserveLastModified( preserve );
+ copy.setTodir( destination );
+ copy.addFileset( fileset );
+ copy.setOverwrite( true );
+ copy.init();
+ copy.execute();
+ }
}

Modified: development/main/magic/module.xml
==============================================================================
--- development/main/magic/module.xml (original)
+++ development/main/magic/module.xml Wed Feb 16 10:50:52 2005
@@ -30,9 +30,7 @@
<property name="bundle" value="${basedir}/target/bundle"/>
</target>

- <target name="build" depends="module.build,standard.build"/>
-
- <target name="module.build" depends="standard.build">
+ <target name="build" depends="standard.build">
<x:module index="index.xml">
<x:header>
<packages>
@@ -45,8 +43,17 @@
</x:module>
</target>

- <target name="install"
depends="standard.install,junit-report,checkstyle,javadoc">
- <antcall target="build-dist"/>
+ <target name="install" depends="standard.install,junit-report,checkstyle">
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating DPML PREFS ${dpml.prefs}
+#----------------------------------------------------------------------------------
+ </echo>
+ <copy todir="${dpml.prefs}">
+ <fileset dir="${prefs}">
+ <include name="magic/**"/>
+ </fileset>
+ </copy>
<echo>

#----------------------------------------------------------------------------------
# Updating DPML DATA installation. ${dpml.data}/docs
@@ -60,25 +67,25 @@
</copy>
</target>

- <target name="dist" depends="init">
- <antcall target="build-dist"/>
- </target>
-
- <target name="build-dist">
+ <target name="package" depends="standard.package,javadoc">

- 
+ 
<copy todir="${bundle}" filtering="true">
<fileset dir="${basedir}">
- <include name="README.TXT"/>
<include name="LICENSE.TXT"/>
<include name="NOTICE.TXT"/>
+ <include name="MAGIC.TXT"/>
</fileset>
</copy>

+ 
<property name="prefs" value="${bundle}/prefs"/>
<mkdir dir="${prefs}/magic"/>
<copy toFile="${prefs}/magic/magic.properties"
file="${basedir}/template.magic.properties"/>
- <property name="local" value="${bundle}/local"/>
+
+ 
+ <property name="share" value="${bundle}/share"/>
+ <property name="local" value="${share}/local"/>
<x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
<x:replicate refid="module.path" toDir="${local}" />
<copy todir="${local}/${project.group}">
@@ -100,33 +107,38 @@
<include name="themes/**"/>
</fileset>
</copy>
+

- <property name="docs.src"
location="${dpml.docs}/api/${project.group}/${project.version}"/>
- <property name="docs.dest"
location="${bundle}/docs/api/${project.group}/${project.version}"/>
+ <property name="docs.src" location="${basedir}/target/api"/>
+ <property name="docs.dest"
location="${share}/docs/api/${project.group}/${project.version}"/>
<mkdir dir="${docs.dest}"/>
<copy todir="${docs.dest}">
<fileset dir="${docs.src}"/>
</copy>
+

<x:dist compression="gzip">
- <zipfileset dir="${bundle}/prefs" prefix="Preferences"/>
- <tarfileset dir="${bundle}/prefs" prefix="prefs"/>
<fileset dir="${bundle}">
- <exclude name="prefs/**"/>
+ <include name="*.TXT"/>
</fileset>
+ <zipfileset dir="${bundle}/prefs" prefix="Preferences"/>
+ <zipfileset dir="${bundle}/share" prefix="Shared"/>
+ <tarfileset dir="${bundle}/prefs" prefix="prefs"/>
+ <tarfileset dir="${bundle}/share" prefix="share"/>
</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">
+ <target name="javadoc" depends="build">
<x:javadoc>
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
<link href="http://www.dpml.net/api/ant/1.6.2"/>

Modified: development/main/metro/main/build.xml
==============================================================================
--- development/main/metro/main/build.xml (original)
+++ development/main/metro/main/build.xml Wed Feb 16 10:50:52 2005
@@ -5,10 +5,6 @@

<transit:import uri="artifact:template:dpml/magic/standard"/>

- <condition property="project.l4j.declared" value="false">
- <isset property="project.l4j.exe"/>
- </condition>
-
<target name="init" depends="standard.init">
<x:filter feature="plugin" token="METRO-PLUGIN-URI"/>
<x:filter feature="plugin" key="dpml-system-impl"
token="SYSTEM-PLUGIN-URI"/>
@@ -18,8 +14,6 @@

<x:property key="dpml-transit-main" feature="uri" name="transit.uri"/>
<transit:get uri="${transit.uri}" property="transit.filename"/>
- <filter token="PROJECT-JAR-PATH" value="${transit.filename}"/>
- <filter token="PROJECT-EXE-FILENAME" value="metro.exe"/>
<filter token="PROJECT-NAME" value="${project.name}"/>

</target>
@@ -40,14 +34,7 @@
</copy>
</target>

- <target name="exe" if="project.l4j.declared">
- <mkdir dir="target/bin/win32"/>
- <exec executable="${project.l4j.exe}" failonerror="true">
- <arg line="target\conf\standard.cfg"/>
- </exec>
- </target>
-
- <target name="bin" depends="exe">
+ <target name="bin">
<echo>

#----------------------------------------------------------------------------------
# Updating DPML SYSTEM installation. ${dpml.system}/bin
@@ -62,31 +49,4 @@
<chmod dir="${dpml.system}/bin" includes="*.sh" perm="755"/>
</target>

- 
-
</project>

Modified: development/main/metro/module.xml
==============================================================================
--- development/main/metro/module.xml (original)
+++ development/main/metro/module.xml Wed Feb 16 10:50:52 2005
@@ -39,25 +39,34 @@
</target>

<target name="install" depends="docs,standard.install">
- <antcall target="dist"/>
<echo>

#----------------------------------------------------------------------------------
-# Updating DPML SYSTEM installation. ${dpml.system}/bin
+# Updating DPML SYSTEM ${dpml.system}/bin

#----------------------------------------------------------------------------------
</echo>
<copy todir="${dpml.system}" preservelastmodified="true">
- <fileset dir="${bundle}">
+ <fileset dir="${share}">
<include name="bin/**"/>
</fileset>
</copy>
<echo>

#----------------------------------------------------------------------------------
-# Updating DPML DATA installation. ${dpml.data}
+# Updating DPML PREFS ${dpml.prefs}
+#----------------------------------------------------------------------------------
+ </echo>
+ <copy todir="${dpml.prefs}">
+ <fileset dir="${prefs}">
+ <include name="metro/**"/>
+ </fileset>
+ </copy>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating DPML DATA ${dpml.data}

#----------------------------------------------------------------------------------
</echo>
<mkdir dir="${dpml.data}"/>
<copy todir="${dpml.data}" preservelastmodified="true">
- <fileset dir="${bundle}">
+ <fileset dir="${share}">
<include name="docs/**"/>
</fileset>
</copy>
@@ -68,14 +77,18 @@
</copy>
</target>

- <target name="dist" depends="init">
+ <target name="package" depends="standard.package">
+
+ <property name="share" value="${bundle}/share"/>
+ <property name="prefs" value="${bundle}/prefs"/>
+ <property name="data" value="${bundle}/data"/>


<copy todir="${bundle}" filtering="true">
<fileset dir="${basedir}">
- <include name="README.TXT"/>
<include name="LICENSE.TXT"/>
<include name="NOTICE.TXT"/>
+ <include name="METRO.TXT"/>
</fileset>
</copy>

@@ -83,7 +96,7 @@
<mkdir dir="${prefs}/metro"/>
<copy toFile="${prefs}/metro/metro.properties"
file="${basedir}/template.metro.properties"/>

- <property name="local" value="${bundle}/local"/>
+ <property name="local" value="${share}/local"/>
<x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
<x:replicate refid="module.path" toDir="${local}" />
<copy todir="${local}/${project.group}">
@@ -93,16 +106,16 @@

- <copy todir="${bundle}/bin">
+ <copy todir="${share}/bin">
<fileset dir="${basedir}/main/target/bin"/>
</copy>
- <chmod file="${bundle}/bin/metro" perm="755"/>
+ <chmod file="${share}/bin/metro" perm="755"/>


- <property name="docs.src"
location="${dpml.docs}/api/${project.group}/${project.version}"/>
- <property name="docs.dest"
location="${bundle}/docs/api/${project.group}/${project.version}"/>
+ <property name="docs.src" location="${basedir}/target/api"/>
+ <property name="docs.dest"
location="${share}/docs/api/${project.group}/${project.version}"/>
<mkdir dir="${docs.dest}"/>
<copy todir="${docs.dest}">
<fileset dir="${docs.src}"/>
@@ -112,11 +125,17 @@
Package the bundle into a compressed archive.
-->
<x:dist compression="gzip">
- <zipfileset dir="${bundle}/prefs" prefix="Preferences"/>
- <tarfileset dir="${bundle}/prefs" prefix="prefs"/>
<fileset dir="${bundle}">
- <exclude name="prefs/**"/>
+ <include name="*.TXT"/>
</fileset>
+ <zipfileset dir="${bundle}/prefs" prefix="Preferences"/>
+ <zipfileset dir="${bundle}/share" prefix="Shared">
+ <exclude name="**/metro"/>
+ </zipfileset >
+ <tarfileset dir="${bundle}/prefs" prefix="prefs"/>
+ <tarfileset dir="${bundle}/share" prefix="share">
+ <exclude name="**/metro.bat"/>
+ </tarfileset>
</x:dist>

</target>

svn commit: r1786 - in development/main: home home/transit home/transit/handler home/transit/handler/etc/conf home/transit/handler/etc/setup/authority home/transit/handler/src/main/net/dpml/io home/transit/handler/src/main/net/dpml/transit home/transit/handler/src/main/net/dpml/transit/monitors home/transit/plugin home/transit/plugin/etc/bin home/transit/tools/src/main/net/dpml/transit/tools home/util magic magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/tasks metro metro/main metro/main/etc/conf, mcconnell, 02/16/2005