notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r1701 - in development/main/home: . etc etc/ant etc/commons-cli etc/jdk transit transit/handler/src/main/net/dpml/transit/util transit/tools/src/main/net/dpml/transit/tools util util/cli

From: mcconnell AT netcompartner.com
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r1701 - in development/main/home: . etc etc/ant etc/commons-cli etc/jdk transit transit/handler/src/main/net/dpml/transit/util transit/tools/src/main/net/dpml/transit/tools util util/cli
Date: Wed, 02 Feb 2005 15:43:26 +0100

Author: mcconnell
Date: Wed Feb 2 15:43:25 2005
New Revision: 1701

Added:
development/main/home/common.properties
development/main/home/etc/
development/main/home/etc/ant/
development/main/home/etc/ant/package-list
development/main/home/etc/commons-cli/
development/main/home/etc/commons-cli/package-list
development/main/home/etc/jdk/
development/main/home/etc/jdk/package-list
Modified:
development/main/home/build.xml
development/main/home/transit/build.xml

development/main/home/transit/handler/src/main/net/dpml/transit/util/Dictionary.java

development/main/home/transit/tools/src/main/net/dpml/transit/tools/GetTask.java

development/main/home/transit/tools/src/main/net/dpml/transit/tools/package.html
development/main/home/util/build.xml
development/main/home/util/cli/build.properties
development/main/home/util/cli/build.xml
Log:
Addistion of javadoc to the distribution.

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml (original)
+++ development/main/home/build.xml Wed Feb 2 15:43:25 2005
@@ -96,17 +96,16 @@
<fileset dir="${basedir}/transit/plugin/target/bin"/>
</copy>

- 

<copy todir="${bundle}" filtering="true">
<fileset dir="${basedir}">

Added: development/main/home/common.properties
==============================================================================
--- (empty file)
+++ development/main/home/common.properties Wed Feb 2 15:43:25 2005
@@ -0,0 +1,7 @@
+
+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}
+ant.uri = artifact:jar:ant/ant#1.6.2
\ No newline at end of file

Added: development/main/home/etc/ant/package-list
==============================================================================
--- (empty file)
+++ development/main/home/etc/ant/package-list Wed Feb 2 15:43:25 2005
@@ -0,0 +1,67 @@
+org.apache.tools.ant
+org.apache.tools.ant.filters
+org.apache.tools.ant.filters.util
+org.apache.tools.ant.helper
+org.apache.tools.ant.input
+org.apache.tools.ant.launch
+org.apache.tools.ant.listener
+org.apache.tools.ant.loader
+org.apache.tools.ant.taskdefs
+org.apache.tools.ant.taskdefs.compilers
+org.apache.tools.ant.taskdefs.condition
+org.apache.tools.ant.taskdefs.cvslib
+org.apache.tools.ant.taskdefs.email
+org.apache.tools.ant.taskdefs.optional
+org.apache.tools.ant.taskdefs.optional.ccm
+org.apache.tools.ant.taskdefs.optional.clearcase
+org.apache.tools.ant.taskdefs.optional.depend
+org.apache.tools.ant.taskdefs.optional.depend.constantpool
+org.apache.tools.ant.taskdefs.optional.dotnet
+org.apache.tools.ant.taskdefs.optional.ejb
+org.apache.tools.ant.taskdefs.optional.extension
+org.apache.tools.ant.taskdefs.optional.extension.resolvers
+org.apache.tools.ant.taskdefs.optional.i18n
+org.apache.tools.ant.taskdefs.optional.ide
+org.apache.tools.ant.taskdefs.optional.image
+org.apache.tools.ant.taskdefs.optional.j2ee
+org.apache.tools.ant.taskdefs.optional.javacc
+org.apache.tools.ant.taskdefs.optional.jdepend
+org.apache.tools.ant.taskdefs.optional.jlink
+org.apache.tools.ant.taskdefs.optional.jsp
+org.apache.tools.ant.taskdefs.optional.jsp.compilers
+org.apache.tools.ant.taskdefs.optional.junit
+org.apache.tools.ant.taskdefs.optional.metamata
+org.apache.tools.ant.taskdefs.optional.net
+org.apache.tools.ant.taskdefs.optional.perforce
+org.apache.tools.ant.taskdefs.optional.pvcs
+org.apache.tools.ant.taskdefs.optional.scm
+org.apache.tools.ant.taskdefs.optional.script
+org.apache.tools.ant.taskdefs.optional.sitraka
+org.apache.tools.ant.taskdefs.optional.sitraka.bytecode
+org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes
+org.apache.tools.ant.taskdefs.optional.sos
+org.apache.tools.ant.taskdefs.optional.sound
+org.apache.tools.ant.taskdefs.optional.splash
+org.apache.tools.ant.taskdefs.optional.ssh
+org.apache.tools.ant.taskdefs.optional.starteam
+org.apache.tools.ant.taskdefs.optional.unix
+org.apache.tools.ant.taskdefs.optional.vss
+org.apache.tools.ant.taskdefs.optional.windows
+org.apache.tools.ant.taskdefs.rmic
+org.apache.tools.ant.types
+org.apache.tools.ant.types.optional
+org.apache.tools.ant.types.optional.depend
+org.apache.tools.ant.types.optional.image
+org.apache.tools.ant.types.resolver
+org.apache.tools.ant.types.selectors
+org.apache.tools.ant.types.selectors.modifiedselector
+org.apache.tools.ant.util
+org.apache.tools.ant.util.depend
+org.apache.tools.ant.util.depend.bcel
+org.apache.tools.ant.util.facade
+org.apache.tools.ant.util.optional
+org.apache.tools.ant.util.regexp
+org.apache.tools.bzip2
+org.apache.tools.mail
+org.apache.tools.tar
+org.apache.tools.zip

Added: development/main/home/etc/commons-cli/package-list
==============================================================================
--- (empty file)
+++ development/main/home/etc/commons-cli/package-list Wed Feb 2 15:43:25
2005
@@ -0,0 +1 @@
+org.apache.commons.cli

Added: development/main/home/etc/jdk/package-list
==============================================================================
--- (empty file)
+++ development/main/home/etc/jdk/package-list Wed Feb 2 15:43:25 2005
@@ -0,0 +1,135 @@
+java.applet
+java.awt
+java.awt.color
+java.awt.datatransfer
+java.awt.dnd
+java.awt.event
+java.awt.font
+java.awt.geom
+java.awt.im
+java.awt.im.spi
+java.awt.image
+java.awt.image.renderable
+java.awt.print
+java.beans
+java.beans.beancontext
+java.io
+java.lang
+java.lang.ref
+java.lang.reflect
+java.math
+java.net
+java.nio
+java.nio.channels
+java.nio.channels.spi
+java.nio.charset
+java.nio.charset.spi
+java.rmi
+java.rmi.activation
+java.rmi.dgc
+java.rmi.registry
+java.rmi.server
+java.security
+java.security.acl
+java.security.cert
+java.security.interfaces
+java.security.spec
+java.sql
+java.text
+java.util
+java.util.jar
+java.util.logging
+java.util.prefs
+java.util.regex
+java.util.zip
+javax.accessibility
+javax.crypto
+javax.crypto.interfaces
+javax.crypto.spec
+javax.imageio
+javax.imageio.event
+javax.imageio.metadata
+javax.imageio.plugins.jpeg
+javax.imageio.spi
+javax.imageio.stream
+javax.naming
+javax.naming.directory
+javax.naming.event
+javax.naming.ldap
+javax.naming.spi
+javax.net
+javax.net.ssl
+javax.print
+javax.print.attribute
+javax.print.attribute.standard
+javax.print.event
+javax.rmi
+javax.rmi.CORBA
+javax.security.auth
+javax.security.auth.callback
+javax.security.auth.kerberos
+javax.security.auth.login
+javax.security.auth.spi
+javax.security.auth.x500
+javax.security.cert
+javax.sound.midi
+javax.sound.midi.spi
+javax.sound.sampled
+javax.sound.sampled.spi
+javax.sql
+javax.swing
+javax.swing.border
+javax.swing.colorchooser
+javax.swing.event
+javax.swing.filechooser
+javax.swing.plaf
+javax.swing.plaf.basic
+javax.swing.plaf.metal
+javax.swing.plaf.multi
+javax.swing.table
+javax.swing.text
+javax.swing.text.html
+javax.swing.text.html.parser
+javax.swing.text.rtf
+javax.swing.tree
+javax.swing.undo
+javax.transaction
+javax.transaction.xa
+javax.xml.parsers
+javax.xml.transform
+javax.xml.transform.dom
+javax.xml.transform.sax
+javax.xml.transform.stream
+org.ietf.jgss
+org.omg.CORBA
+org.omg.CORBA.DynAnyPackage
+org.omg.CORBA.ORBPackage
+org.omg.CORBA.TypeCodePackage
+org.omg.CORBA.portable
+org.omg.CORBA_2_3
+org.omg.CORBA_2_3.portable
+org.omg.CosNaming
+org.omg.CosNaming.NamingContextExtPackage
+org.omg.CosNaming.NamingContextPackage
+org.omg.Dynamic
+org.omg.DynamicAny
+org.omg.DynamicAny.DynAnyFactoryPackage
+org.omg.DynamicAny.DynAnyPackage
+org.omg.IOP
+org.omg.IOP.CodecFactoryPackage
+org.omg.IOP.CodecPackage
+org.omg.Messaging
+org.omg.PortableInterceptor
+org.omg.PortableInterceptor.ORBInitInfoPackage
+org.omg.PortableServer
+org.omg.PortableServer.CurrentPackage
+org.omg.PortableServer.POAManagerPackage
+org.omg.PortableServer.POAPackage
+org.omg.PortableServer.ServantLocatorPackage
+org.omg.PortableServer.portable
+org.omg.SendingContext
+org.omg.stub.java.rmi
+org.w3c.dom
+org.xml.sax
+org.xml.sax.ext
+org.xml.sax.helpers

Modified: development/main/home/transit/build.xml
==============================================================================
--- development/main/home/transit/build.xml (original)
+++ development/main/home/transit/build.xml Wed Feb 2 15:43:25 2005
@@ -19,10 +19,12 @@
-->

-<project name="dpml-transit" basedir="." default="install">
+<project name="dpml-transit" basedir="." default="install"
+ xmlns:transit="antlib:net.dpml.transit">

<property file="build.properties"/>
<import file="${transit.home}/standard.xml"/>
+ <property file="${transit.home}/common.properties"/>

<target name="init" depends="standard.init">
<filter token="PROJECT-VERSION" value="${project.version}"/>
@@ -37,4 +39,41 @@
<checksum fileext=".md5" file="${module.file}"/>
</target>

+ <target name="install" depends="standard.install,javadoc"/>
+
+ <target name="javadoc" depends="prepare">
+ <transit:get property="ant.path" uri="${ant.uri}"/>
+ <transit:get property="i18n.path"
uri="artifact:jar:dpml/util/dpml-util-i18n#${project.version}"/>
+ <transit:get property="cli.path"
uri="artifact:jar:dpml/util/dpml-util-cli#${project.version}"/>
+ <transit:get property="commons-cli.cache.path" uri="${commons-cli.uri}"/>
+ <transit:get property="exception.path"
uri="artifact:jar:dpml/util/dpml-util-exception#${project.version}"/>
+ <property name="api.dir" location="${basedir}/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>
+ <packageset dir="handler/target/build/main"/>
+ <packageset dir="plugin/target/build/main"/>
+ <packageset dir="tools/target/build/main"/>
+ <fileset dir="handler/target/build/main"/>
+ <fileset dir="plugin/target/build/main"/>
+ <fileset dir="tools/target/build/main"/>
+ <bottom><![CDATA[<i>Collective Work Copyright © 2004-2005 The <a
href="http://www.dpml.net";>Digial Product Meta Library.</a> All Rights
Reserved.</i>]]></bottom>
+ <link offline="true" href="http://java.sun.com/j2se/1.4/docs/api";
+ packagelistloc="${transit.home}/etc/jdk"/>
+ <link offline="true" href="http://www.dpml.net/api/commons-cli/1.0";
+ packagelistloc="${transit.home}/etc/commons-cli"/>
+ <link offline="true" href="http://www.dpml.net/api/ant/1.6.2";
+ packagelistloc="${transit.home}/etc/ant"/>
+ <link offline="true"
href="http://www.dpml.net/api/dpml/util/${project.version}";
+ packagelistloc="${transit.home}/util/target/api"/>
+ <classpath>
+ <pathelement location="${ant.path}"/>
+ <pathelement location="${i18n.path}"/>
+ <pathelement location="${cli.path}"/>
+ <pathelement location="${commons-cli.cache.path}"/>
+ <pathelement location="${exception.path}"/>
+ </classpath>
+ </javadoc>
+ </target>
+
</project>

Modified:
development/main/home/transit/handler/src/main/net/dpml/transit/util/Dictionary.java
==============================================================================
---
development/main/home/transit/handler/src/main/net/dpml/transit/util/Dictionary.java
(original)
+++
development/main/home/transit/handler/src/main/net/dpml/transit/util/Dictionary.java
Wed Feb 2 15:43:25 2005
@@ -252,7 +252,7 @@

/**
* Returns a set view of the mappings contained in this map. Each
element
- * in the returned set is a {@link Map.Entry}. The set is backed by the
+ * in the returned set is a Map.Entry. The set is backed by the
* map, so changes to the map are reflected in the set, and vice-versa.
* If the map is modified while an iteration over the set is in progress,
* the results of the iteration are undefined. The set supports element

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 2 15:43:25 2005
@@ -57,8 +57,8 @@
}

/**
- * Set the artifact uri of the plugin from which the task is to be loaded.
- * @param uri an artifact plugin uri
+ * Set the name of a property into which the local file path will be
adssigned.
+ * @param name the ant property name
*/
public void setProperty( String name )
{
@@ -67,9 +67,9 @@

/**
* Return the artifact uri of the plugin.
- * @return the plugin uri
+ * @return the artifact uri
*/
- public URI getURI()
+ private URI getURI()
{
try
{
@@ -86,10 +86,10 @@
}

/**
- * Return the artifact uri of the plugin.
- * @return the plugin uri
+ * Return the ant property name.
+ * @return the property name
*/
- public String getPropertyName()
+ private String getPropertyName()
{
if( null == m_name )
{
@@ -104,9 +104,8 @@
}

/**
- * Load the plugin and handle registration of listeners, tasks, and antlib
- * declarations based on the nested nested task directives.
- * @exception BuildException if an error occurs during plugin loading or
deployment
+ * Load the resource and assign the locally cached file path to the
supplied property name.
+ * @exception BuildException if an error occurs during resource resolution
*/
public void execute() throws BuildException
{
@@ -134,5 +133,4 @@
throw new BuildException( error, e, getLocation() );
}
}
-
}

Modified:
development/main/home/transit/tools/src/main/net/dpml/transit/tools/package.html
==============================================================================
---
development/main/home/transit/tools/src/main/net/dpml/transit/tools/package.html
(original)
+++
development/main/home/transit/tools/src/main/net/dpml/transit/tools/package.html
Wed Feb 2 15:43:25 2005
@@ -12,9 +12,9 @@
<p><i>Example build file:</i></p>

<pre>
-<project name="example" xmlns:magic="antlib:net.dpml.magic">
+<project name="example" xmlns:transit="antlib:net.dpml.transit">

- <magic:import uri="artifact:template:dpml/magic/reactor"/>
+ <transit:import uri="artifact:template:dpml/magic/reactor"/>

</project>
</pre>
@@ -24,9 +24,9 @@
<pre>
<project name="example" xmlns:transit="antlib:net.dpml.transit">

- <magic:plugin
uri="artifact:plugin:dpml/magic/dpml-magic-doc#SNAPSHOT">
+ <transit:plugin
uri="artifact:plugin:dpml/magic/dpml-magic-doc#SNAPSHOT">
<task class="net.dpml.magic.doc.DocTask" name="docs"/>
- </magic:plugin>
+ </transit:plugin>

<docs/>

Modified: development/main/home/util/build.xml
==============================================================================
--- development/main/home/util/build.xml (original)
+++ development/main/home/util/build.xml Wed Feb 2 15:43:25 2005
@@ -38,8 +38,9 @@
<checksum fileext=".md5" file="${module.file}"/>
</target>

+ <target name="install" depends="standard.install,javadoc"/>
+
<target name="javadoc" depends="prepare">
- <echo message="${dpml.home}/cache/${commons-cli.path}"/>
<property name="api.dir" location="${basedir}/target/api"/>
<mkdir dir="${api.dir}"/>
<javadoc overview="overview.html" destdir="${api.dir}" use="true">
@@ -54,9 +55,9 @@
<fileset dir="i18n/target/build/main"/>
<bottom><![CDATA[<i>Collective Work Copyright © 2004-2005 The <a
href="http://www.dpml.net";>Digial Product Meta Library.</a> All Rights
Reserved.</i>]]></bottom>
<link offline="true" href="http://java.sun.com/j2se/1.4/docs/api";
- packagelistloc="${basedir}/etc/jdl-1-4.package-list"/>
+ packagelistloc="${transit.home}/etc/jdk"/>
<link offline="true" href="http://www.dpml.net/api/commons-cli/1.0";
- packagelistloc="${basedir}/etc/commons-cli.package-list"/>
+ packagelistloc="${transit.home}/etc/commons-cli"/>
<classpath>
<pathelement location="${dpml.home}/cache/${commons-cli.path}"/>
</classpath>

Modified: development/main/home/util/cli/build.properties
==============================================================================
--- development/main/home/util/cli/build.properties (original)
+++ development/main/home/util/cli/build.properties Wed Feb 2 15:43:25
2005
@@ -5,4 +5,3 @@
project.name = dpml-util-cli
project.specification.version = 1.0

-commons-cli.filename = commons-cli-1.0.jar

Modified: development/main/home/util/cli/build.xml
==============================================================================
--- development/main/home/util/cli/build.xml (original)
+++ development/main/home/util/cli/build.xml Wed Feb 2 15:43:25 2005
@@ -22,33 +22,32 @@

<property file="build.properties"/>
<import file="${transit.home}/standard.xml"/>
+ <property file="${transit.home}/common.properties"/>

<target name="init" depends="standard.init,commons-cli-install"/>

- <target name="setup-path" depends="init">
- <path id="project.main.path">
- <pathelement location="${cli.cache}"/>
- <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- <pathelement location="${target.classes.dir}"/>
- </path>
- </target>
-
<target name="commons-cli-check" depends="standard.init">
- <property name="cli.root" value="commons-cli/jars"/>
- <property name="cli.path" value="${cli.root}/${commons-cli.filename}"/>
- <property name="cli.cache"
value="${dpml.home}/cache/${cli.root}/${commons-cli.filename}"/>
- <available property="commons.cli.available" file="${cli.cache}"/>
+ <property name="commons-cli.cache"
value="${dpml.home}/cache/${commons-cli.path}"/>
+ <available property="commons.cli.available" file="${commons-cli.cache}"/>
</target>

<target name="commons-cli-install" depends="commons-cli-check"
unless="commons.cli.available">
- <property name="cli.url" value="${dpml.repository}/${cli.path}"/>
+ <property name="commons-cli.url"
value="${dpml.repository}/${commons-cli.path}"/>
<echo>

#----------------------------------------------------------------------------------
# Installing Commons CLI

#----------------------------------------------------------------------------------
</echo>
- <mkdir dir="${dpml.home}/cache/${cli.root}"/>
- <get src="${cli.url}" usetimestamp="true" dest="${cli.cache}"/>
+ <mkdir dir="${dpml.home}/cache/${commons-cli.parent}"/>
+ <get src="${commons-cli.url}" usetimestamp="true"
dest="${commons-cli.cache}"/>
+ </target>
+
+ <target name="setup-path" depends="init">
+ <path id="project.main.path">
+ <pathelement location="${commons-cli.cache}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement location="${target.classes.dir}"/>
+ </path>
</target>

</project>

svn commit: r1701 - in development/main/home: . etc etc/ant etc/commons-cli etc/jdk transit transit/handler/src/main/net/dpml/transit/util transit/tools/src/main/net/dpml/transit/tools util util/cli, mcconnell, 02/02/2005