notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r1773 - in development/main: home home/transit/handler/src/main/net/dpml/transit magic magic/core/src/main/net/dpml/magic metro metro/main/etc/conf

From: mcconnell AT netcompartner.com
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r1773 - in development/main: home home/transit/handler/src/main/net/dpml/transit magic magic/core/src/main/net/dpml/magic metro metro/main/etc/conf
Date: Sun, 13 Feb 2005 21:26:04 +0100

Author: mcconnell
Date: Sun Feb 13 21:26:03 2005
New Revision: 1773

Added:
development/main/magic/LICENSE.TXT
development/main/magic/NOTICE.TXT
development/main/magic/template.magic.properties
development/main/metro/LICENSE.TXT
development/main/metro/NOTICE.TXT
development/main/metro/main/etc/conf/metro.ico (contents, props changed)
development/main/metro/main/etc/conf/standard.cfg
development/main/metro/template.metro.properties
Removed:

development/main/home/transit/handler/src/main/net/dpml/transit/Installer.java
Modified:
development/main/home/README.TXT
development/main/home/build.xml
development/main/home/standard.xml

development/main/home/transit/handler/src/main/net/dpml/transit/Transit.java
development/main/magic/README.TXT
development/main/magic/core/src/main/net/dpml/magic/Index.java
development/main/magic/module.xml
development/main/metro/README.TXT
development/main/metro/module.xml
Log:
Bumping and tweaking the install procedure.

Modified: development/main/home/README.TXT
==============================================================================
--- development/main/home/README.TXT (original)
+++ development/main/home/README.TXT Sun Feb 13 21:26:03 2005
@@ -2,7 +2,7 @@
Product: Transit
Description: Resource Management Framework
Publisher: The Digital Product Meta Library
-Revision: @PRODUCT-VERSION@
+Revision: @PROJECT-VERSION@

Installation Instructions
=========================
@@ -10,11 +10,13 @@
Contents of the distribution
----------------------------

- /dpml-transit-@PRODUCT-VERSION@
+ /dpml-home-@PROJECT-VERSION@
/bin ............................. cli scripts for the transit system
+ /local ........................... shared repository
/docs ............................ javadoc for util and transit modules
- /local ........................... jar and module files
- /transit ......................... transit configuration files
+ /data ............................ user's data
+ /prefs ........................... application preferences
+ /transit ....................... transit configuration files

Creating the installation:

@@ -23,7 +25,7 @@
DPML home bin directory in you PATH environment variable)
http://www.dpml.net/guide/setup/dpml.html

- 2. copy the contents directory dpml-transit-@PRODUCT-VERSION@ into
+ 2. copy the contents directory dpml-transit-@PROJECT-VERSION@ into
your DPML home directory.

You should now have a directory structure that looks like the following;
@@ -32,7 +34,7 @@
/bin
/docs
/local
- /transit
+ /prefs/transit

If you have declared a DPML_HOME environment variable then the
[DPML-HOME-DIR]
should correspond to this. If you have not created an DPML_HOME variable
then
@@ -48,7 +50,7 @@

You should see output similar to the following:

- Transit:
artifact:plugin:dpml/transit/dpml-transit-plugin#@PRODUCT-VERSION@
+ Transit:
artifact:plugin:dpml/transit/dpml-transit-plugin#@PROJECT-VERSION@
Build: 20050129.042138

Transit Documentation

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml (original)
+++ development/main/home/build.xml Sun Feb 13 21:26:03 2005
@@ -55,14 +55,31 @@
</target>

<target name="build" depends="standard.build">
- <delete dir="${basedir}/target/bundle"/>
- <mkdir dir="${bundle}/cache"/>
+
+ <delete dir="${bundle}"/>
+
+ 
+ <copy todir="${bundle}" filtering="true">
+ <fileset dir="${basedir}">
+ <include name="README.TXT"/>
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.TXT"/>
+ </fileset>
+ </copy>
+
+ <property name="data" value="${bundle}/data"/>
+ <mkdir dir="${data}/cache"/>
+ <mkdir dir="${data}/docs"/>
+ <mkdir dir="${data}/dist"/>
+
+ <property name="prefs" value="${bundle}/prefs"/>
+ <mkdir dir="${prefs}"/>


- <property name="root" value="${bundle}/transit"/>
- <echo>Adding Transit application properties to ${root}</echo>
- <mkdir dir="${root}"/>
- <copy todir="${root}">
+ <property name="transit" value="${prefs}/transit"/>
+ <echo>Adding Transit application properties to ${transit}</echo>
+ <mkdir dir="${transit}"/>
+ <copy todir="${transit}">
<fileset dir="${basedir}/transit/handler/target/setup"/>
</copy>

@@ -129,15 +146,6 @@
<fileset dir="${basedir}/transit/target/api"/>
</copy>

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

<property name="templates" value="${local}/dpml/transit/templates"/>
<echo>Adding build template to ${templates}</echo>
@@ -162,11 +170,6 @@
# Updating DPML DATA installation. ${dpml.data}

#----------------------------------------------------------------------------------
</echo>
- <copy todir="${dpml.data}" preservelastmodified="true">
- <fileset dir="${bundle}">
- <include name="docs/**"/>
- </fileset>
- </copy>
<mkdir dir="${dpml.cache}/dpml/transit/templates"/>
<copy toFile="${dpml.cache}/dpml/transit/templates/standard.template"
file="${basedir}/standard.xml"/>
@@ -176,7 +179,7 @@

#----------------------------------------------------------------------------------
</echo>
<copy todir="${dpml.prefs}">
- <fileset dir="${bundle}">
+ <fileset dir="${prefs}">
<include name="transit/**"/>
</fileset>
</copy>
@@ -193,9 +196,9 @@
</fileset>
</delete>
<copy tofile="${user.home}/.ant/lib/dpml-transit-main.jar"
-
file="${bundle}/local/dpml/transit/jars/dpml-transit-main-${project.version}.jar"/>
+
file="${local}/dpml/transit/jars/dpml-transit-main-${project.version}.jar"/>
<copy tofile="${user.home}/.ant/lib/dpml-transit-tools.jar"
-
file="${bundle}/local/dpml/transit/jars/dpml-transit-tools-${project.version}.jar"/>
+
file="${local}/dpml/transit/jars/dpml-transit-tools-${project.version}.jar"/>
</target>


@@ -204,9 +207,13 @@
<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="**/*"/>
<exclude name="bin/**"/>
+ <exclude name="prefs/**"/>
+ <exclude name="data/**"/>
</zipfileset>
</zip>
<checksum fileext=".md5"
file="${dist}/${project.name}-${project.version}.zip"/>

Modified: development/main/home/standard.xml
==============================================================================
--- development/main/home/standard.xml (original)
+++ development/main/home/standard.xml Sun Feb 13 21:26:03 2005
@@ -90,9 +90,11 @@
<property name="dpml.cache" location="${dpml.data}/cache"/>
<property name="dpml.docs" location="${dpml.data}/docs"/>
<property name="dpml.dist" location="${dpml.data}/dist"/>
+ <property name="dpml.logs" location="${dpml.data}/logs"/>
<mkdir dir="${dpml.cache}"/>
<mkdir dir="${dpml.docs}"/>
<mkdir dir="${dpml.dist}"/>
+ <mkdir dir="${dpml.logs}"/>
</target>

<target name="dpml-prefs-unix" depends="dpml-home" unless="isWindows">
@@ -107,22 +109,13 @@
<mkdir dir="${dpml.prefs}"/>
</target>

- <target name="dpml-system"
depends="dpml-system-environment,dpml-system-default">
- <mkdir dir="${dpml.system}"/>
- </target>
-
<target name="dpml-system-environment" if="dpml.system.declared">
<property name="dpml.system" location="${ENV.DPML_SYSTEM}"/>
</target>

- <target name="dpml-system-programfiles" depends="dpml-system-environment"
- if="dpml.programfiles.declared" unless="dpml.system.declared">
- <property name="programfiles" location="${ENV.ProgramFiles}"/>
- <property name="dpml.system" location="${programfiles}/DPML"/>
- </target>
-
- <target name="dpml-system-default"
depends="dpml-system-programfiles,dpml-home">
+ <target name="dpml-system" depends="dpml-system-environment,dpml-home" >
<property name="dpml.system" location="${dpml.home}"/>
+ <mkdir dir="${dpml.system}"/>
</target>

<target name="junit-test" depends="dpml-data">

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
Sun Feb 13 21:26:03 2005
@@ -110,16 +110,21 @@
private PrintWriter m_logWriter;

/**
- * The DPML home directory. If an environment variable named DPML_HOME
- * is defined, then the assigned value will be returned, otherwise the
- * DPML home directory shall default to ${user.home}/.dpml.
+ * The DPML home directory established via assesment of the the
${dpml.home}
+ * system property and the DPML_HOME environment variable. If neither
are
+ * defined the behaviour is platform specific. If the os is Windows,
+ * the value returned is equivalent to $APPDATA\DPML whereas Unix the
+ * environment will return ${user.home}/.dpml.
*/
public static final File DPML_HOME;

/**
- * The Transit system directory. If an environment variable named
DPML_SYSTEM_HOME
- * is defined, then the assigned value will be returned, otherwise the
- * DPML_HOME home directory is returned.
+ * If a system property named "dpml.system" is defined then the value
+ * is assigned otherwise the implementation will look for an environment
+ * variable named "DPML_SYSTEM". If neither case holds, the value
assigned
+ * if platform dependent. If the os is Windows, the equivalent of
+ * $PROGRAMFILES\DPML is assigned otherwise the value defaults to
+ * "/usr/share/dpml".
*/
public static final File DPML_SYSTEM;

@@ -138,21 +143,13 @@
static
{
DPML_HOME = resolveHomeDirectory();
+ DPML_SYSTEM = resolveSystemDirectory( DPML_HOME );
DPML_DATA = resolveDataDirectory( DPML_HOME );
DPML_PREFS = resolvePreferencesDirectory( DPML_HOME );
- DPML_SYSTEM = resolveSystemDirectory( DPML_HOME );
-
- try
- {
- System.setProperty( SYSTEM_KEY, DPML_SYSTEM.getAbsolutePath() );
- System.setProperty( HOME_KEY, DPML_HOME.getAbsolutePath() );
- System.setProperty( DATA_KEY, DPML_DATA.getAbsolutePath() );
- System.setProperty( PREFS_KEY, DPML_PREFS.getAbsolutePath() );
- }
- catch( Throwable e )
- {
- boolean ignore = true; // for checkstyle
- }
+ System.setProperty( SYSTEM_KEY, DPML_SYSTEM.getAbsolutePath() );
+ System.setProperty( HOME_KEY, DPML_HOME.getAbsolutePath() );
+ System.setProperty( DATA_KEY, DPML_DATA.getAbsolutePath() );
+ System.setProperty( PREFS_KEY, DPML_PREFS.getAbsolutePath() );
}

/**
@@ -373,15 +370,14 @@
if( os.indexOf( "win" ) >= 0 )
{
home = Environment.getEnvVariable( "APPDATA" );
- if( null != home )
- {
- File data = new File( home );
- return new File( data, "DPML" );
- }
+ File data = new File( home );
+ return new File( data, "DPML" );
+ }
+ else
+ {
+ File user = new File( System.getProperty( "user.home" ) );
+ return new File( user, ".dpml" );
}
-
- File user = new File( System.getProperty( "user.home" ) );
- return new File( user, ".dpml" );
}

/**
@@ -392,7 +388,7 @@
* returned as a file. If neither case holds, the value assigned
* if platform dependent. If the os is Windows, the equivalent of
* $PROGRAMFILES\DPML is returned otherwise the default value
- * is ${dpml.home}.
+ * of "/usr/share/dpml" is returned.
*
* @param dir the default DPML_HOME value
* @return the transit system directory
@@ -409,13 +405,24 @@
{
return new File( home );
}
+
+ return dir;
+
+ /*
String os = System.getProperty( "os.name" ).toLowerCase();
if( os.indexOf( "win" ) >= 0 )
{
home = Environment.getEnvVariable( "PROGRAMFILES" );
- return new File( home, "DPML" );
+ File anchor = new File( home );
+ return new File( anchor, "DPML" );
}
- return dir;
+ else
+ {
+ home = "/usr/share";
+ File anchor = new File( home );
+ return new File( anchor, "dpml" );
+ }
+ */
}

/**

Added: development/main/magic/LICENSE.TXT
==============================================================================
--- (empty file)
+++ development/main/magic/LICENSE.TXT Sun Feb 13 21:26:03 2005
@@ -0,0 +1,175 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.

Added: development/main/magic/NOTICE.TXT
==============================================================================
--- (empty file)
+++ development/main/magic/NOTICE.TXT Sun Feb 13 21:26:03 2005
@@ -0,0 +1,10 @@
+=========================================================================
+== NOTICE file corresponding to the section 4 d of ==
+== the Apache License, Version 2.0, ==
+=========================================================================
+
+This product is developed by the members of the Digial Product Meta
+Library (DPML) http://www.dpml.net. Resources developed by the DPML
+includes products and resources developed by the Apache Software
+Foundation (http://www.apache.org).
+

Modified: development/main/magic/README.TXT
==============================================================================
--- development/main/magic/README.TXT (original)
+++ development/main/magic/README.TXT Sun Feb 13 21:26:03 2005
@@ -1,25 +1,18 @@

-This is a small experiment cleaned-up version of magic that uses transit
-for resource resolution and plugin loading.
-
-To build:
-
-$ ant -f core/bootstrap.xml
-$ ant
-
-The end result is the loading of a project index and logging to console
-of the index filename and number of contained references (note this is
magic-new
-running with transit that is handling the top level reactor build). The
reactor
-build triggers the build the two sub-projects - one based on classic magic
and
-one (rather empty) based on new magic.
-
-At the time of writing the tasks implemeted under new magic include:
-
- * reactor
- * info
- * export
- * clean
-
-Steve.
-
+Product: Magic
+Description: Intelligent Build System
+Publisher: The Digital Product Meta Library
+Revision: @PROJECT-VERSION@
+
+Installation Instructions
+=========================
+
+Contents of the distribution
+----------------------------
+
+ /dpml-magic-@PROJECT-VERSION@
+ /docs ............................ magic javadoc
+ /local ........................... jar and module files
+ /prefs
+ /magic ......................... magic configuration files

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 Sun
Feb 13 21:26:03 2005
@@ -144,7 +144,7 @@
File home = getHomeDirectory();
if( null == project.getProperty( HOME_KEY ) )
{
- project.setNewProperty( HOME_KEY, home.toString() );
+ project.setNewProperty( HOME_KEY, home.getAbsolutePath() );
}
File magic = new File( home, "magic.properties" );
loadProperties( project, magic );
@@ -177,19 +177,17 @@

public File getHomeDirectory()
{
- return Transit.DPML_HOME;
+ return new File( Transit.DPML_PREFS, "transit" );
}

public File getCacheDirectory()
{
- String cacheDir = getProject().getProperty( "dpml.cache" );
- return new File( cacheDir );
+ return new File( Transit.DPML_DATA, "cache" );
}

public File getDocsDirectory()
{
- String docsDir = getProject().getProperty( "dpml.docs" );
- return new File( docsDir );
+ return new File( Transit.DPML_DATA, "docs" );
}

public Repository getRepository()

Modified: development/main/magic/module.xml
==============================================================================
--- development/main/magic/module.xml (original)
+++ development/main/magic/module.xml Sun Feb 13 21:26:03 2005
@@ -25,6 +25,8 @@
<transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
+ <filter token="PROJECT-NAME" value="${project.name}"/>
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
<property name="bundle" value="${basedir}/target/bundle"/>
</target>

@@ -44,7 +46,7 @@
</target>

<target name="install"
depends="standard.install,junit-report,checkstyle,javadoc">
- <antcall target="dist"/>
+ <antcall target="build-dist"/>
<echo>

#----------------------------------------------------------------------------------
# Updating DPML DATA installation. ${dpml.data}/docs
@@ -59,10 +61,27 @@
</target>

<target name="dist" depends="init">
- <property name="anchor" value="${bundle}/local"/>
+ <antcall target="build-dist"/>
+ </target>
+
+ <target name="build-dist">
+
+ 
+ <copy todir="${bundle}" filtering="true">
+ <fileset dir="${basedir}">
+ <include name="README.TXT"/>
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.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"/>
<x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
- <x:replicate refid="module.path" toDir="${anchor}" />
- <copy todir="${anchor}/${project.group}">
+ <x:replicate refid="module.path" toDir="${local}" />
+ <copy todir="${local}/${project.group}">
<fileset dir="target/deliverables"/>
</copy>

- <copy todir="${anchor}/${project.group}">
+ <copy todir="${local}/${project.group}">
<fileset dir="${dpml.cache}/dpml/magic">
<include name="eclipses/**"/>
<include name="templates/**"/>
@@ -94,7 +113,11 @@
Package the bundle into a compressed archive is place under ${dpml.dist}.
-->
<x:dist compression="gzip">
- <fileset dir="${bundle}"/>
+ <zipfileset dir="${bundle}/prefs" prefix="Preferences"/>
+ <tarfileset dir="${bundle}/prefs" prefix="prefs"/>
+ <fileset dir="${bundle}">
+ <exclude name="prefs/**"/>
+ </fileset>
</x:dist>
<property name="export"
location="${dpml.dist}/${project.group}/${project.version}"/>
<mkdir dir="${export}"/>

Added: development/main/magic/template.magic.properties
==============================================================================
--- (empty file)
+++ development/main/magic/template.magic.properties Sun Feb 13 21:26:03
2005
@@ -0,0 +1,2 @@
+
+# site wide customization of magic properties

Added: development/main/metro/LICENSE.TXT
==============================================================================
--- (empty file)
+++ development/main/metro/LICENSE.TXT Sun Feb 13 21:26:03 2005
@@ -0,0 +1,175 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.

Added: development/main/metro/NOTICE.TXT
==============================================================================
--- (empty file)
+++ development/main/metro/NOTICE.TXT Sun Feb 13 21:26:03 2005
@@ -0,0 +1,10 @@
+=========================================================================
+== NOTICE file corresponding to the section 4 d of ==
+== the Apache License, Version 2.0, ==
+=========================================================================
+
+This product is developed by the members of the Digial Product Meta
+Library (DPML) http://www.dpml.net. Resources developed by the DPML
+includes products and resources developed by the Apache Software
+Foundation (http://www.apache.org).
+

Modified: development/main/metro/README.TXT
==============================================================================
--- development/main/metro/README.TXT (original)
+++ development/main/metro/README.TXT Sun Feb 13 21:26:03 2005
@@ -1,91 +1,19 @@

-The runtime tree contains code dealing with the refactoring of the codebase
to enable the establishment of the repository management subsystem as a
top-level plugin controller capable of launching and running the metro, magic
or anything other system. The code structure and content is described below:
-
- runtime/transit
-
- The transit main package includes a bootstrapping system supporting
- initialiozation of transit from the command line, from ant, and classic
- embedding scenarios. The code includes the repository APIs, controller
- interface, repository monitors, and the basic code code of the repository
- loading utility. The implementation has a weak dependency on the transit
- plugin which in turn is used to establish the fully functional transit
- kernel.
-
- The transit/plugin is a plugin implementation that is the transit plugin
- controller. It is establish by transit/main and is responsible for the
- management of the execution of a single target plugin (the application).
- The objective is to enable the execution of a target application such
- as merlin or magic by delegating command line arguments through the
- boostrap and controller to the target. The net result will be the
- elimination of repository and classloader managment code in both merlin
- and magic and the elimination of logging system concerns from the merlin
- system.
-
- runtime/util
-
- The util package is derived from the avalon-util pacakages with some
- degree of rationalization. The Env content has been folded into the
- transit main package and the crieteria, defauolts, exception and i18n
- packages are setup under the metro namespace and used in conjunction with
- the transit plugin controller implementation.
-
- runtime/logging/
-
- Responsibility for the establishment of a logging system has been moved
- from the deplioyed plugion to the plugin controller. The code in this
- section is based on the 3.3.0 runtime/logging package with changes to
- synchronize with the transit plugin model. The logkit plugin has been
- rationalized through folding together of current logkit with the logging
- logkit plugin classes together with strict sepatation of target subsystem
- as sub-plugin plugins. In addition the logigng factory critera have been
- separated into a shared library and the Log4J plugin has been updated to
- support the transit plugin model.
-
- runtime/configuration
-
- Refactoring of the framework configration and util-configuration into a
- api and impl package under a new package namespace. The different is
- primarily related to the frequent use of configuration models outside of
- a fomal component scenario and the need to redefine the error handling
- model without the restrictions implied by framework.
-
- runtime/extension
-
- Code is basically a direct fork of the util-extension poackage placed
- here as this needs to be folded into the transit package, enabling the
- elimination of any classloading management from managed applications.
-
- runtime/meta
-
- The meta info api, spi and an avalon provider.
-
-Examples:
-
- The following example shows how metro can be used to simply download
- an artifact to the local cache:
-
- $ metro -get artifact:saxon/saxon#6.5.3 -overwrite
-
- The following example demonstrates a request for the controler to
- download and run a plugin:
-
- $ metro -load artifact:dpml/transit/dpml-transit-demo#SNAPSHOT -execute
- [INFO ] (metro): Hello.
-
- Or to see cli arguments passed to the target:
-
- $ metro -load artifact:dpml/transit/dpml-transit-demo#SNAPSHOT -execute
- -message "Hello Fred"
- [INFO ] (metro): Hello Fred
-
- Both examples assume that you have a properties file named metro.properties
- that includes the property metro.hosts with a comma separated list of
- remote repositories from which respective resources can be resolved. There
- are also a bunch of metro.initial.* properties that define the initial
- boostrap cache, hosts, proxy setting etc. THe environment variable
METRO_HOME
- is used which is similer to Magic in that the default cache is
- %METRO_HOME%/main.
-
-
-Copyright 2004 The Digital Product Meta Library
+Product: Magic
+Description: Intelligent Build System
+Publisher: The Digital Product Meta Library
+Revision: @PROJECT-VERSION@
+
+Installation Instructions
+=========================
+
+Contents of the distribution
+----------------------------
+
+ /dpml-metro-@PROJECT-VERSION@
+ /bin ............................. cli scripts for the metro system
+ /docs ............................ javadoc for metro api
+ /local ........................... jar and module files
+ /prefs
+ /metro ......................... metro configuration files

Added: development/main/metro/main/etc/conf/metro.ico
==============================================================================
Binary file. No diff available.

Added: development/main/metro/main/etc/conf/standard.cfg
==============================================================================
--- (empty file)
+++ development/main/metro/main/etc/conf/standard.cfg Sun Feb 13 21:26:03
2005
@@ -0,0 +1,10 @@
+header consolehead.bin
+jar @PROJECT-JAR-PATH@
+outfile target\bin\win32\@PROJECT-EXE-FILENAME@
+javamin 1.4.0
+icon etc\conf\metro.ico
+chdir true
+setProcName true
+errTitle @PROJECT-NAME@
+jarArgs -load @METRO-PLUGIN-URI@
+jvmArgs -Djava.security.policy="%DPML_SYSTEM%\bin\security.policy"

Modified: development/main/metro/module.xml
==============================================================================
--- development/main/metro/module.xml (original)
+++ development/main/metro/module.xml Sun Feb 13 21:26:03 2005
@@ -24,6 +24,8 @@
<transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
+ <filter token="PROJECT-NAME" value="${project.name}"/>
+ <filter token="PROJECT-VERSION" value="${project.version}"/>
<property name="bundle" value="${basedir}/target/bundle"/>
</target>

@@ -67,6 +69,20 @@
</target>

<target name="dist" depends="init">
+
+ 
+ <copy todir="${bundle}" filtering="true">
+ <fileset dir="${basedir}">
+ <include name="README.TXT"/>
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.TXT"/>
+ </fileset>
+ </copy>
+
+ <property name="prefs" value="${bundle}/prefs"/>
+ <mkdir dir="${prefs}/metro"/>
+ <copy toFile="${prefs}/metro/metro.properties"
file="${basedir}/template.metro.properties"/>
+
<property name="local" value="${bundle}/local"/>
<x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
<x:replicate refid="module.path" toDir="${local}" />
@@ -96,8 +112,13 @@
Package the bundle into a compressed archive.
-->
<x:dist compression="gzip">
- <fileset dir="${bundle}"/>
+ <zipfileset dir="${bundle}/prefs" prefix="Preferences"/>
+ <tarfileset dir="${bundle}/prefs" prefix="prefs"/>
+ <fileset dir="${bundle}">
+ <exclude name="prefs/**"/>
+ </fileset>
</x:dist>
+
</target>

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

Added: development/main/metro/template.metro.properties
==============================================================================
--- (empty file)
+++ development/main/metro/template.metro.properties Sun Feb 13 21:26:03
2005
@@ -0,0 +1,2 @@
+
+# site wide customization of metro properties

svn commit: r1773 - in development/main: home home/transit/handler/src/main/net/dpml/transit magic magic/core/src/main/net/dpml/magic metro metro/main/etc/conf, mcconnell, 02/13/2005