notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1383 - in trunk/main: central/src/docs/about/download central/src/docs/transit/cli central/src/docs/transit/cli/add central/src/docs/transit/cli/remove central/src/docs/transit/cli/set metro/test/etc/test transit/console/src/main/net/dpml/transit/console transit/core/etc/main/net/dpml/transit transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/artifact transit/core/src/main/net/dpml/transit/info transit/core/src/main/net/dpml/transit/model transit/core/src/test/net/dpml/transit/info transit/core/src/test/net/dpml/transit/test

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1383 - in trunk/main: central/src/docs/about/download central/src/docs/transit/cli central/src/docs/transit/cli/add central/src/docs/transit/cli/remove central/src/docs/transit/cli/set metro/test/etc/test transit/console/src/main/net/dpml/transit/console transit/core/etc/main/net/dpml/transit transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/artifact transit/core/src/main/net/dpml/transit/info transit/core/src/main/net/dpml/transit/model transit/core/src/test/net/dpml/transit/info transit/core/src/test/net/dpml/transit/test
Date: Wed, 19 Apr 2006 08:57:12 +0200

Author: mcconnell
Date: 2006-04-19 08:57:00 +0200 (Wed, 19 Apr 2006)
New Revision: 1383

Removed:
trunk/main/central/src/docs/transit/cli/add/handler.xml
trunk/main/central/src/docs/transit/cli/remove/handler.xml
trunk/main/central/src/docs/transit/cli/set/handler.xml

trunk/main/transit/console/src/main/net/dpml/transit/console/ContentDirectiveBuilder.java
trunk/main/transit/core/src/main/net/dpml/transit/ContentRegistry.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentModel.java

trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java

trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java

trunk/main/transit/core/src/main/net/dpml/transit/info/ContentDirective.java
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentEvent.java

trunk/main/transit/core/src/main/net/dpml/transit/model/ContentListener.java
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentModel.java

trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryEvent.java

trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryListener.java

trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryModel.java

trunk/main/transit/core/src/main/net/dpml/transit/model/PropertyChangeEvent.java

trunk/main/transit/core/src/test/net/dpml/transit/info/ContentDirectiveTestCase.java
Modified:
trunk/main/central/src/docs/about/download/archive.xml
trunk/main/central/src/docs/transit/cli/add/index.xml
trunk/main/central/src/docs/transit/cli/add/layout.xml
trunk/main/central/src/docs/transit/cli/add/navigation.xml
trunk/main/central/src/docs/transit/cli/index.xml
trunk/main/central/src/docs/transit/cli/remove/index.xml
trunk/main/central/src/docs/transit/cli/remove/navigation.xml
trunk/main/central/src/docs/transit/cli/set/index.xml
trunk/main/central/src/docs/transit/cli/set/navigation.xml
trunk/main/metro/test/etc/test/logging.properties

trunk/main/transit/console/src/main/net/dpml/transit/console/CacheDirectiveBuilder.java

trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
trunk/main/transit/core/etc/main/net/dpml/transit/transit_1_0.dtd
trunk/main/transit/core/src/main/net/dpml/transit/CacheHandler.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheHandler.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
trunk/main/transit/core/src/main/net/dpml/transit/TransitBuilder.java

trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
trunk/main/transit/core/src/main/net/dpml/transit/info/CacheDirective.java

trunk/main/transit/core/src/main/net/dpml/transit/info/TransitDirective.java
trunk/main/transit/core/src/main/net/dpml/transit/model/CacheModel.java

trunk/main/transit/core/src/test/net/dpml/transit/info/CacheDirectiveTestCase.java

trunk/main/transit/core/src/test/net/dpml/transit/info/TransitDirectiveTestCase.java
trunk/main/transit/core/src/test/net/dpml/transit/test/LinkTestCase.java
trunk/main/transit/core/src/test/net/dpml/transit/test/OfflineTestCase.java
trunk/main/transit/core/src/test/net/dpml/transit/test/OnlineTestCase.java
Log:
remove redundant content handler functionality from transit

Modified: trunk/main/central/src/docs/about/download/archive.xml
===================================================================
--- trunk/main/central/src/docs/about/download/archive.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/about/download/archive.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -29,6 +29,8 @@
<li>Depot builder structural enhancements.</li>
<li>Addition of configurable project listeners.</li>
<li>Addition of configurable processors.</li>
+ <li>Removal of transit content handlers (functionality available
+ under the improved part model).</li>
</ul>

<table>

Deleted: trunk/main/central/src/docs/transit/cli/add/handler.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/add/handler.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/add/handler.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<document>
-
- <properties>
- <author email="mcconnell AT dpml.net">Stephen McConnell</author>
- <title>DPML Transit Add Content Handler Command</title>
- </properties>
-
- <body>
-
- <section name="Add Handler Command">
-
- <subsection name="Description">
-
- <p>
- Adds a new custom content handler to the Transit configuration.
- </p>
-
- <p>
- When resolving a url to an object using the getContent( Class[] )
- operation, Transit will delegate requests to a content handlers
- matching the artifact type. A content handler is a Transit plugin
- with a plugin class that extends the abstract class
- <tt>java.net.ContentHandler</tt>.
- </p>
-
- </subsection>
-
- <subsection name="Commandline">
-
-<pre><![CDATA[$ transit add handler <id>
- -uri <uri>
- [-title <title>]
-]]></pre>
-
- </subsection>
-
- <subsection name="Options">
-
- <table>
- <tr><td>uri</td><td>The plugin uri.</td></tr>
- <tr><td>title</td><td>Optional content handler title.</td></tr>
- </table>
-
- </subsection>
-
- <subsection name="Example">
-
- <p>
- The following example demonstrates the addition of a new
- custom content handler plugin to the transit configuration.
- </p>
-
-<pre><![CDATA[
-$ transit add handler demo -uri
link:plugin:dpml/demo/dpml-handler#1.2.3]]></pre>
-<source><![CDATA[
-Adding content handler: demo
-Saving to: local:xml:dpml/transit/config
-]]></source>
-
- </subsection>
-
-
- </section>
-
-
- </body>
-
-</document>
-

Modified: trunk/main/central/src/docs/transit/cli/add/index.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/add/index.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/add/index.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -32,28 +32,28 @@
<subsection name="Description">

<p>
- Support for the addition of new hosts, layouts, and content handlers.
+ Support for the addition of new hosts and layouts.
</p>

</subsection>

<subsection name="Commandline">

-<pre><![CDATA[$ transit add [host <id> | handler <id> | layout <id>]]]></pre>
+<pre><![CDATA[$ transit add [host <id> | layout <id>]]]></pre>

</subsection>

<subsection name="Example">

<p>
- The following example demonstrates the addition of a new content
+ The following example demonstrates the addition of a new layout
handler to the transit configuration.
</p>

<pre><![CDATA[
-$ transit add handler demo -uri
link:plugin:dpml/demo/dpml-handler#1.2.3]]></pre>
+$ transit add layout demo -uri link:part:acme/demo/demo-layout#1.2.3]]></pre>
<source><![CDATA[
-Adding content handler: demo
+Adding layout handler: demo
Saving to: local:xml:dpml/transit/config
]]></source>

Modified: trunk/main/central/src/docs/transit/cli/add/layout.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/add/layout.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/add/layout.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -76,7 +76,7 @@
</p>

<pre><![CDATA[
-$ transit add layout demo -uri
link:plugin:dpml/demo/dpml-example-layout#SNAPSHOT]]></pre>
+$ transit add layout demo -uri
link:part:dpml/demo/dpml-example-layout#SNAPSHOT]]></pre>
<source><![CDATA[
Adding layout: demo
Saving to: local:xml:dpml/transit/config

Modified: trunk/main/central/src/docs/transit/cli/add/navigation.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/add/navigation.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/add/navigation.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -26,7 +26,6 @@

<menu>
<item name="Host" href="host.html"/>
- <item name="Handler" href="handler.html"/>
<item name="Layout" href="layout.html"/>
</menu>

Modified: trunk/main/central/src/docs/transit/cli/index.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/index.xml 2006-04-19 05:55:14
UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/index.xml 2006-04-19 06:57:00
UTC (rev 1383)
@@ -34,7 +34,7 @@
<p>
Command-line supporting the management of one or more transit
configurations.
The <tt>transit</tt> tool provides support for the addition,
removal, and
- modification of hosts, layouts and content handlers together with
functions
+ modification of hosts and layouts handlers together with functions
supporting cache and proxy configuration maintenance.
</p>

@@ -51,10 +51,10 @@
<table>
<tr><td>load</td><td>Loads a plugin refernced by a supplied
uri.</td></tr>
<tr><td>info</td><td>Lists the current configration to
console.</td></tr>
- <tr><td>add</td><td>Add a new host, layout or content
handler.</td></tr>
- <tr><td>set</td><td>Update a feature of a host, layout, content
handler,
+ <tr><td>add</td><td>Add a new host or layout handler.</td></tr>
+ <tr><td>set</td><td>Update a feature of a host, layout,
cache or proxy configuration.</td></tr>
- <tr><td>remove </td><td>Remove a host, layout or content
handler.</td></tr>
+ <tr><td>remove </td><td>Remove a host or layout handler.</td></tr>
<tr><td>revert</td><td>Revert the configuration to factory
defaults.</td></tr>
<tr><td>help</td><td>List command help to console.</td></tr>
<tr><td>profile</td><td>Override selection of the default
configuration profile.</td></tr>
@@ -74,7 +74,7 @@
info|add|set|remove|revert|load|help
info List configuration.
add
- host handler layout
+ host layout
host <id> Add a new resource
host.
-url -username -password -priority -index -disabled -trusted
-layout -scheme -prompt

@@ -88,16 +88,12 @@
-layout <id> Host layout strategy.
-scheme <scheme> Host authentication
scheme.
-prompt <prompt> Host authentication
prompt.
- handler <type> Add a new content
handler.
- -uri -title
- -uri <uri> Codebase URI
(required).
- -title <name> Title.
layout <id> Add a new layout.
-uri -title
-uri <uri> Codebase URI
(required).
-title <name> Title.
set Set an configuration
aspect.
- proxy cache system host handler layout
+ proxy cache system host layout
proxy Select proxy settings.
-url -username -password -excludes
-url <url> Host URL.
@@ -129,18 +125,13 @@
-layout <id> Host layout strategy.
-scheme <scheme> Host authentication
scheme.
-prompt <prompt> Host authentication
prompt.
- handler <type> Content handler
selection.
- -uri -title
- -uri <uri> Codebase URI.
- -title <name> Title.
layout <id> Layout scheme
selection.
-uri -title
-uri <uri> Codebase URI.
-title <name> Title.
remove
- host handler layout proxy
+ host layout proxy
host <id> Resource host
selection.
- handler <type> Content handler
selection.
layout <id> Layout scheme
selection.
proxy Delete proxy settings.
revert Set configuration to
default.

Deleted: trunk/main/central/src/docs/transit/cli/remove/handler.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/remove/handler.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/remove/handler.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<document>
-
- <properties>
- <author email="mcconnell AT dpml.net">Stephen McConnell</author>
- <title>DPML Transit Remove Content Handler Command</title>
- </properties>
-
- <body>
-
- <section name="Remove Handler Command">
-
- <subsection name="Description">
-
- <p>
- Removes the identified content handler from the configuration.
- </p>
-
- </subsection>
-
- <subsection name="Commandline">
-
-<pre><![CDATA[$ transit remove handler <id>]]></pre>
-
- </subsection>
-
- <subsection name="Example">
-
- <p>
- The following example command removes a custom content handler
- from the transit configuration.
- </p>
-
-<pre>$ transit remove handler demo</pre>
-<source>Removing content handler: demo
-Saving to: local:xml:dpml/transit/config</source>
-
- </subsection>
-
- </section>
-
- </body>
-
-</document>
-

Modified: trunk/main/central/src/docs/transit/cli/remove/index.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/remove/index.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/remove/index.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -32,7 +32,7 @@
<subsection name="Description">

<p>
- Support for the removal of hosts, layout, content handlers, or
+ Support for the removal of hosts, layout, or
proxy settings.
</p>

@@ -40,7 +40,7 @@

<subsection name="Commandline">

-<pre><![CDATA[$ transit remove host <id> | handler <id> | layout <id> |
proxy ]]></pre>
+<pre><![CDATA[$ transit remove host <id> | layout <id> | proxy ]]></pre>

</subsection>

Modified: trunk/main/central/src/docs/transit/cli/remove/navigation.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/remove/navigation.xml
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/remove/navigation.xml
2006-04-19 06:57:00 UTC (rev 1383)
@@ -27,7 +27,6 @@
<menu>
<item name="Proxy" href="proxy.html"/>
<item name="Host" href="host.html"/>
- <item name="Handler" href="handler.html"/>
<item name="Layout" href="layout.html"/>
</menu>

Deleted: trunk/main/central/src/docs/transit/cli/set/handler.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/set/handler.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/set/handler.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<document>
-
- <properties>
- <author email="mcconnell AT dpml.net">Stephen McConnell</author>
- <title>DPML Transit Set Content Handler Command</title>
- </properties>
-
- <body>
-
- <section name="Set Handler Command">
-
- <subsection name="Description">
-
- <p>
- Update a content handler configuration.
- </p>
-
- </subsection>
-
- <subsection name="Commandline">
-
-<pre><![CDATA[$ transit set handler <id>
- [-uri <uri>]
- [-title <title>]
-]]></pre>
-
- </subsection>
-
- <subsection name="Options">
-
- <table>
- <tr><td>uri</td><td>Change the content handler plugin uri to a new
value.</td></tr>
- <tr><td>title</td><td>Updates the content handler title.</td></tr>
- </table>
-
- </subsection>
-
- <subsection name="Example">
-
- <p>
- The following example demonstrates the modification of the uri
- of a registered content handler.
- </p>
-
-<pre><![CDATA[
-$ transit set handler demo -uri
link:plugin:dpml/demo/dpml-handler#2.0]]></pre>
-<source><![CDATA[
-Updating content handler: demo
-Saving to: local:xml:dpml/transit/config
-]]></source>
-
- </subsection>
-
-
- </section>
-
-
- </body>
-
-</document>
-

Modified: trunk/main/central/src/docs/transit/cli/set/index.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/set/index.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/set/index.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -32,16 +32,15 @@
<subsection name="Description">

<p>
- Support for the modification of an identifier host, layout,
- or content handler, or modification of the transit cache,
- local system repository, or proxy settings.
+ Support for the modification of an identifier host, or layout,
+ or modification of the transit cache, local system repository, or
proxy settings.
</p>

</subsection>

<subsection name="Commandline">

-<pre>$ transit set proxy | cache | system | host | layout | handler</pre>
+<pre>$ transit set proxy | cache | system | host | layout </pre>

</subsection>

Modified: trunk/main/central/src/docs/transit/cli/set/navigation.xml
===================================================================
--- trunk/main/central/src/docs/transit/cli/set/navigation.xml 2006-04-19
05:55:14 UTC (rev 1382)
+++ trunk/main/central/src/docs/transit/cli/set/navigation.xml 2006-04-19
06:57:00 UTC (rev 1383)
@@ -29,7 +29,6 @@
<item name="System" href="system.html"/>
<item name="Proxy" href="proxy.html"/>
<item name="Host" href="host.html"/>
- <item name="Handler" href="handler.html"/>
<item name="Layout" href="layout.html"/>
</menu>

Modified: trunk/main/metro/test/etc/test/logging.properties
===================================================================
--- trunk/main/metro/test/etc/test/logging.properties 2006-04-19 05:55:14
UTC (rev 1382)
+++ trunk/main/metro/test/etc/test/logging.properties 2006-04-19 06:57:00
UTC (rev 1383)
@@ -1,3 +1,3 @@
-.level=FINE
+.level=INFO
sun.rmi.level=INFO
sun.rmi.transport.tcp.level=INFO

Modified:
trunk/main/transit/console/src/main/net/dpml/transit/console/CacheDirectiveBuilder.java
===================================================================
---
trunk/main/transit/console/src/main/net/dpml/transit/console/CacheDirectiveBuilder.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/CacheDirectiveBuilder.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -22,7 +22,6 @@

import net.dpml.transit.info.CacheDirective;
import net.dpml.transit.info.HostDirective;
-import net.dpml.transit.info.ContentDirective;
import net.dpml.transit.info.LayoutDirective;

import net.dpml.lang.UnknownKeyException;
@@ -62,26 +61,6 @@
return create( newHosts );
}

- CacheDirective removeContentDirective( String key ) throws
UnknownKeyException
- {
- ContentDirective[] handlers = m_directive.getContentDirectives();
- ArrayList list = new ArrayList();
- for( int i=0; i<handlers.length; i++ )
- {
- ContentDirective handler = handlers[i];
- if( !handler.getID().equals( key ) )
- {
- list.add( handler );
- }
- }
- ContentDirective[] newHandlers = (ContentDirective[]) list.toArray(
new ContentDirective[0] );
- if( newHandlers.length == handlers.length )
- {
- throw new UnknownKeyException( key );
- }
- return create( newHandlers );
- }
-
CacheDirective removeLayoutDirective( String key ) throws
UnknownKeyException
{
LayoutDirective[] handlers = m_directive.getLayoutDirectives();
@@ -104,27 +83,22 @@

CacheDirective create( HostDirective[] hosts )
{
- return create( null, null, null, null, null, hosts, null );
+ return create( null, null, null, null, null, hosts );
}

- CacheDirective create( ContentDirective[] handlers )
- {
- return create( null, null, null, null, null, null, handlers );
- }
-
CacheDirective create( LayoutDirective[] layouts )
{
- return create( null, null, null, null, layouts, null, null );
+ return create( null, null, null, null, layouts, null );
}

CacheDirective create( String cache, String cacheLayout, String local,
String localLayout )
{
- return create( cache, cacheLayout, local, localLayout, null, null,
null );
+ return create( cache, cacheLayout, local, localLayout, null, null );
}

CacheDirective create(
String cache, String cacheLayout, String local, String localLayout,
- LayoutDirective[] layouts, HostDirective[] hosts, ContentDirective[]
handlers )
+ LayoutDirective[] layouts, HostDirective[] hosts )
{
return new CacheDirective(
getCache( cache ),
@@ -132,8 +106,7 @@
getLocal( local ),
getLocalLayout( localLayout ),
getLayoutDirectives( layouts ),
- getHostDirectives( hosts ),
- getContentDirectives( handlers ) );
+ getHostDirectives( hosts ) );
}

String getCache( String cache )
@@ -207,17 +180,5 @@
return m_directive.getHostDirectives();
}
}
-
- ContentDirective[] getContentDirectives( ContentDirective[] handlers )
- {
- if( null != handlers )
- {
- return handlers;
- }
- else
- {
- return m_directive.getContentDirectives();
- }
- }
}

Deleted:
trunk/main/transit/console/src/main/net/dpml/transit/console/ContentDirectiveBuilder.java
===================================================================
---
trunk/main/transit/console/src/main/net/dpml/transit/console/ContentDirectiveBuilder.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/ContentDirectiveBuilder.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,89 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.console;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import net.dpml.transit.info.ContentDirective;
-import net.dpml.lang.ValueDirective;
-
-/**
- * Utility class supporting mutation of a content directive.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-class ContentDirectiveBuilder
-{
- private final ContentDirective m_directive;
-
- ContentDirectiveBuilder( ContentDirective directive )
- {
- m_directive = directive;
- }
-
- ContentDirective create(
- String title, URI codebase, ValueDirective[] parameters )
- throws URISyntaxException
- {
- return new ContentDirective(
- m_directive.getID(),
- getTitle( title ),
- getCodeBase( codebase ),
- getValueDirectives( parameters ) );
- }
-
- String getTitle( String title )
- {
- if( null != title )
- {
- return title;
- }
- else
- {
- return m_directive.getTitle();
- }
- }
-
- URI getCodeBase( URI codebase )
- {
- if( null != codebase )
- {
- return codebase;
- }
- else
- {
- return m_directive.getCodeBaseURI();
- }
- }
-
- ValueDirective[] getValueDirectives( ValueDirective[] values )
- {
- if( null != values )
- {
- return values;
- }
- else
- {
- return m_directive.getValueDirectives();
- }
- }
-}
-

Modified:
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
===================================================================
---
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -60,7 +60,6 @@
import net.dpml.transit.info.CacheDirective;
import net.dpml.transit.info.HostDirective;
import net.dpml.transit.info.LayoutDirective;
-import net.dpml.transit.info.ContentDirective;
import net.dpml.util.ExceptionHelper;

@@ -319,19 +318,6 @@
}
}

- ContentDirective[] handlers = cache.getContentDirectives();
- if( handlers.length > 0 )
- {
- buffer.append( "\n\n Content Handler Settings" );
- for( int i=0; i<handlers.length; i++ )
- {
- ContentDirective handler = handlers[i];
- buffer.append( "\n\n " + handler.getID() + " (" + ( i+1 )
+ ")" );
- buffer.append( "\n\n Codebase:\t" +
handler.getCodeBaseURI() );
- buffer.append( "\n Title:\t" + handler.getTitle() );
- }
- }
-
System.out.println( buffer.toString() );
}

@@ -380,39 +366,6 @@
CacheDirective newCache = builder.create( newHosts );
return m_builder.create( newCache );
}
- else if( line.hasOption( ADD_HANDLER_COMMAND ) )
- {
- String key = (String) line.getValue( ADD_HANDLER_COMMAND, null );
- CacheDirective cache = m_directive.getCacheDirective();
- ContentDirective[] handlers = cache.getContentDirectives();
- for( int i=0; i<handlers.length; i++ )
- {
- ContentDirective c = handlers[i];
- if( c.getID().equals( key ) )
- {
- System.out.println( "ERROR: Content handler id '" + key
+ "' already assigned." );
- return null;
- }
- }
-
- System.out.println( "Adding content handler: " + key );
- URI uri = (URI) line.getValue( REQUIRED_CODEBASE_OPTION, null );
- String title = (String) line.getValue( TITLE_OPTION, null );
-
- ContentDirective handler =
- new ContentDirective(
- key, title, uri, new ValueDirective[0] );
-
- ContentDirective[] newHandlers = new ContentDirective[
handlers.length + 1 ];
- for( int i=0; i<handlers.length; i++ )
- {
- newHandlers[i] = handlers[i];
- }
- newHandlers[ handlers.length ] = handler;
- CacheDirectiveBuilder builder = new CacheDirectiveBuilder( cache
);
- CacheDirective newCache = builder.create( newHandlers );
- return m_builder.create( newCache );
- }
else if( line.hasOption( ADD_LAYOUT_COMMAND ) )
{
String key = (String) line.getValue( ADD_LAYOUT_COMMAND, null );
@@ -470,10 +423,6 @@
{
return setHost( line );
}
- else if( line.hasOption( SET_HANDLER_COMMAND ) )
- {
- return setHandler( line );
- }
else if( line.hasOption( SET_LAYOUT_COMMAND ) )
{
return setLayout( line );
@@ -591,54 +540,6 @@
return m_builder.create( newCache );
}

- private TransitDirective setHandler( CommandLine line ) throws Exception
- {
- String key = (String) line.getValue( SET_HANDLER_COMMAND, null );
- CacheDirective cache = m_directive.getCacheDirective();
- ContentDirective[] handlers = cache.getContentDirectives();
- ContentDirective handler = null;
- for( int i=0; i<handlers.length; i++ )
- {
- ContentDirective c = handlers[i];
- if( c.getID().equals( key ) )
- {
- handler = c;
- }
- }
-
- if( null == handler )
- {
- System.out.println( "ERROR: Content handler id '" + key + "' not
recognized." );
- return null;
- }
-
- System.out.println( "Updating content handler: " + key );
- URI uri = (URI) line.getValue( CODEBASE_OPTION, null );
- String title = (String) line.getValue( TITLE_OPTION, null );
-
- ContentDirectiveBuilder builder = new ContentDirectiveBuilder(
handler );
- ContentDirective newDirective =
- builder.create( title, uri, null );
-
-
- ContentDirective[] newDirectives = new ContentDirective[
handlers.length ];
- for( int i=0; i<handlers.length; i++ )
- {
- ContentDirective d = handlers[i];
- if( d.getID().equals( key ) )
- {
- newDirectives[i] = newDirective;
- }
- else
- {
- newDirectives[i] = d;
- }
- }
- CacheDirectiveBuilder cacheBuilder = new CacheDirectiveBuilder(
cache );
- CacheDirective newCache = cacheBuilder.create( newDirectives );
- return m_builder.create( newCache );
- }
-
private TransitDirective setLayout( CommandLine line ) throws Exception
{
String key = (String) line.getValue( SET_LAYOUT_COMMAND, null );
@@ -705,23 +606,6 @@
return null;
}
}
- else if( line.hasOption( SELECT_HANDLER_COMMAND ) )
- {
- String key = (String) line.getValue( SELECT_HANDLER_COMMAND,
null );
- System.out.println( "Removing content handler: " + key );
- CacheDirective cache = m_directive.getCacheDirective();
- CacheDirectiveBuilder builder = new CacheDirectiveBuilder( cache
);
- try
- {
- CacheDirective newCache = builder.removeContentDirective(
key );
- return m_builder.create( newCache );
- }
- catch( UnknownKeyException e )
- {
- System.out.println( "Unknown content handler '" + key + "'."
);
- return null;
- }
- }
else if( line.hasOption( SELECT_LAYOUT_COMMAND ) )
{
String key = (String) line.getValue( SELECT_LAYOUT_COMMAND, null
);
@@ -1381,19 +1265,6 @@
.create() )
.create();

- private static final Option ADD_HANDLER_COMMAND =
- COMMAND_BUILDER
- .withName( "handler" )
- .withDescription( "Add a new content handler." )
- .withChildren( ADD_HANDLER_OPTIONS_GROUP )
- .withArgument(
- ARGUMENT_BUILDER
- .withName( "type" )
- .withMinimum( 1 )
- .withMaximum( 1 )
- .create() )
- .create();
-
private static final Option ADD_LAYOUT_COMMAND =
COMMAND_BUILDER
.withName( "layout" )
@@ -1407,31 +1278,6 @@
.create() )
.create();

- private static final Option SET_HANDLER_COMMAND =
- COMMAND_BUILDER
- .withName( "handler" )
- .withDescription( "Content handler selection." )
- .withChildren( SET_HANDLER_OPTIONS_GROUP )
- .withArgument(
- ARGUMENT_BUILDER
- .withName( "type" )
- .withMinimum( 1 )
- .withMaximum( 1 )
- .create() )
- .create();
-
- private static final Option SELECT_HANDLER_COMMAND =
- COMMAND_BUILDER
- .withName( "handler" )
- .withDescription( "Content handler selection." )
- .withArgument(
- ARGUMENT_BUILDER
- .withName( "type" )
- .withMinimum( 1 )
- .withMaximum( 1 )
- .create() )
- .create();
-
private static final Option REMOVE_PROXY_COMMAND =
COMMAND_BUILDER
.withName( "proxy" )
@@ -1443,7 +1289,6 @@
.withMinimum( 1 )
.withMinimum( 1 )
.withOption( ADD_HOST_COMMAND )
- .withOption( ADD_HANDLER_COMMAND )
.withOption( ADD_LAYOUT_COMMAND )
.create();

@@ -1455,7 +1300,6 @@
.withOption( SET_CACHE_COMMAND )
.withOption( SET_SYSTEM_COMMAND )
.withOption( SET_HOST_COMMAND )
- .withOption( SET_HANDLER_COMMAND )
.withOption( SET_LAYOUT_COMMAND )
.create();

@@ -1464,7 +1308,6 @@
.withMinimum( 1 )
.withMinimum( 1 )
.withOption( SELECT_HOST_COMMAND )
- .withOption( SELECT_HANDLER_COMMAND )
.withOption( SELECT_LAYOUT_COMMAND )
.withOption( REMOVE_PROXY_COMMAND )
.create();

Modified: trunk/main/transit/core/etc/main/net/dpml/transit/transit_1_0.dtd
===================================================================
--- trunk/main/transit/core/etc/main/net/dpml/transit/transit_1_0.dtd
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/transit/core/etc/main/net/dpml/transit/transit_1_0.dtd
2006-04-19 06:57:00 UTC (rev 1383)
@@ -15,7 +15,7 @@
limitations under the License.
-->

-<!ELEMENT transit ( proxy?, local, hosts, layouts?, handlers? ) >
+<!ELEMENT transit ( proxy?, local, hosts, layouts? ) >
<!ATTLIST transit cache CDATA #REQUIRED >
<!ATTLIST transit layout CDATA #REQUIRED >

@@ -33,7 +33,6 @@

<!ELEMENT layouts ( layout* ) >
<!ELEMENT hosts ( host* ) >
-<!ELEMENT handlers ( handler* ) >

<!ELEMENT layout ( codebase ) >
<!ATTLIST layout id CDATA #REQUIRED >
@@ -53,10 +52,6 @@
<!ATTLIST host scheme CDATA #IMPLIED >
<!ATTLIST host prompt CDATA #IMPLIED >

-<!ELEMENT handler ( codebase ) >
-<!ATTLIST handler id CDATA #REQUIRED >
-<!ATTLIST handler title CDATA #IMPLIED >
-
<!ELEMENT value ( value* ) >
<!ATTLIST value method CDATA #IMPLIED >
<!ATTLIST value target CDATA #IMPLIED >

Modified: trunk/main/transit/core/src/main/net/dpml/transit/CacheHandler.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/CacheHandler.java
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/transit/core/src/main/net/dpml/transit/CacheHandler.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -120,12 +120,6 @@
LayoutRegistry getLayoutRegistry();

/**
- * Return the content registry.
- * @return the layout registry.
- */
- ContentRegistry getContentRegistry();
-
- /**
* Return the current cache directory.
* @return the cache directory.
*/

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/ContentRegistry.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/ContentRegistry.java
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/transit/core/src/main/net/dpml/transit/ContentRegistry.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,43 +0,0 @@
-/*
- * Copyright 2005 Stephen McConnell
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit;
-
-import java.io.IOException;
-import java.net.ContentHandler;
-
-/**
- * A interface supporting access to pluggable content handlers.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ContentRegistry
-{
- /**
- * Return a content handler capable for supporting the supplied type. If
- * the a handler is available the handler is returned otherwise the
returned
- * value is null.
- *
- * @param type the artifact type
- * @return the content handler or null if not available
- * @exception IOException if an IO error occurs
- */
- ContentHandler getContentHandler( final String type ) throws IOException;
-}
-

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheHandler.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheHandler.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheHandler.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -50,7 +50,6 @@
import net.dpml.transit.model.CacheEvent;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.monitor.CacheMonitorRouter;

/**
@@ -87,8 +86,6 @@

private LayoutRegistry m_registry;

- private ContentRegistry m_content;
-
//
------------------------------------------------------------------------
// constructor
//
------------------------------------------------------------------------
@@ -161,13 +158,6 @@
{
getLogger().debug( "bootstrap initialization complete" );
}
-
- //
- // setup the content registry
- //
-
- ContentRegistryModel contentRegistryModel =
model.getContentRegistryModel();
- m_content = new DefaultContentRegistry( contentRegistryModel, logger
);
}

//
------------------------------------------------------------------------
@@ -271,7 +261,6 @@
m_resourceHosts.clear();
}
terminate( m_registry );
- terminate( m_content );
}
catch( RemoteException e )
{
@@ -380,15 +369,6 @@
//
------------------------------------------------------------------------

/**
- * Return the content registry.
- * @return the contenthandler registry
- */
- public ContentRegistry getContentRegistry()
- {
- return m_content;
- }
-
- /**
* Return the current cache directory.
* @return the cache directory.
*/

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -36,11 +36,9 @@
import net.dpml.transit.info.LayoutDirective;
import net.dpml.transit.info.CacheDirective;
import net.dpml.transit.info.HostDirective;
-import net.dpml.transit.info.ContentDirective;
import net.dpml.transit.model.CacheModel;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.model.HostModel;
import net.dpml.transit.model.CacheListener;
import net.dpml.transit.model.CacheDirectoryChangeEvent;
@@ -50,7 +48,6 @@
import net.dpml.lang.DuplicateKeyException;
import net.dpml.lang.UnknownKeyException;

-
/**
* Default implementation of the cache model that maintains information
* about the current cache directory and the associated hosts.
@@ -74,8 +71,6 @@

private final LayoutRegistryModel m_registry;

- private final ContentRegistryModel m_content;
-
private HostModel[] m_sortedHosts;

//
------------------------------------------------------------------------
@@ -114,19 +109,6 @@
throw new ModelRuntimeException( error, e );
}

- try
- {
- Logger log = logger.getChildLogger( "content" );
- ContentDirective[] content = directive.getContentDirectives();
- m_content = new DefaultContentRegistryModel( log, content );
- }
- catch( Exception e )
- {
- final String error =
- "Unexpected internal error while constructing content handler
registry model.";
- throw new ModelRuntimeException( error, e );
- }
-
// set the cache directory

m_path = directive.getCache();
@@ -164,18 +146,6 @@
//
------------------------------------------------------------------------

/**
- * Return the model maintaining configuration information about
- * the content registry.
- *
- * @return the content model
- * @exception RemoteException if a remote exception occurs
- */
- public ContentRegistryModel getContentRegistryModel()
- {
- return m_content;
- }
-
- /**
* Return the cache layout strategy model used by the cache
implementation.
* @return the layout model
* @exception RemoteException if a remote exception occurs
@@ -295,7 +265,6 @@
dispose( host );
}
dispose( m_registry );
- dispose( m_content );
super.dispose();
}

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentModel.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentModel.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,161 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit;
-
-import java.rmi.RemoteException;
-import java.util.EventObject;
-import java.util.EventListener;
-
-import net.dpml.transit.info.ContentDirective;
-import net.dpml.transit.model.ContentModel;
-import net.dpml.transit.model.ContentListener;
-import net.dpml.transit.model.ContentEvent;
-
-import net.dpml.util.Logger;
-
-/**
- * Default implementation of a content model that maintains an active
- * configuration of a pluggable content handler.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-class DefaultContentModel extends DefaultCodeBaseModel implements
ContentModel, Disposable
-{
- //----------------------------------------------------------------------
- // state
- //----------------------------------------------------------------------
-
- private final String m_id;
- private final String m_title;
-
- //----------------------------------------------------------------------
- // constructor
- //----------------------------------------------------------------------
-
- /**
- * Construction of a new content model using a supplied storage unit.
- * @param logger the assigned logging channel
- * @param directive the content directive
- * @exception RemoteException if a remote exception occurs
- */
- public DefaultContentModel( Logger logger, ContentDirective directive )
throws RemoteException
- {
- super( logger, directive );
-
- m_id = directive.getID();
- m_title = directive.getTitle();
- }
-
- //----------------------------------------------------------------------
- // ContentModel
- //----------------------------------------------------------------------
-
- /**
- * Return the immutable resolver identifier.
- * @return the resolver identifier
- */
- public String getID()
- {
- return m_id;
- }
-
- /**
- * Returns the human readable name of the content model.
- * @return the content type human readable name
- */
- public String getTitle()
- {
- return m_title;
- }
-
- /**
- * Add a content listener to the director.
- * @param listener the listener to add
- */
- public void addContentListener( ContentListener listener )
- {
- super.addListener( listener );
- }
-
- /**
- * Remove a content listener from the director.
- * @param listener the listener to remove
- */
- public void removeContentListener( ContentListener listener )
- {
- super.removeListener( listener );
- }
-
- //----------------------------------------------------------------------
- // Disposable
- //----------------------------------------------------------------------
-
- /**
- * Dispose of the content model.
- */
- public void dispose()
- {
- super.dispose();
- }
-
- //
------------------------------------------------------------------------
- // internal
- //
------------------------------------------------------------------------
-
- /**
- * Internal event handler.
- * @param event the event to handle
- */
- protected void processEvent( EventObject event )
- {
- if( event instanceof ContentEvent )
- {
- processContentEvent( (ContentEvent) event );
- }
- else
- {
- super.processEvent( event );
- }
- }
-
- private void processContentEvent( ContentEvent event )
- {
- EventListener[] listeners = super.listeners();
- for( int i=0; i < listeners.length; i++ )
- {
- EventListener eventListener = listeners[i];
- if( eventListener instanceof ContentListener )
- {
- ContentListener listener = (ContentListener) eventListener;
- try
- {
- listener.titleChanged( event );
- }
- catch( Throwable e )
- {
- final String error =
- "ContentListener title change notification error.";
- getLogger().error( error, e );
- }
- }
- }
- }
-}
-

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,282 +0,0 @@
-/*
- * Copyright 2005 Stephen McConnell
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.ContentHandler;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import net.dpml.transit.model.ContentRegistryModel;
-import net.dpml.transit.model.ContentRegistryListener;
-import net.dpml.transit.model.ContentRegistryEvent;
-import net.dpml.transit.model.ContentModel;
-
-import net.dpml.lang.Value;
-import net.dpml.lang.Construct;
-import net.dpml.lang.UnknownKeyException;
-import net.dpml.util.Logger;
-
-import net.dpml.lang.Part;
-import net.dpml.lang.Plugin;
-
-/**
- * A registry of descriptions of plugable content handlers.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-class DefaultContentRegistry extends UnicastRemoteObject
- implements ContentRegistry, ContentRegistryListener, Disposable
-{
- //
------------------------------------------------------------------------
- // state
- //
------------------------------------------------------------------------
-
- private final Logger m_logger;
-
- private final Map m_plugins = new WeakHashMap();
-
- private final Map m_links = new WeakHashMap();
-
- private final Map m_handlers = new Hashtable();
-
- private final ContentRegistryModel m_model;
-
- //
------------------------------------------------------------------------
- // constructor
- //
------------------------------------------------------------------------
-
- /**
- * Responsible for the establishment of a map containing keys that
correspond to
- * artifact types, and values that correspond to the description of a
- * content type handler plugins.
- */
- public DefaultContentRegistry( ContentRegistryModel model, Logger logger
) throws RemoteException
- {
- super();
-
- m_model = model;
- m_logger = logger;
- model.addRegistryListener( this );
- }
-
- //
------------------------------------------------------------------------
- // Disposable
- //
------------------------------------------------------------------------
-
- /**
- * Dispose of the manager. During disposal a manager is required to
- * release all references such as listeners and internal resources
- * in preparation for garbage collection.
- */
- public void dispose()
- {
- try
- {
- m_model.removeRegistryListener( this );
- }
- catch( RemoteException e )
- {
- final String error =
- "Unexpected remote exception while disposing of content
registry.";
- m_logger.error( error, e );
- }
- }
-
- //
------------------------------------------------------------------------
- // ContentRegistry
- //
------------------------------------------------------------------------
-
- public ContentHandler getContentHandler( final String type ) throws
IOException
- {
- try
- {
- ContentModel model = m_model.getContentModel( type );
- if( null != model.getCodeBaseURI() )
- {
- return getContentHandler( model );
- }
- else
- {
- return null;
- }
- }
- catch( UnknownKeyException e )
- {
- return null;
- }
- }
-
- //
------------------------------------------------------------------------
- // RegistryListener
- //
------------------------------------------------------------------------
-
- /**
- * Notify all listeners of the addition of a content model.
- * @param event the registry event
- */
- public void contentAdded( ContentRegistryEvent event ) throws
RemoteException
- {
- synchronized( m_handlers )
- {
- ContentModel model = event.getContentModel();
- if( null != model.getCodeBaseURI() )
- {
- try
- {
- getContentHandler( model ); // setup cached reference
- }
- catch( Exception e )
- {
- final String error =
- "Internal error while attempting to add a content
handler."
- + "\nContent Type: " + model.getID()
- + "\nPlugin URI: " + model.getCodeBaseURI();
- m_logger.error( error, e );
- }
- }
- }
- }
-
- /**
- * Notify all listeners of the removal of a content model.
- * @param event the registry event
- */
- public void contentRemoved( ContentRegistryEvent event ) throws
RemoteException
- {
- synchronized( m_handlers )
- {
- ContentModel model = event.getContentModel();
- try
- {
- m_handlers.remove( model );
- }
- catch( Exception e )
- {
- final String error =
- "Internal error while attempting to remove a content
handler."
- + "\nContent Type: " + model.getID()
- + "\nPlugin URI: " + model.getCodeBaseURI();
- m_logger.error( error, e );
- }
- }
- }
-
- //
------------------------------------------------------------------------
- // impl
- //
------------------------------------------------------------------------
-
- protected ContentHandler getContentHandler( ContentModel model ) throws
IOException
- {
- synchronized( m_handlers )
- {
- ContentHandler handler = (ContentHandler) m_handlers.get( model
);
- if( null == handler )
- {
- Class clazz = loadContentHandlerClass( model );
- String type = model.getID();
- Logger logger = getLogger().getChildLogger( type );
- Value[] params = model.getParameters();
- Map map = new Hashtable();
- map.put( "dpml.transit.logger", logger );
- map.put( "dpml.transit.content.model", model );
- try
- {
- Object[] args = Construct.getArgs( map, params, new
Object[]{logger, model} );
- handler = (ContentHandler) Plugin.instantiate( clazz,
args );
- }
- catch( Throwable e )
- {
- final String error =
- "Unable to load content handler due to an
instantiation failure."
- + "\nContent Type: " + model.getID();
- throw new TransitException( error, e );
- }
- m_handlers.put( model, handler );
- }
- return handler;
- }
- }
-
- protected Class loadContentHandlerClass( ContentModel model ) throws
IOException
- {
- URI uri = model.getCodeBaseURI();
-
- Class clazz = (Class) m_plugins.get( uri );
- if( null != clazz )
- {
- return clazz;
- }
- else
- {
- try
- {
- m_logger.debug( "loading content handler plugin: " + uri );
- Part part = Part.load( uri );
- if( part instanceof Plugin )
- {
- Plugin plugin = (Plugin) part;
- clazz = plugin.getPluginClass();
- }
- else
- {
- final String error =
- "Impementation assumes plugin strategy. Cannot load
non-plugin part."
- + "\nURI: " + uri;
- throw new IOException( error );
- }
- }
- catch( Exception e )
- {
- final String error =
- "Unable to load a content handler plugin due to an
unexpected exception.";
- throw new TransitException( error, e );
- }
-
- if( ContentHandler.class.isAssignableFrom( clazz ) )
- {
- m_plugins.put( uri, clazz );
- return clazz;
- }
- else
- {
- final String error =
- "Plugin is not assignable to a java.net.ContentHandler."
- + "\nPlugin URI: " + uri
- + "\nPlugin Class: " + clazz.getName();
- throw new TransitException( error );
- }
- }
- }
-
- /**
- * Return the assigned logging channel.
- * @return the logging channel
- */
- protected Logger getLogger()
- {
- return m_logger;
- }
-}
-

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,308 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.NoSuchObjectException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.Collections;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.EventObject;
-import java.util.EventListener;
-
-import net.dpml.transit.info.ContentDirective;
-import net.dpml.transit.model.ContentModel;
-import net.dpml.transit.model.ContentRegistryModel;
-import net.dpml.transit.model.ContentRegistryListener;
-import net.dpml.transit.model.ContentRegistryEvent;
-
-import net.dpml.lang.UnknownKeyException;
-import net.dpml.lang.DuplicateKeyException;
-import net.dpml.util.Logger;
-
-/**
- * Default implementation of a content model registry manager that maitains
- * information about the set of registred content models.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-class DefaultContentRegistryModel extends DefaultModel
- implements ContentRegistryModel, Disposable
-{
- //
------------------------------------------------------------------------
- // state
- //
------------------------------------------------------------------------
-
- private final List m_list = Collections.synchronizedList( new
LinkedList() );
-
- //
------------------------------------------------------------------------
- // constructor
- //
------------------------------------------------------------------------
-
- /**
- * Creation of a new content registry model.
- * @param logger the supplied logging channel
- * @param handlers the content directives
- * @exception DuplicateKeyException if the supplied home contains
- * duplicate content model identities
- * @exception RemoteException if a remote exception occurs
- */
- public DefaultContentRegistryModel( Logger logger, ContentDirective[]
handlers )
- throws DuplicateKeyException, RemoteException
- {
- super( logger );
-
- for( int i=0; i < handlers.length; i++ )
- {
- ContentDirective directive = handlers[i];
- String id = directive.getID();
- Logger log = logger.getChildLogger( id );
- ContentModel model = new DefaultContentModel( log, directive );
- addContentModel( model, false );
- }
- }
-
- //
------------------------------------------------------------------------
- // Disposable
- //
------------------------------------------------------------------------
-
- /**
- * Disposal of the model.
- * @exception RemoteException if a remote exception occurs
- */
- public synchronized void dispose()
- {
- ContentModel[] models = getContentModels();
- for( int i=0; i<models.length; i++ )
- {
- ContentModel model = models[i];
- dispose( model );
- }
- super.dispose();
- }
-
- private void dispose( Object object )
- {
- if( object instanceof Disposable )
- {
- Disposable disposable = (Disposable) object;
- disposable.dispose();
- }
- if( object instanceof Remote )
- {
- try
- {
- Remote remote = (Remote) object;
- UnicastRemoteObject.unexportObject( remote, true );
- }
- catch( NoSuchObjectException e )
- {
- // ignore
- }
- catch( RemoteException re )
- {
- getLogger().warn( "Unexpected error during remote reference
removal.", re );
- }
- }
- }
-
- //
------------------------------------------------------------------------
- // ContentRegistryModel
- //
------------------------------------------------------------------------
-
- /**
- * Return an array of content models currently assigned to the registry.
- * @return the content model array
- */
- public ContentModel[] getContentModels()
- {
- synchronized( getLock() )
- {
- return (ContentModel[]) m_list.toArray( new ContentModel[0] );
- }
- }
-
- /**
- * Return a content model matching the supplied type.
- *
- * @param type the content model type
- * @return the content model
- * @exception UnknownKeyException if the content model type is unknown
- */
- public ContentModel getContentModel( String type ) throws
UnknownKeyException
- {
- synchronized( getLock() )
- {
- ContentModel[] managers = getContentModels();
- for( int i=0; i < managers.length; i++ )
- {
- ContentModel manager = managers[i];
- try
- {
- if( type.equals( manager.getID() ) )
- {
- return manager;
- }
- }
- catch( RemoteException e )
- {
- throw new ModelRuntimeException( e.getMessage(), e );
- }
- }
- throw new UnknownKeyException( type );
- }
- }
-
- /**
- * Add a regsitry change listener.
- * @param listener the registry change listener to add
- */
- public void addRegistryListener( ContentRegistryListener listener )
- {
- super.addListener( listener );
- }
-
- /**
- * Remove a registry change listener.
- * @param listener the registry change listener to remove
- */
- public void removeRegistryListener( ContentRegistryListener listener )
- {
- super.removeListener( listener );
- }
-
- //
------------------------------------------------------------------------
- // internal
- //
------------------------------------------------------------------------
-
- private void addContentModel( ContentModel manager, boolean notify )
- throws DuplicateKeyException
- {
- synchronized( getLock() )
- {
- try
- {
- String id = manager.getID();
- ContentModel m = getContentModel( id );
- throw new DuplicateKeyException( id );
- }
- catch( UnknownKeyException e )
- {
- m_list.add( manager );
- if( notify )
- {
- ContentAddedEvent event = new ContentAddedEvent( this,
manager );
- enqueueEvent( event );
- }
- }
- catch( RemoteException e )
- {
- throw new ModelRuntimeException( e.getMessage(), e );
- }
- }
- }
-
- /**
- * Internal event handler.
- * @param event the event to handle
- */
- protected void processEvent( EventObject event )
- {
- if( event instanceof ContentRegistryEvent )
- {
- processContentRegistryEvent( (ContentRegistryEvent) event );
- }
- }
-
- private void processContentRegistryEvent( ContentRegistryEvent event )
- {
- EventListener[] listeners = super.listeners();
- for( int i=0; i < listeners.length; i++ )
- {
- EventListener listener = listeners[i];
- if( listener instanceof ContentRegistryListener )
- {
- ContentRegistryListener rl = (ContentRegistryListener)
listener;
- if( event instanceof ContentAddedEvent )
- {
- try
- {
- rl.contentAdded( event );
- }
- catch( Throwable e )
- {
- final String error =
- "ContentRegistryListener content addition
notification error.";
- getLogger().error( error, e );
- }
- }
- else if( event instanceof ContentRemovedEvent )
- {
- try
- {
- rl.contentRemoved( event );
- }
- catch( Throwable e )
- {
- final String error =
- "ContentRegistryListener content removed
notification error.";
- getLogger().error( error, e );
- }
- }
- }
- }
- }
-
- /**
- * Content model addition event.
- */
- static class ContentAddedEvent extends ContentRegistryEvent
- {
- /**
- * Creation of a new content model addition event.
- * @param source the source registry
- * @param handler the content model
- */
- public ContentAddedEvent( ContentRegistryModel source, ContentModel
handler )
- {
- super( source, handler );
- }
- }
-
- /**
- * Content model removal event.
- */
- static class ContentRemovedEvent extends ContentRegistryEvent
- {
- /**
- * Creation of a new content model removal event.
- * @param source the source registry
- * @param handler the content model
- */
- public ContentRemovedEvent( ContentRegistryModel source,
ContentModel handler )
- {
- super( source, handler );
- }
- }
-}
-
-

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultTransitModel.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -167,8 +167,8 @@
/**
* Creation of a new TransitModel using a supplied configuration
* and logging channel. The implementation will construct a proxy
- * model, layout registry model, cache model, content registry model,
- * and repository codebase model using the supplied configuration.
+ * model, layout registry model, cache model, and repository codebase
+ * model using the supplied configuration.
*
* @param logger the assigned loging channel
* @param directive the transit configuration

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/TransitBuilder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/TransitBuilder.java
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/transit/core/src/main/net/dpml/transit/TransitBuilder.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -201,7 +201,7 @@
CacheDirective cache =
new CacheDirective(
cachePath, cacheLayout, localPath, localLayout,
- CacheDirective.EMPTY_LAYOUTS, hosts,
CacheDirective.EMPTY_CONTENT );
+ CacheDirective.EMPTY_LAYOUTS, hosts );
return new TransitDirective( proxy, cache );
}

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,6 +1,6 @@
/*
* Copyright 2004 Niclas Hedhman
- * Copyright 2004-2005 Stephen J. McConnell
+ * Copyright 2004-2006 Stephen J. McConnell
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.File;
-import java.net.ContentHandler;
import java.net.UnknownServiceException;
import java.net.URI;
import java.net.URL;
@@ -33,12 +32,12 @@
import net.dpml.transit.Artifact;
import net.dpml.transit.Transit;
import net.dpml.transit.SecuredTransitContext;
-import net.dpml.transit.ContentRegistry;
import net.dpml.transit.CacheHandler;
-import net.dpml.util.MimeTypeHandler;

import net.dpml.lang.Part;

+import net.dpml.util.MimeTypeHandler;
+
/**
* The connection handler for URLs based on the "artifact" protocol family.
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
@@ -206,17 +205,6 @@
}

//
- // check to see if we have a content handler plugin declared for the
artifact type
- //
-
- ContentRegistry registry =
m_context.getCacheHandler().getContentRegistry();
- ContentHandler handler = registry.getContentHandler( type );
- if( null != handler )
- {
- return handler.getContent( this, classes );
- }
-
- //
// otherwise fallback on the default jvm content handling
//

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/info/CacheDirective.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/info/CacheDirective.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/info/CacheDirective.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -59,19 +59,13 @@
* Empty resource host array.
*/
public static final HostDirective[] EMPTY_HOSTS = new HostDirective[0];
-
- /**
- * Empty content handler array.
- */
- public static final ContentDirective[] EMPTY_CONTENT = new
ContentDirective[0];
-
+
private final String m_cache;
private final String m_cacheLayout;
private final String m_local;
private final String m_localLayout;
private final LayoutDirective[] m_layouts;
private final HostDirective[] m_hosts;
- private final ContentDirective[] m_handlers;

/**
* Create a new CacheDirective.
@@ -79,7 +73,7 @@
public CacheDirective()
{
this(
- CACHE_PATH, CACHE_LAYOUT, LOCAL_PATH, LOCAL_LAYOUT, EMPTY_LAYOUTS,
EMPTY_HOSTS, EMPTY_CONTENT );
+ CACHE_PATH, CACHE_LAYOUT, LOCAL_PATH, LOCAL_LAYOUT, EMPTY_LAYOUTS,
EMPTY_HOSTS );
}

/**
@@ -90,12 +84,11 @@
* @param localLayout the local repository layout strategy
* @param layouts an array of extended layout descriptors
* @param hosts an array of supplimentary host descriptors
- * @param handlers an array of custom content handler descriptors
* @exception NullPointerException if the cache, local, or layout
argument is null
*/
public CacheDirective(
String cache, String cacheLayout, String local, String localLayout,
- LayoutDirective[] layouts, HostDirective[] hosts, ContentDirective[]
handlers )
+ LayoutDirective[] layouts, HostDirective[] hosts )
throws NullPointerException
{
if( null == cache )
@@ -137,15 +130,6 @@
{
m_hosts = hosts;
}
-
- if( null == handlers )
- {
- m_handlers = new ContentDirective[0];
- }
- else
- {
- m_handlers = handlers;
- }
}

/**
@@ -209,17 +193,6 @@
}

/**
- * Return the content handler plugin configurations.
- *
- * @return the content handler directives
- */
- public ContentDirective[] getContentDirectives()
- {
- return m_handlers;
- }
-
-
- /**
* Test if the supplied object is equal to this object.
* @param other the object to evaluate
* @return true if this object is equal to the supplied object
@@ -249,13 +222,9 @@
{
return false;
}
- else if( !Arrays.equals( m_hosts, directive.m_hosts ) )
- {
- return false;
- }
else
{
- return Arrays.equals( m_handlers, directive.m_handlers );
+ return Arrays.equals( m_hosts, directive.m_hosts );
}
}
else
@@ -277,7 +246,6 @@
hash ^= hashValue( m_localLayout );
hash ^= hashArray( m_layouts );
hash ^= hashArray( m_hosts );
- hash ^= hashArray( m_handlers );
return hash;
}
}

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/info/ContentDirective.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/info/ContentDirective.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/info/ContentDirective.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,121 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.info;
-
-import java.net.URI;
-
-import net.dpml.lang.ValueDirective;
-
-/**
- * The CodeBaseDirective is immutable datastructure used to
- * describe a codebase.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class ContentDirective extends CodeBaseDirective
-{
- private final String m_id;
- private final String m_title;
-
- /**
- * Creation of a new codebase descriptor.
- * @param id the datatype identifier
- * @param title the handler title
- * @param codebase the codebase uri
- * @param parameters an array of plugin parameter descriptors
- * @exception NullPointerException if the id is null
- */
- public ContentDirective(
- String id, String title, URI codebase, ValueDirective[] parameters )
- throws NullPointerException
- {
- super( codebase, parameters );
- if( null == id )
- {
- throw new NullPointerException( "id" );
- }
- m_id = id;
- if( null == title )
- {
- m_title = id;
- }
- else
- {
- m_title = title;
- }
- }
-
- /**
- * Return the unique content handler datatype identifier.
- *
- * @return the handler id
- */
- public String getID()
- {
- return m_id;
- }
-
- /**
- * Return the content handler title.
- *
- * @return the title
- */
- public String getTitle()
- {
- return m_title;
- }
-
- /**
- * Test if the supplied object is equal to this object.
- * @param other the object to evaluate
- * @return true if this object is equal to the supplied object
- */
- public boolean equals( Object other )
- {
- if( super.equals( other ) && ( other instanceof ContentDirective ) )
- {
- ContentDirective directive = (ContentDirective) other;
- if( !equals( m_id, directive.m_id ) )
- {
- return false;
- }
- else
- {
- return equals( m_title, directive.m_title );
- }
- }
- else
- {
- return false;
- }
- }
-
- /**
- * Compute the instance hashcode value.
- * @return the hashcode
- */
- public int hashCode()
- {
- int hash = super.hashCode();
- hash ^= hashValue( m_id );
- hash ^= hashValue( m_title );
- return hash;
- }
-}

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/info/TransitDirective.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/info/TransitDirective.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/info/TransitDirective.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -139,8 +139,7 @@
CacheDirective.LOCAL_PATH,
CacheDirective.LOCAL_LAYOUT,
CacheDirective.EMPTY_LAYOUTS,
- hosts,
- CacheDirective.EMPTY_CONTENT );
+ hosts );
return new TransitDirective( null, cache );
}

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/model/CacheModel.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/model/CacheModel.java
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/transit/core/src/main/net/dpml/transit/model/CacheModel.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -104,13 +104,4 @@
*/
LayoutRegistryModel getLayoutRegistryModel() throws RemoteException;

- /**
- * Return the model maintaining configuration information about
- * the content registry.
- *
- * @return the content model
- * @exception RemoteException if a remote exception occurs
- */
- ContentRegistryModel getContentRegistryModel() throws RemoteException;
-
}

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentEvent.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/model/ContentEvent.java
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/transit/core/src/main/net/dpml/transit/model/ContentEvent.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,58 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.model;
-
-import java.util.EventObject;
-
-/**
- * A event pertaining to content model changes.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class ContentEvent extends EventObject
-{
- /**
- * Serial version identifier.
- */
- static final long serialVersionUID = 1L;
-
- private final ContentModel m_content;
-
- /**
- * Creation of a new ContentEvent signalling modification of
- * a content model.
- *
- * @param content the content model that was added or removed
- */
- public ContentEvent( ContentModel content )
- {
- super( content );
- m_content = content;
- }
-
- /**
- * Return the content model that was modified.
- * @return the content model
- */
- public ContentModel getContentModel()
- {
- return m_content;
- }
-}

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentListener.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentListener.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentListener.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,41 +0,0 @@
-/*
- * Copyright 2005 Stephen McConnell
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.model;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.util.EventListener;
-
-/**
- * A ContentListener maintains information about the configuration of
- * content type.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ContentListener extends EventListener, Remote
-{
- /**
- * Notify a content model listener of a change to content model title.
- * @param event the content change event
- * @exception RemoteException if a remote exception occurs
- */
- void titleChanged( ContentEvent event ) throws RemoteException;
-
-}

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentModel.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/model/ContentModel.java
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/transit/core/src/main/net/dpml/transit/model/ContentModel.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,61 +0,0 @@
-/*
- * Copyright 2005 Stephen McConnell
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.model;
-
-import java.rmi.RemoteException;
-
-/**
- * A ContentModel maintains information about the configuration
- * of a content handler. Instances of ContentModel are used as
- * constructor arguments to content handler plugins.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ContentModel extends CodeBaseModel
-{
- /**
- * Return the immutable model identifier.
- * @return the resolver identifier
- * @exception RemoteException if a remote exception occurs
- */
- String getID() throws RemoteException;
-
- /**
- * Returns the human readable name of the content type handler.
- * @return the content type human readable name
- * @exception RemoteException if a remote exception occurs
- */
- public String getTitle() throws RemoteException;
-
- /**
- * Add a content listener to the model.
- * @param listener the listener to add
- * @exception RemoteException if a remote exception occurs
- */
- void addContentListener( ContentListener listener ) throws
RemoteException;
-
- /**
- * Remove a content listener from the model.
- * @param listener the listener to remove
- * @exception RemoteException if a remote exception occurs
- */
- void removeContentListener( ContentListener listener ) throws
RemoteException;
-
-}

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryEvent.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryEvent.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryEvent.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,71 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.model;
-
-import java.util.EventObject;
-
-/**
- * An event issued by a registry signalling changes tye addition or removal
- * of a content model.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public abstract class ContentRegistryEvent extends EventObject
-{
- /**
- * Serial version identifier.
- */
- static final long serialVersionUID = 1L;
-
- private final ContentModel m_content;
- private final ContentRegistryModel m_registry;
-
- /**
- * Creation of a new RegistryEvent signalling the addition
- * or removal of a content model to or from a registry.
- *
- * @param registry the content registry model
- * @param content the content model that was added or removed
- */
- public ContentRegistryEvent( ContentRegistryModel registry, ContentModel
content )
- {
- super( registry );
- m_content = content;
- m_registry = registry;
- }
-
- /**
- * Return the content registry model initiating the event.
- * @return the content registry model
- */
- public ContentRegistryModel getRegistryModel()
- {
- return m_registry;
- }
-
- /**
- * Return the content model that was added or removed.
- * @return the content model
- */
- public ContentModel getContentModel()
- {
- return m_content;
- }
-}

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryListener.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryListener.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryListener.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,49 +0,0 @@
-/*
- * Copyright 2005 Stephen McConnell
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.model;
-
-import java.util.EventListener;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * A ContentRegistryListener maintains information about the configuration
of a Transit
- * content management system. An implementation of this interface would be
supplied
- * a ContentRegistry implementation.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ContentRegistryListener extends EventListener, Remote
-{
- /**
- * Notify all listeners of the addition of a content model.
- * @param event the registry event
- * @exception RemoteException if a remote exception occurs
- */
- void contentAdded( ContentRegistryEvent event ) throws RemoteException;
-
- /**
- * Notify all listeners of the removal of a content model.
- * @param event the registry event
- * @exception RemoteException if a remote exception occurs
- */
- void contentRemoved( ContentRegistryEvent event ) throws RemoteException;
-
-}

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryModel.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryModel.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,67 +0,0 @@
-/*
- * Copyright 2005 Stephen McConnell
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.model;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import net.dpml.lang.UnknownKeyException;
-
-/**
- * A RegistryModel maintains information about the configuration of the
Transit
- * content registry subsystem. Instances of RegistryModel shall be supplied
to
- * registry implementations as constructor arguments.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ContentRegistryModel extends Remote
-{
- /**
- * Return an array of content models currently assigned to the registry.
- * @return the content model array
- * @exception RemoteException if a remote exception occurs
- */
- ContentModel[] getContentModels() throws RemoteException;
-
- /**
- * Return a content model matching the supplied type.
- *
- * @param type the content model type
- * @return the content model
- * @exception UnknownKeyException if the content model type is unknown
- * @exception RemoteException if a remote exception occurs
- */
- ContentModel getContentModel( String type ) throws UnknownKeyException,
RemoteException;
-
- /**
- * Add a content registry change listener.
- * @param listener the registry change listener to add
- * @exception RemoteException if a remote exception occurs
- */
- void addRegistryListener( ContentRegistryListener listener ) throws
RemoteException;
-
- /**
- * Remove a registry change listener.
- * @param listener the registry change listener to remove
- * @exception RemoteException if a remote exception occurs
- */
- void removeRegistryListener( ContentRegistryListener listener ) throws
RemoteException;
-
-}

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/model/PropertyChangeEvent.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/PropertyChangeEvent.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/main/net/dpml/transit/model/PropertyChangeEvent.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,70 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.model;
-
-/**
- * A event pertaining to content model changes.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class PropertyChangeEvent extends ContentEvent
-{
- /**
- * Serial version identifier.
- */
- static final long serialVersionUID = 1L;
-
- private final String m_key;
-
- private final String m_value;
-
- /**
- * Creation of a new PropertyChangeEvent signalling modification of
- * a property value.
- *
- * @param content the content model that was changed
- * @param key the property key
- * @param value the the updated property value
- */
- public PropertyChangeEvent( ContentModel content, String key, String
value )
- {
- super( content );
- m_key = key;
- m_value = value;
- }
-
- /**
- * Return the key to the modified property.
- * @return the property key
- */
- public String getKey()
- {
- return m_key;
- }
-
- /**
- * Return the value of the modified property.
- * @return the property value (possibly null)
- */
- public String getValue()
- {
- return m_value;
- }
-}

Modified:
trunk/main/transit/core/src/test/net/dpml/transit/info/CacheDirectiveTestCase.java
===================================================================
---
trunk/main/transit/core/src/test/net/dpml/transit/info/CacheDirectiveTestCase.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/test/net/dpml/transit/info/CacheDirectiveTestCase.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -32,7 +32,6 @@
private String m_localLayout;
private LayoutDirective[] m_layouts;
private HostDirective[] m_hosts;
- private ContentDirective[] m_content;
private CacheDirective m_directive;

/**
@@ -47,10 +46,9 @@
m_localLayout = "modern";
m_layouts = new LayoutDirective[0];
m_hosts = new HostDirective[0];
- m_content = new ContentDirective[0];
m_directive =
new CacheDirective(
- m_cache, m_cacheLayout, m_local, m_localLayout, m_layouts,
m_hosts, m_content );
+ m_cache, m_cacheLayout, m_local, m_localLayout, m_layouts,
m_hosts );
}

/**
@@ -108,15 +106,6 @@
}

/**
- * Test content handler accessor.
- * @exception Exception if an error occurs during setup.
- */
- public void testContent() throws Exception
- {
- assertEquals( "content", m_content,
m_directive.getContentDirectives() );
- }
-
- /**
* Test directive serialization.
* @exception Exception if an error occurs during setup.
*/

Deleted:
trunk/main/transit/core/src/test/net/dpml/transit/info/ContentDirectiveTestCase.java
===================================================================
---
trunk/main/transit/core/src/test/net/dpml/transit/info/ContentDirectiveTestCase.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/test/net/dpml/transit/info/ContentDirectiveTestCase.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -1,109 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit.info;
-
-import java.net.URI;
-
-import net.dpml.lang.ValueDirective;
-
-/**
- * Testing the CodeBaseDirective class.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class ContentDirectiveTestCase extends CodeBaseDirectiveTestCase
-{
- private String m_id = "test";
- private String m_title = "title";
-
- /**
- * Test id accessor.
- * @exception Exception if an error occurs during setup.
- */
- public void testID() throws Exception
- {
- URI codebase = getCodebaseValue();
- ValueDirective[] values = getValueDirectives();
- ContentDirective directive =
- new ContentDirective( m_id, m_title, codebase, values );
-
- assertEquals( "id", m_id, directive.getID() );
- }
-
- /**
- * Test title accessor.
- * @exception Exception if an error occurs during setup.
- */
- public void testTitle() throws Exception
- {
- URI codebase = getCodebaseValue();
- ValueDirective[] values = getValueDirectives();
- ContentDirective directive =
- new ContentDirective( m_id, m_title, codebase, values );
-
- assertEquals( "title", m_title, directive.getTitle() );
- }
-
- /**
- * Test illegal null id in constructor.
- * @exception Exception if an error occurs during setup.
- */
- public void testNullID() throws Exception
- {
- URI codebase = getCodebaseValue();
- ValueDirective[] values = getValueDirectives();
- try
- {
- ContentDirective directive =
- new ContentDirective( null, m_title, codebase, values );
- fail( "NPE expected" );
- }
- catch( NullPointerException e )
- {
- // success
- }
- }
-
- /**
- * Test null title.
- * @exception Exception if an error occurs during setup.
- */
- public void testNullTitle() throws Exception
- {
- URI codebase = getCodebaseValue();
- ValueDirective[] values = getValueDirectives();
- ContentDirective directive =
- new ContentDirective( m_id, null, codebase, values );
- assertEquals( "title", m_id, directive.getTitle() );
- }
-
- /**
- * Test serialization.
- * @exception Exception if an error occurs during setup.
- */
- public void testSerialization() throws Exception
- {
- URI codebase = getCodebaseValue();
- ValueDirective[] values = getValueDirectives();
- ContentDirective directive =
- new ContentDirective( m_id, m_title, codebase, values );
- doSerializationTest( directive );
- }
-}

Modified:
trunk/main/transit/core/src/test/net/dpml/transit/info/TransitDirectiveTestCase.java
===================================================================
---
trunk/main/transit/core/src/test/net/dpml/transit/info/TransitDirectiveTestCase.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/test/net/dpml/transit/info/TransitDirectiveTestCase.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -43,7 +43,7 @@
m_cache =
new CacheDirective(
"${dpml.data}/cache", "classic", "${dpml.share}/local",
"modern",
- new LayoutDirective[0], new HostDirective[0], new
ContentDirective[0] );
+ new LayoutDirective[0], new HostDirective[0] );
m_directive =
new TransitDirective(
m_proxy, m_cache );

Modified:
trunk/main/transit/core/src/test/net/dpml/transit/test/LinkTestCase.java
===================================================================
--- trunk/main/transit/core/src/test/net/dpml/transit/test/LinkTestCase.java
2006-04-19 05:55:14 UTC (rev 1382)
+++ trunk/main/transit/core/src/test/net/dpml/transit/test/LinkTestCase.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -26,19 +26,19 @@

import junit.framework.TestCase;

+import net.dpml.transit.Transit;
+import net.dpml.transit.DefaultTransitModel;
import net.dpml.transit.artifact.ArtifactNotFoundException;
import net.dpml.transit.link.Link;
-import net.dpml.util.StreamUtils;
import net.dpml.transit.info.CacheDirective;
import net.dpml.transit.info.TransitDirective;
import net.dpml.transit.info.LayoutDirective;
import net.dpml.transit.info.HostDirective;
-import net.dpml.transit.info.ContentDirective;
import net.dpml.transit.monitor.LoggingAdapter;
import net.dpml.transit.model.TransitModel;
-import net.dpml.transit.Transit;
-import net.dpml.transit.DefaultTransitModel;

+import net.dpml.util.StreamUtils;
+
/**
* LinkTestCase.
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
@@ -64,8 +64,7 @@
"file:${user.dir}/target/test/trusted",
"classic",
new LayoutDirective[0],
- new HostDirective[0],
- new ContentDirective[0] );
+ new HostDirective[0] );
TransitDirective directive = new TransitDirective( null, cache );
LoggingAdapter logger = new LoggingAdapter( "test" );
TransitModel model = new DefaultTransitModel( logger, directive
);

Modified:
trunk/main/transit/core/src/test/net/dpml/transit/test/OfflineTestCase.java
===================================================================
---
trunk/main/transit/core/src/test/net/dpml/transit/test/OfflineTestCase.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/test/net/dpml/transit/test/OfflineTestCase.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -34,7 +34,6 @@
import net.dpml.transit.info.TransitDirective;
import net.dpml.transit.info.LayoutDirective;
import net.dpml.transit.info.HostDirective;
-import net.dpml.transit.info.ContentDirective;
import net.dpml.transit.monitor.LoggingAdapter;
import net.dpml.transit.model.TransitModel;
import net.dpml.transit.Transit;
@@ -63,8 +62,7 @@
"file:${user.dir}/target/test/trusted",
"classic",
new LayoutDirective[0],
- new HostDirective[0],
- new ContentDirective[0] );
+ new HostDirective[0] );
TransitDirective directive = new TransitDirective( null, cache );
LoggingAdapter logger = new LoggingAdapter( "test" );
TransitModel model = new DefaultTransitModel( logger, directive
);

Modified:
trunk/main/transit/core/src/test/net/dpml/transit/test/OnlineTestCase.java
===================================================================
---
trunk/main/transit/core/src/test/net/dpml/transit/test/OnlineTestCase.java
2006-04-19 05:55:14 UTC (rev 1382)
+++
trunk/main/transit/core/src/test/net/dpml/transit/test/OnlineTestCase.java
2006-04-19 06:57:00 UTC (rev 1383)
@@ -33,7 +33,6 @@
import net.dpml.transit.info.TransitDirective;
import net.dpml.transit.info.LayoutDirective;
import net.dpml.transit.info.HostDirective;
-import net.dpml.transit.info.ContentDirective;
import net.dpml.transit.monitor.LoggingAdapter;
import net.dpml.transit.model.TransitModel;
import net.dpml.transit.Transit;
@@ -62,8 +61,7 @@
"file:${user.dir}/target/test/trusted",
CacheDirective.LOCAL_LAYOUT,
new LayoutDirective[0],
- new HostDirective[0],
- new ContentDirective[0] );
+ new HostDirective[0] );
TransitDirective directive = new TransitDirective( null, cache );
LoggingAdapter logger = new LoggingAdapter( "test" );
TransitModel model = new DefaultTransitModel( logger, directive
);

r1383 - in trunk/main: central/src/docs/about/download central/src/docs/transit/cli central/src/docs/transit/cli/add central/src/docs/transit/cli/remove central/src/docs/transit/cli/set metro/test/etc/test transit/console/src/main/net/dpml/transit/console transit/core/etc/main/net/dpml/transit transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/artifact transit/core/src/main/net/dpml/transit/info transit/core/src/main/net/dpml/transit/model transit/core/src/test/net/dpml/transit/info transit/core/src/test/net/dpml/transit/test, mcconnell at BerliOS, 04/19/2006