notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r1579 - in development/main: central/site central/site/src/docs central/site/src/docs/guide central/site/src/docs/guide/development central/site/src/docs/guide/magic central/site/src/docs/guide/metro central/site/src/docs/products/magic central/site/src/docs/products/metro central/site/src/docs/products/transit central/site/src/docs/products/transit/technical/cache central/site/src/docs/products/transit/technical/hosts central/site/src/docs/products/transit/technical/launcher central/site/src/docs/products/transit/technical/monitors central/site/src/docs/products/transit/technical/repository central/site/src/resources/images/discovery central/site/src/resources/images/mgr magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/tasks metro/main transit

From: mcconnell AT netcompartner.com
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r1579 - in development/main: central/site central/site/src/docs central/site/src/docs/guide central/site/src/docs/guide/development central/site/src/docs/guide/magic central/site/src/docs/guide/metro central/site/src/docs/products/magic central/site/src/docs/products/metro central/site/src/docs/products/transit central/site/src/docs/products/transit/technical/cache central/site/src/docs/products/transit/technical/hosts central/site/src/docs/products/transit/technical/launcher central/site/src/docs/products/transit/technical/monitors central/site/src/docs/products/transit/technical/repository central/site/src/resources/images/discovery central/site/src/resources/images/mgr magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/tasks metro/main transit
Date: Mon, 24 Jan 2005 20:48:06 +0100

Author: mcconnell
Date: Mon Jan 24 20:48:06 2005
New Revision: 1579

Added:
development/main/central/site/src/docs/guide/magic/
development/main/central/site/src/docs/guide/metro/
- copied from r1562,
development/main/central/site/src/docs/guide/development/
Removed:
development/main/central/site/src/docs/guide/development/
Modified:
development/main/central/site/build.xml
development/main/central/site/src/docs/guide/index.xml
development/main/central/site/src/docs/guide/navigation.xml
development/main/central/site/src/docs/navigation.xml
development/main/central/site/src/docs/products/magic/navigation.xml
development/main/central/site/src/docs/products/metro/navigation.xml
development/main/central/site/src/docs/products/transit/navigation.xml

development/main/central/site/src/docs/products/transit/technical/cache/properties.xml

development/main/central/site/src/docs/products/transit/technical/hosts/hosts.xml

development/main/central/site/src/docs/products/transit/technical/launcher/properties.xml

development/main/central/site/src/docs/products/transit/technical/monitors/index.xml

development/main/central/site/src/docs/products/transit/technical/repository/chain.xml

development/main/central/site/src/docs/products/transit/technical/repository/class.xml

development/main/central/site/src/docs/products/transit/technical/repository/descriptor.xml

development/main/central/site/src/docs/products/transit/technical/repository/instantiation.xml
development/main/central/site/src/resources/images/discovery/ (props
changed)
development/main/central/site/src/resources/images/mgr/ (props changed)
development/main/magic/core/src/main/net/dpml/magic/model/Info.java
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
development/main/metro/main/build.xml
development/main/transit/module.xml
Log:
cleaning up docs, fixing javadoc links, and updates to the javadoc task and
Info class to better handle separation of javadoc api info from the main doc
root

Modified: development/main/central/site/build.xml
==============================================================================
--- development/main/central/site/build.xml (original)
+++ development/main/central/site/build.xml Mon Jan 24 20:48:06 2005
@@ -71,7 +71,7 @@
</target>

<target name="update" depends="docs">
- <publish xmlns="plugin:dpml/magic/dpml-magic-publish" path="central"/>
+ <publish xmlns="plugin:dpml/magic/dpml-magic-publish" path="."/>
</target>

<target name="install" depends="docs"/>

Modified: development/main/central/site/src/docs/guide/index.xml
==============================================================================
--- development/main/central/site/src/docs/guide/index.xml (original)
+++ development/main/central/site/src/docs/guide/index.xml Mon Jan 24
20:48:06 2005
@@ -30,7 +30,7 @@
component lifecycles and lifestyles.
Model-driven containers represent an advanced branch of IoC based
containment
solutions. Typically a model-driven container will provide a
framework for
- automated assembly, <a href="composite.html">component
composition</a>,
+ automated assembly, component <a
href="metro/index.html">composition</a>,
dynamic component deployment, runtime change to deployment
configurations,
and orderly startup and shutdown sequencing.
</li>

Modified: development/main/central/site/src/docs/guide/navigation.xml
==============================================================================
--- development/main/central/site/src/docs/guide/navigation.xml (original)
+++ development/main/central/site/src/docs/guide/navigation.xml Mon Jan 24
20:48:06 2005
@@ -26,10 +26,11 @@

<menu>
<item name="Installation" href="setup/index.html"/>
- <item name="Quick Start" href="quick/index.html"/>
- <item name="Patterns" href="patterns/index.html"/>
- <item name="Developing with Metro" href="development/index.html"/>
- <item name="Using Transit" href="transit/index.html"/>
+ 
+ 
+ <item name="Developing with Metro" href="metro/index.html"/>
+ <item name="Transit Users Guide" href="transit/index.html"/>
+ <item name="Using Magic" href="magic/index.html"/>
</menu>

</body>

Modified: development/main/central/site/src/docs/navigation.xml
==============================================================================
--- development/main/central/site/src/docs/navigation.xml (original)
+++ development/main/central/site/src/docs/navigation.xml Mon Jan 24
20:48:06 2005
@@ -29,7 +29,7 @@

<item name="Planet" href="planet/index.html"/>
<item name="Products" href="products/index.html"/>
- <item name="Guide" href="guide/quick/index.html"/>
+ <item name="Guide" href="guide/index.html"/>
</links>

<menu>

Modified: development/main/central/site/src/docs/products/magic/navigation.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/navigation.xml
(original)
+++ development/main/central/site/src/docs/products/magic/navigation.xml
Mon Jan 24 20:48:06 2005
@@ -29,7 +29,7 @@
<item name="Antlib" href="antlib/index.html"/>
<item name="Tasks" href="tasks/index.html"/>
<item name="Plugins" href="plugins/index.html"/>
- <item name="Javadoc" href="../../../@MAGIC-DOCS-PATH@/index.html"/>
+ <item name="Javadoc" href="../../@MAGIC-DOCS-PATH@/index.html"/>
</menu>

</body>

Modified: development/main/central/site/src/docs/products/metro/navigation.xml
==============================================================================
--- development/main/central/site/src/docs/products/metro/navigation.xml
(original)
+++ development/main/central/site/src/docs/products/metro/navigation.xml
Mon Jan 24 20:48:06 2005
@@ -30,7 +30,7 @@
<item name="Composition" href="composition/index.html"/>
<item name="Runtime" href="runtime/index.html"/>
<item name="Javadoc"
- href="../../../@METRO-JAVADOC-PATH@/index.html"/>
+ href="../../@METRO-JAVADOC-PATH@/index.html"/>
</menu>

</body>

Modified:
development/main/central/site/src/docs/products/transit/navigation.xml
==============================================================================
--- development/main/central/site/src/docs/products/transit/navigation.xml
(original)
+++ development/main/central/site/src/docs/products/transit/navigation.xml
Mon Jan 24 20:48:06 2005
@@ -29,11 +29,7 @@
<item name="Product Overview" href="overview/index.html"/>
<item name="Product Specifications" href="technical/index.html"/>
<item name="Users Guide" href="guide.html"/>
- <item name="Javadocs" href="../../../@TRANSIT-DOCS-PATH@/index.html"/>
- 
+ <item name="Javadocs" href="../../@TRANSIT-DOCS-PATH@/index.html"/>
</menu>

</body>

Modified:
development/main/central/site/src/docs/products/transit/technical/cache/properties.xml
==============================================================================
---
development/main/central/site/src/docs/products/transit/technical/cache/properties.xml
(original)
+++
development/main/central/site/src/docs/products/transit/technical/cache/properties.xml
Mon Jan 24 20:48:06 2005
@@ -66,7 +66,7 @@
</td>
<td>
The fully qualified class name of the class that implements the
- <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/artifact/CacheHandler.html">
+ <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/artifact/CacheHandler.html">
CacheHandler</a> interface.
</td>
</tr>

Modified:
development/main/central/site/src/docs/products/transit/technical/hosts/hosts.xml
==============================================================================
---
development/main/central/site/src/docs/products/transit/technical/hosts/hosts.xml
(original)
+++
development/main/central/site/src/docs/products/transit/technical/hosts/hosts.xml
Mon Jan 24 20:48:06 2005
@@ -30,7 +30,7 @@
A Resource Host is a place where Artifacts can be downloaded. Transit
is capable of handling many types of resource hosts. Conceptually,
you
only need to implement the
- <code><a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/artifact/ResourceHost.html">
+ <code><a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/artifact/ResourceHost.html">
net.dpml.transit.artifact.ResourceHost</a></code> interface, and
specify the implementation class of the host handler.


Modified:
development/main/central/site/src/docs/products/transit/technical/launcher/properties.xml
==============================================================================
---
development/main/central/site/src/docs/products/transit/technical/launcher/properties.xml
(original)
+++
development/main/central/site/src/docs/products/transit/technical/launcher/properties.xml
Mon Jan 24 20:48:06 2005
@@ -31,7 +31,7 @@

In addition to the classic protocol handling, Transit provides
support
for the deployment of a runtime application via the
- <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/Main.html">
+ <a href="@TRANSIT-DOCS-PATH@/net/dpml/transit/Main.html">
Transit Main</a> handler class. This class looks for the
"dpml.transit.bootstrap.uri" system property and value corresponding
to
a uri of a bootstrap plugin that handles the deployment of
application

Modified:
development/main/central/site/src/docs/products/transit/technical/monitors/index.xml
==============================================================================
---
development/main/central/site/src/docs/products/transit/technical/monitors/index.xml
(original)
+++
development/main/central/site/src/docs/products/transit/technical/monitors/index.xml
Mon Jan 24 20:48:06 2005
@@ -25,26 +25,26 @@
<tr><th>Type</th><th>Description</th></tr>
<tr>
<td>
- <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/monitors/CacheMonitor.html">CacheMonitor</a></td>
+ <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/monitors/CacheMonitor.html">CacheMonitor</a></td>
<td>Handles events related to resource requests, modification of
the
local cache, and download failures.</td>
</tr>
<tr>
<td>
- <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/monitors/ConnectionMonitor.html">
+ <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/monitors/ConnectionMonitor.html">
ConnectionMonitor</a></td>
<td>Handles events dealing with the openning and closing of
connections.</td>
</tr>
<tr>
<td>
- <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/monitors/NetworkMonitor.html">
+ <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/monitors/NetworkMonitor.html">
NetworkMonitor</a></td>
<td>Handles events dealing with network activitiy including
progressive
download activitiy and download completion.</td>
</tr>
<tr>
<td>
- <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/monitors/RepositoryMonitor.html">
+ <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/monitors/RepositoryMonitor.html">
RepositoryMonitor</a></td>
<td>Handles events dealing with plugin requests, plugin class
establishment, constructor
discovery, plugin instantiation, classloader creation, and
plugin error reporting.</td>

Modified:
development/main/central/site/src/docs/products/transit/technical/repository/chain.xml
==============================================================================
---
development/main/central/site/src/docs/products/transit/technical/repository/chain.xml
(original)
+++
development/main/central/site/src/docs/products/transit/technical/repository/chain.xml
Mon Jan 24 20:48:06 2005
@@ -16,7 +16,7 @@
Each set of jar file entries represent the content of the respective
classloader. Entries are declared in the form of an artifact uri.
The classloader chain parent is supplied as an argument to the
- <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Repository.html">
+ <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Repository.html">
Repository</a> service interface and establishes the parent
classloader for the API classloader. The API classloader serves as
the
parent to the SPI classloader which in turn serves as the parent to
the IMPL
@@ -27,7 +27,7 @@

Example classloader creation:
<pre>
-Repository repository = new <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/StandardLoader.html">StandardLoader()</a>;
+Repository repository = new <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/StandardLoader.html">StandardLoader()</a>;
ClassLoader parent = getClass().getClassLoader();
URI uri = new URI( "@METRO-PLUGIN-URI@" );
ClassLoader classloader = repository.getPluginClassLoader( parent, uri );

Modified:
development/main/central/site/src/docs/products/transit/technical/repository/class.xml
==============================================================================
---
development/main/central/site/src/docs/products/transit/technical/repository/class.xml
(original)
+++
development/main/central/site/src/docs/products/transit/technical/repository/class.xml
Mon Jan 24 20:48:06 2005
@@ -15,12 +15,12 @@
chain creation operation. Following establishment of the classloader
<a href="chain.html">chain</a> the implmentation classloader is used
to resolve the main class declared within the
- <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Plugin.html">Plugin</a>
descriptor.
+ <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Plugin.html">Plugin</a>
descriptor.


Example plugin class loading:
<pre>
-Repository repository = new <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/StandardLoader.html">StandardLoader()</a>;
+Repository repository = new <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/StandardLoader.html">StandardLoader()</a>;
ClassLoader parent = getClass().getClassLoader();
URI uri = new URI( "@METRO-PLUGIN-URI@" );
Class pluginClass = repository.getPluginClass( parent, uri );

Modified:
development/main/central/site/src/docs/products/transit/technical/repository/descriptor.xml
==============================================================================
---
development/main/central/site/src/docs/products/transit/technical/repository/descriptor.xml
(original)
+++
development/main/central/site/src/docs/products/transit/technical/repository/descriptor.xml
Mon Jan 24 20:48:06 2005
@@ -11,7 +11,7 @@


Some applications may require information about a plugin prior to
loading the plugin. The
- <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Plugin.html">Plugin</a>
+ <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Plugin.html">Plugin</a>
class is an immutable datatype that serves this function. It
enables convinient access to
the api, spi and impl URI sets, and information related to the
declared main class or
resource and namespec declarations.
@@ -21,7 +21,7 @@
<pre>
Repository repository = new StandardLoader();
URI uri = new URI( "@METRO-PLUGIN-URI@" );
-<a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Plugin.html">Plugin</a>
plugin = repository.getPluginDescriptor( uri );
+<a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Plugin.html">Plugin</a>
plugin = repository.getPluginDescriptor( uri );
....
</pre>

Modified:
development/main/central/site/src/docs/products/transit/technical/repository/instantiation.xml
==============================================================================
---
development/main/central/site/src/docs/products/transit/technical/repository/instantiation.xml
(original)
+++
development/main/central/site/src/docs/products/transit/technical/repository/instantiation.xml
Mon Jan 24 20:48:06 2005
@@ -10,7 +10,7 @@
<section name="Plugin Instantiation">


- The <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Repository.html">
+ The <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Repository.html">
Repository</a> service provides a generic plugin instantiation
service. The service is typically
used by applications that know more about the type of plugins that
are loaded than Transit does.
As such, the plugin instantiation service should be viewed as a
convinience function.
@@ -25,7 +25,7 @@

Example plugin instantiation:
<pre>
-Repository repository = new <a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/StandardLoader.html">StandardLoader()</a>;
+Repository repository = new <a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/StandardLoader.html">StandardLoader()</a>;
ClassLoader parent = getClass().getClassLoader();
URI uri = new URI( "@METRO-PLUGIN-URI@" );
String[] args = new String[]{ "-debug", "-audit" ); // simulate cli args
@@ -53,9 +53,9 @@

<table>
<tr><th>Type</th><th>Description</th></tr>
- <tr><td><a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Plugin.html">Plugin</a></td><td>The
plugin descriptor.</td></tr>
+ <tr><td><a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Plugin.html">Plugin</a></td><td>The
plugin descriptor.</td></tr>
<tr><td>ClassLoader</td><td>The implementation
classloader.</td></tr>
- <tr><td><a
href="../../../../../@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Repository.html">Repository</a></td><td>The
repository used to establish the plugin.</td></tr>
+ <tr><td><a
href="@TRANSIT-DOCS-PATH@/net/dpml/transit/repository/Repository.html">Repository</a></td><td>The
repository used to establish the plugin.</td></tr>
<tr><td>[]</td><td>An array of any kind that is unresolved will
be assigned an empty array value.</td></tr>
</table>

Modified: development/main/magic/core/src/main/net/dpml/magic/model/Info.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Info.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Info.java Mon
Jan 24 20:48:06 2005
@@ -286,19 +286,19 @@

/**
* Return the api javadoc path. The path is retured in the form
- * [group]/api/[version] for a module and [group]/[name]/api/[version]
+ * /api/[group]/[version] for a module and /api/[group]/[name]/[version]
* for other types.
*
* @return the javadoc api path
*/
public String getJavadocPath()
{
- StringBuffer buffer = new StringBuffer( getGroup() );
+ StringBuffer buffer = new StringBuffer( "/api/" );
+ buffer.append( getGroup() );
if( !"module".equals( getType() ) )
{
buffer.append( "/" + getName() );
}
- buffer.append( "/api" );
if( getVersion() != null )
{
buffer.append( "/" + getVersion() );

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
Mon Jan 24 20:48:06 2005
@@ -111,7 +111,7 @@
log( "Generating javadoc for project: " + def, Project.MSG_VERBOSE );

File docs = getIndex().getDocsDirectory();
- File destination = new File( docs , def.getInfo().getJavadocPath() );
+ File destination = new File( docs, def.getInfo().getJavadocPath() );

//
// construct the classpath by getting all of the classpaths for
@@ -261,7 +261,7 @@
}
else
{
- log( "link: " + href );
+ log( "link: " + href + " [" + dir + "]" );
}
}

@@ -429,10 +429,11 @@
throw new BuildException( error, def.getLocation() );
}
final Resource resource = index.getResource( m_key );
- final String spec =
- resource.getInfo().getSpecification( "/", "/" );
- final String path = spec + "/api";
- return m_host + "/" + path;
+ return m_host + resource.getInfo().getJavadocPath();
+ //final String spec =
+ // resource.getInfo().getSpecification( "/", "/" );
+ //final String path = spec + "/api";
+ //return m_host + "/" + path;
}
}

Modified: development/main/metro/main/build.xml
==============================================================================
--- development/main/metro/main/build.xml (original)
+++ development/main/metro/main/build.xml Mon Jan 24 20:48:06 2005
@@ -30,7 +30,7 @@

<target name="bin" depends="prepare">
<mkdir dir="${dpml.home}/bin"/>
- <copy todir="${dpml.home}/bin">
+ <copy todir="${dpml.home}/bin" overwrite="true">
<fileset dir="target/deliverables/bin"/>
</copy>
<chmod file="${dpml.home}/bin/metro" perm="755"/>

Modified: development/main/transit/module.xml
==============================================================================
--- development/main/transit/module.xml (original)
+++ development/main/transit/module.xml Mon Jan 24 20:48:06 2005
@@ -40,8 +40,7 @@
<target name="docs" depends="install,junit-report,checkstyle">
<x:javadoc overview="overview.html">
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
- <link href="http://www.dpml.net/asf/ant/1.6.2/api"/>
- <link href="http://www.dpml.net/commons-cli/api/1.0"/>
+ <link href="http://www.dpml.net/api/commons-cli/1.0"/>
<group title="Transit Protocol Handler">
<package name="net.dpml.transit"/>
<package name="net.dpml.transit.adapter"/>

svn commit: r1579 - in development/main: central/site central/site/src/docs central/site/src/docs/guide central/site/src/docs/guide/development central/site/src/docs/guide/magic central/site/src/docs/guide/metro central/site/src/docs/products/magic central/site/src/docs/products/metro central/site/src/docs/products/transit central/site/src/docs/products/transit/technical/cache central/site/src/docs/products/transit/technical/hosts central/site/src/docs/products/transit/technical/launcher central/site/src/docs/products/transit/technical/monitors central/site/src/docs/products/transit/technical/repository central/site/src/resources/images/discovery central/site/src/resources/images/mgr magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/tasks metro/main transit, mcconnell, 01/24/2005