DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Thu May 19 12:45:28 2005
New Revision: 2624

Added:
   development/main/transit/core/handler/src/main/net/dpml/transit/model/
      - copied from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java
      - copied, changed from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/CacheDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentModel.java
      - copied, changed from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/ContentDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostModel.java
      - copied, changed from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/HostDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginModel.java
      - copied, changed from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/PluginDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryModel.java
      - copied, changed from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/RegistryDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/RepositoryModel.java
      - copied, changed from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/RepositoryDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/TransitModel.java
      - copied, changed from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/TransitDirector.java
Removed:
   
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/RepositoryDirector.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/TransitDirector.java
Modified:
   development/main/transit/core/handler/build.xml
   
development/main/transit/core/handler/src/main/net/dpml/transit/cache/FileCacheHandler.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/manager/AbstractPluginManager.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RepositoryManager.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/manager/TransitManager.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheListener.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentEvent.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentListener.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/FileChangeEvent.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostChangeEvent.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostEvent.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostListener.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginChangeEvent.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginListener.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryEvent.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryListener.java
Log:
Improve naming.

Modified: development/main/transit/core/handler/build.xml
==============================================================================
--- development/main/transit/core/handler/build.xml     (original)
+++ development/main/transit/core/handler/build.xml     Thu May 19 12:45:28 
2005
@@ -24,6 +24,24 @@
 
   <import file="${home}/standard.xml"/>
 
+  <target name="patch">
+    <replace token="CacheDirector" value="CacheModel" dir=".">
+      <include name="**/*.java"/>
+    </replace>
+    <replace token="HostDirector" value="HostModel" dir=".">
+      <include name="**/*.java"/>
+    </replace>
+    <replace token="ContentDirector" value="ContentModel" dir=".">
+      <include name="**/*.java"/>
+    </replace>
+    <replace token="RegistryDirector" value="RegistryModel" dir=".">
+      <include name="**/*.java"/>
+    </replace>
+    <replace token="PluginDirector" value="PluginModel" dir=".">
+      <include name="**/*.java"/>
+    </replace>
+  </target>
+
   <target name="setup-path" depends="init">
     <path id="project.test.path">
       <pathelement 
location="${target.deliverables.jars.dir}/${project.filename}"/>

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/cache/FileCacheHandler.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/cache/FileCacheHandler.java
 (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/cache/FileCacheHandler.java
 Thu May 19 12:45:28 2005
@@ -138,8 +138,8 @@
         cachePrefs.addPreferenceChangeListener( this );
 
         hostsNode.addNodeChangeListener( this );
-        File cache = resolveCacheDirectory( cachePrefs );
-        setLocalCacheDirectory( cache );
+        File cache = resolveCacheModely( cachePrefs );
+        setLocalCacheModely( cache );
     }
 
     // 
------------------------------------------------------------------------
@@ -181,15 +181,15 @@
             m_resourceHosts.put( key, hosts[i] );
         }
 
-        File cache = resolveCacheDirectory( props );
-        setLocalCacheDirectory( cache );
+        File cache = resolveCacheModely( props );
+        setLocalCacheModely( cache );
     }
 
    /**
     * Set the local cache directory.
     *
     */
-    protected synchronized void setLocalCacheDirectory( File file )
+    protected synchronized void setLocalCacheModely( File file )
     {
         if( null == file )
         {
@@ -224,7 +224,7 @@
     *
     * @return the feature collection
     */
-    protected File getLocalCacheDirectory()
+    protected File getLocalCacheModely()
     {
         return m_cacheDir;
     }
@@ -432,7 +432,7 @@
     * @param props the configuration properties
     * @return the cache root directory
     */
-    private File resolveCacheDirectory( Properties props )
+    private File resolveCacheModely( Properties props )
     {
         String defaultCache = "cache";
         String fallback = Util.getProperty( props, CACHE_KEY, defaultCache );
@@ -445,7 +445,7 @@
     *
     * @return the cache directory
     */
-    private File resolveCacheDirectory( Preferences cachePrefs )
+    private File resolveCacheModely( Preferences cachePrefs )
     {
         String path = cachePrefs.get( "location", "cache" );
         String location = System.getProperty( CACHE_KEY, path );
@@ -543,8 +543,8 @@
         Preferences prefs = event.getNode();
         if( "location".equals( key ) )
         {
-            File cache = resolveCacheDirectory( prefs );
-            setLocalCacheDirectory( cache );
+            File cache = resolveCacheModely( prefs );
+            setLocalCacheModely( cache );
         }
     }
 

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/AbstractPluginManager.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/AbstractPluginManager.java
  (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/AbstractPluginManager.java
  Thu May 19 12:45:28 2005
@@ -24,9 +24,9 @@
 import java.util.logging.Level;
 
 import net.dpml.transit.event.EventProducer;
-import net.dpml.transit.configuration.PluginDirector;
-import net.dpml.transit.configuration.PluginChangeEvent;
-import net.dpml.transit.configuration.PluginListener;
+import net.dpml.transit.model.PluginModel;
+import net.dpml.transit.model.PluginChangeEvent;
+import net.dpml.transit.model.PluginListener;
 
 /**
  * An abstract plugin manager.
@@ -34,7 +34,7 @@
  * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
  * @version $Id: StandardTransitDirector.java 2480 2005-05-10 04:44:32Z 
mcconnell AT dpml.net $
  */
-abstract class AbstractPluginManager extends EventProducer implements 
PluginDirector
+abstract class AbstractPluginManager extends EventProducer implements 
PluginModel
 {
     private final Logger m_logger;
 

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
   (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
   Thu May 19 12:45:28 2005
@@ -28,12 +28,12 @@
 import java.util.logging.Logger;
 import java.net.URI;
 
-import net.dpml.transit.configuration.CacheDirector;
-import net.dpml.transit.configuration.HostDirector;
-import net.dpml.transit.configuration.PluginChangeEvent;
-import net.dpml.transit.configuration.CacheListener;
-import net.dpml.transit.configuration.FileChangeEvent;
-import net.dpml.transit.configuration.HostEvent;
+import net.dpml.transit.model.CacheModel;
+import net.dpml.transit.model.HostModel;
+import net.dpml.transit.model.PluginChangeEvent;
+import net.dpml.transit.model.CacheListener;
+import net.dpml.transit.model.FileChangeEvent;
+import net.dpml.transit.model.HostEvent;
 
 /**
  * Default implementation of the cache director.
@@ -41,28 +41,28 @@
  * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
  * @version $Id: StandardTransitDirector.java 2480 2005-05-10 04:44:32Z 
mcconnell AT dpml.net $
  */
-public class CacheManager extends AbstractPluginManager implements 
CacheDirector
+public class CacheManager extends AbstractPluginManager implements CacheModel
 {
     private final List m_list = new LinkedList();
     private File m_cache;
 
-    public CacheManager( Logger logger, URI uri, File cache, HostDirector[] 
hosts )
+    public CacheManager( Logger logger, URI uri, File cache, HostModel[] 
hosts )
     {
         super( logger, uri );
         m_cache = cache;
         for( int i=0; i<hosts.length; i++ )
         {
-            HostDirector d = hosts[i];
+            HostModel d = hosts[i];
             m_list.add( d );
         }
     }
 
-    public void setCacheDirectory( File dir )
+    public void setCacheModel( File dir )
     {
         synchronized( m_lock )
         {
             m_cache = dir;
-            CacheDirectoryChangeEvent event = new CacheDirectoryChangeEvent( 
this, dir );
+            CacheModelyChangeEvent event = new CacheModelyChangeEvent( this, 
dir );
             super.enqueueEvent( event );
         }
     }
@@ -76,7 +76,7 @@
         }
     }
 
-    public void addHostDirector( HostDirector director, int priority )
+    public void addHostModel( HostModel director, int priority )
     {
         String id = director.getID();
         synchronized( m_list )
@@ -84,7 +84,7 @@
             Iterator iterator = m_list.iterator();
             while( iterator.hasNext() )
             {
-                HostDirector d = (HostDirector) iterator.next();
+                HostModel d = (HostModel) iterator.next();
                 if( id.equals( d.getID() ) )
                 {
                     final String error = 
@@ -99,7 +99,7 @@
         }
     }
 
-    public void removeHostDirector( HostDirector director )
+    public void removeHostModel( HostModel director )
     {
         synchronized( m_list )
         {
@@ -116,7 +116,7 @@
     * Return the directory to be used by the cache handler as the cache 
directory.
     * @return the cache directory.
     */
-    public File getCacheDirectory()
+    public File getCacheModely()
     {
         return m_cache;
     }
@@ -125,9 +125,9 @@
     * Return an array of hosts currently assigned to the cache.
     * @return the host director array
     */
-    public HostDirector[] getHostDirectors()
+    public HostModel[] getHostModels()
     {
-        return (HostDirector[]) m_list.toArray( new HostDirector[0] );
+        return (HostModel[]) m_list.toArray( new HostModel[0] );
     }
 
    /**
@@ -158,9 +158,9 @@
         {
             processHostEvent( (HostEvent) event );
         }
-        else if( event instanceof CacheDirectoryChangeEvent )
+        else if( event instanceof CacheModelyChangeEvent )
         {
-            processCacheDirectoryChangeEvent( (CacheDirectoryChangeEvent) 
event );
+            processCacheModelyChangeEvent( (CacheModelyChangeEvent) event );
         }
         else
         {
@@ -210,7 +210,7 @@
         }
     }
 
-    private void processCacheDirectoryChangeEvent( CacheDirectoryChangeEvent 
event )
+    private void processCacheModelyChangeEvent( CacheModelyChangeEvent event 
)
     {
         EventListener[] listeners = super.listeners();
         for( int i=0; i<listeners.length; i++ )
@@ -237,7 +237,7 @@
     {
         private int m_priority;
 
-        public HostAddedEvent( CacheDirector source, HostDirector host, int 
priority )
+        public HostAddedEvent( CacheModel source, HostModel host, int 
priority )
         {
             super( source, host );
         }
@@ -250,7 +250,7 @@
 
     static class HostRemovedEvent extends HostEvent
     {
-        public HostRemovedEvent( CacheDirector source, HostDirector host )
+        public HostRemovedEvent( CacheModel source, HostModel host )
         {
             super( source, host );
         }
@@ -264,15 +264,15 @@
         * @param source the object initiating the event
         * @param plugin the plugin uri
         */
-        public CachePluginChangeEvent( CacheDirector source, URI plugin )
+        public CachePluginChangeEvent( CacheModel source, URI plugin )
         {
             super( source, plugin );
         }
     }
 
-    class CacheDirectoryChangeEvent extends FileChangeEvent
+    class CacheModelyChangeEvent extends FileChangeEvent
     {
-        public CacheDirectoryChangeEvent( Object source, File file )
+        public CacheModelyChangeEvent( Object source, File file )
         {
             super( source, file );
         }

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
    (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
    Thu May 19 12:45:28 2005
@@ -27,11 +27,11 @@
 import java.net.URL;
 import java.net.Authenticator; 
 
-import net.dpml.transit.configuration.HostDirector;
-import net.dpml.transit.configuration.PluginDirector;
-import net.dpml.transit.configuration.PluginChangeEvent;
-import net.dpml.transit.configuration.HostChangeEvent;
-import net.dpml.transit.configuration.HostListener;
+import net.dpml.transit.model.HostModel;
+import net.dpml.transit.model.PluginModel;
+import net.dpml.transit.model.PluginChangeEvent;
+import net.dpml.transit.model.HostChangeEvent;
+import net.dpml.transit.model.HostListener;
 
 /**
  * Default implementation of a host manager.
@@ -39,7 +39,7 @@
  * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
  * @version $Id: HostManager.java 2480 2005-05-10 04:44:32Z 
mcconnell AT dpml.net $
  */
-public class HostManager extends AbstractPluginManager implements 
HostDirector
+public class HostManager extends AbstractPluginManager implements HostModel
 {
     private final String m_id;
 
@@ -73,7 +73,7 @@
     }
 
     //----------------------------------------------------------------------
-    // HostDirector
+    // HostModel
     //----------------------------------------------------------------------
 
    /**
@@ -220,7 +220,7 @@
         * @param source the object initiating the event
         * @param plugin the plugin uri
         */
-        public HostPluginChangeEvent( HostDirector source, URI plugin )
+        public HostPluginChangeEvent( HostModel source, URI plugin )
         {
             super( source, plugin );
         }

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
        (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
        Thu May 19 12:45:28 2005
@@ -27,11 +27,11 @@
 import java.util.logging.Logger;
 import java.net.URI;
 
-import net.dpml.transit.configuration.RegistryDirector;
-import net.dpml.transit.configuration.ContentDirector;
-import net.dpml.transit.configuration.PluginChangeEvent;
-import net.dpml.transit.configuration.RegistryListener;
-import net.dpml.transit.configuration.RegistryEvent;
+import net.dpml.transit.model.RegistryModel;
+import net.dpml.transit.model.ContentModel;
+import net.dpml.transit.model.PluginChangeEvent;
+import net.dpml.transit.model.RegistryListener;
+import net.dpml.transit.model.RegistryEvent;
 
 /**
  * Default implementation of a content handler registry manager.
@@ -39,16 +39,16 @@
  * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
  * @version $Id: StandardTransitDirector.java 2480 2005-05-10 04:44:32Z 
mcconnell AT dpml.net $
  */
-public class RegistryManager extends AbstractPluginManager implements 
RegistryDirector
+public class RegistryManager extends AbstractPluginManager implements 
RegistryModel
 {
     private final List m_list = new LinkedList();
 
-    public RegistryManager( Logger logger, URI uri, ContentDirector[] 
content )
+    public RegistryManager( Logger logger, URI uri, ContentModel[] content )
     {
         super( logger, uri );
         for( int i=0; i<content.length; i++ )
         {
-            ContentDirector c = content[i];
+            ContentModel c = content[i];
             m_list.add( c );
         }
     }
@@ -62,7 +62,7 @@
         }
     }
 
-    public void addContentDirector( ContentDirector director )
+    public void addContentModel( ContentModel director )
     {
         String type = director.getContentType();
         synchronized( m_list )
@@ -70,7 +70,7 @@
             Iterator iterator = m_list.iterator();
             while( iterator.hasNext() )
             {
-                ContentDirector d = (ContentDirector) iterator.next();
+                ContentModel d = (ContentModel) iterator.next();
                 if( type.equals( d.getContentType() ) )
                 {
                     final String error = 
@@ -85,7 +85,7 @@
         }
     }
 
-    public void removeContentDirector( ContentDirector director )
+    public void removeContentModel( ContentModel director )
     {
         synchronized( m_list )
         {
@@ -102,9 +102,9 @@
     * Return an array of content directors currently assigned to the 
registry.
     * @return the content director array
     */
-    public ContentDirector[] getContentDirectors()
+    public ContentModel[] getContentModels()
     {
-        return (ContentDirector[]) m_list.toArray( new ContentDirector[0] );
+        return (ContentModel[]) m_list.toArray( new ContentModel[0] );
     }
 
    /**
@@ -185,7 +185,7 @@
 
     static class ContentAddedEvent extends RegistryEvent
     {
-        public ContentAddedEvent( RegistryDirector source, ContentDirector 
handler )
+        public ContentAddedEvent( RegistryModel source, ContentModel handler 
)
         {
             super( source, handler );
         }
@@ -193,7 +193,7 @@
 
     static class ContentRemovedEvent extends RegistryEvent
     {
-        public ContentRemovedEvent( RegistryDirector source, ContentDirector 
handler )
+        public ContentRemovedEvent( RegistryModel source, ContentModel 
handler )
         {
             super( source, handler );
         }
@@ -207,7 +207,7 @@
         * @param source the object initiating the event
         * @param plugin the plugin uri
         */
-        public RegistryPluginChangeEvent( RegistryDirector source, URI 
plugin )
+        public RegistryPluginChangeEvent( RegistryModel source, URI plugin )
         {
             super( source, plugin );
         }

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RepositoryManager.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RepositoryManager.java
      (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RepositoryManager.java
      Thu May 19 12:45:28 2005
@@ -23,9 +23,9 @@
 import java.util.logging.Logger;
 import java.net.URI;
 
-import net.dpml.transit.configuration.RepositoryDirector;
-import net.dpml.transit.configuration.PluginDirector;
-import net.dpml.transit.configuration.PluginChangeEvent;
+import net.dpml.transit.model.RepositoryModel;
+import net.dpml.transit.model.PluginModel;
+import net.dpml.transit.model.PluginChangeEvent;
 
 /**
  * Default implementation of a repository manager.
@@ -33,7 +33,7 @@
  * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
  * @version $Id: StandardTransitDirector.java 2480 2005-05-10 04:44:32Z 
mcconnell AT dpml.net $
  */
-public class RepositoryManager extends AbstractPluginManager implements 
RepositoryDirector
+public class RepositoryManager extends AbstractPluginManager implements 
RepositoryModel
 {
     public RepositoryManager( Logger logger )
     {
@@ -81,7 +81,7 @@
         * @param source the object initiating the event
         * @param plugin the plugin uri
         */
-        public RepositoryPluginChangeEvent( RepositoryDirector source, URI 
plugin )
+        public RepositoryPluginChangeEvent( RepositoryModel source, URI 
plugin )
         {
             super( source, plugin );
         }

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/TransitManager.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/TransitManager.java
 (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/manager/TransitManager.java
 Thu May 19 12:45:28 2005
@@ -20,10 +20,10 @@
 
 import java.net.URI;
 
-import net.dpml.transit.configuration.TransitDirector;
-import net.dpml.transit.configuration.CacheDirector;
-import net.dpml.transit.configuration.RegistryDirector;
-import net.dpml.transit.configuration.RepositoryDirector;
+import net.dpml.transit.model.TransitModel;
+import net.dpml.transit.model.CacheModel;
+import net.dpml.transit.model.RegistryModel;
+import net.dpml.transit.model.RepositoryModel;
 
 /**
  * The TransitManager class is the default TransitDirector implementation.
@@ -31,14 +31,14 @@
  * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
  * @version $Id: StandardTransitDirector.java 2480 2005-05-10 04:44:32Z 
mcconnell AT dpml.net $
  */
-public class TransitManager implements TransitDirector
+public class TransitManager implements TransitModel
 {
-    private final CacheDirector m_cache;
-    private final RegistryDirector m_registry;
-    private final RepositoryDirector m_repository;
+    private final CacheModel m_cache;
+    private final RegistryModel m_registry;
+    private final RepositoryModel m_repository;
 
     public TransitManager( 
-      final CacheDirector cache, final RegistryDirector registry, final 
RepositoryDirector repository )
+      final CacheModel cache, final RegistryModel registry, final 
RepositoryModel repository )
     {
         m_cache = cache;
         m_registry = registry;
@@ -46,32 +46,32 @@
     }
 
    /**
-    * Return the cache director.
-    * @return the cache director
+    * Return the cache model.
+    * @return the cache model 
     */
-    public CacheDirector getCacheDirector()
+    public CacheModel getCacheModel()
     {
         return m_cache;
     }
 
    /**
-    * Return the director maintiaining configuration information about
+    * Return the model maintiaining configuration information about
     * the conent registry.
     *
     * @return the content director
     */
-    public RegistryDirector getContentRegistryDirector()
+    public RegistryModel getContentRegistryModel()
     {
         return m_registry;
     }
 
    /**
-    * Return the director maintaining configuration information about
+    * Return the model maintaining configuration information about
     * the repository service.
     *
     * @return the repository director
     */
-    public RepositoryDirector getRepositoryDirector()
+    public RepositoryModel getRepositoryModel()
     {
         return m_repository;
     }

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheListener.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/CacheListener.java
    (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheListener.java
    Thu May 19 12:45:28 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.util.EventListener;
 

Copied: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java
 (from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/CacheDirector.java)
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/CacheDirector.java
    (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java
       Thu May 19 12:45:28 2005
@@ -16,29 +16,29 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.io.File;
 import java.net.URI;
 
 /**
- * A CacheDirector maintains information about the configuration of the 
Transit
- * cache subsystem.  Instances of CacheDirector shall be supplied to cache 
handler
+ * A CacheModel maintains information about the configuration of the Transit
+ * cache subsystem.  Instances of CacheModel shall be supplied to cache 
handler
  * implementations as constructor arguments.
  */
-public interface CacheDirector extends PluginDirector
+public interface CacheModel extends PluginModel
 {
    /**
     * Return the directory to be used by the cache handler as the cache 
directory.
     * @return the cache directory.
     */
-    File getCacheDirectory();
+    File getCacheModely();
 
    /**
     * Return the array of hosts configured for the cache.
     * @return the host director array
     */
-    HostDirector[] getHostDirectors();
+    HostModel[] getHostModels();
 
    /**
     * Add a cache listener to the director.

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentEvent.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/ContentEvent.java
     (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentEvent.java
     Thu May 19 12:45:28 2005
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.util.EventObject;
 
 public class ContentEvent extends EventObject
 {
-    private final ContentDirector m_content;
+    private final ContentModel m_content;
 
    /**
     * Creation of a new ContentEvent signalling modification of 
@@ -30,7 +30,7 @@
     * 
     * @param content the content director that was added or removed
     */
-    public ContentEvent( ContentDirector content )
+    public ContentEvent( ContentModel content )
     {
         super( content );
         m_content = content;
@@ -40,7 +40,7 @@
     * Return the content director that was modified.
     * @return the content director
     */
-    public ContentDirector getContentDirector()
+    public ContentModel getContentModel()
     {
         return m_content;
     }

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentListener.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/ContentListener.java
  (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentListener.java
  Thu May 19 12:45:28 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.util.EventListener;
 

Copied: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentModel.java
 (from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/ContentDirector.java)
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/ContentDirector.java
  (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentModel.java
     Thu May 19 12:45:28 2005
@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.net.URI;
 
 /**
- * A ContentDirector maintains information about the contiguration
- * of a content handler.  Instances of ContentDirector are used as 
+ * A ContentModel maintains information about the contiguration
+ * of a content handler.  Instances of ContentModel are used as 
  * constructor arguments to content handler plugins.
  */
-public interface ContentDirector extends PluginDirector
+public interface ContentModel extends PluginModel
 {
    /**
     * Return the immutable content type identifier.

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/FileChangeEvent.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/FileChangeEvent.java
  (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/FileChangeEvent.java
  Thu May 19 12:45:28 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.io.File;
 import java.util.EventObject;

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostChangeEvent.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/HostChangeEvent.java
  (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostChangeEvent.java
  Thu May 19 12:45:28 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.util.EventObject;
 
@@ -24,7 +24,7 @@
 {
     private final String[] m_features;
 
-    public HostChangeEvent( HostDirector host, String[] features )
+    public HostChangeEvent( HostModel host, String[] features )
     {
         super( host );
         m_features = features;

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostEvent.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/HostEvent.java
        (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostEvent.java
        Thu May 19 12:45:28 2005
@@ -16,21 +16,21 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.util.EventObject;
 
 public abstract class HostEvent extends EventObject
 {
-    private final HostDirector m_host;
+    private final HostModel m_host;
 
-    public HostEvent( CacheDirector source, HostDirector host )
+    public HostEvent( CacheModel source, HostModel host )
     {
         super( source );
         m_host = host;
     }
     
-    public HostDirector getHostDirector()
+    public HostModel getHostModel()
     {
         return m_host;
     }

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostListener.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/HostListener.java
     (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostListener.java
     Thu May 19 12:45:28 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.util.EventListener;
 

Copied: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostModel.java
 (from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/HostDirector.java)
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/HostDirector.java
     (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostModel.java
        Thu May 19 12:45:28 2005
@@ -16,21 +16,21 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.net.URL;
 import java.net.URI;
 import java.net.Authenticator; 
 
 /** 
- * The HostDirector interface is implemented by objects that control the
+ * The HostModel interface is implemented by objects that control the
  * the configuration of resource host implementations.  An instance of an 
- * implementation of HostDirector may be passed as a constructor argument 
+ * implementation of HostModel may be passed as a constructor argument 
  * to a resource host implmentation. Implementation shall maintain 
  * synchronization via change events raised by implementations of this 
  * interface.
  */
-public interface HostDirector extends PluginDirector
+public interface HostModel extends PluginModel
 {
     // Based on the resource descriptor, this interface attempt to reduce
     // down the information needed at instantiation and subsequent runtime.
@@ -41,7 +41,7 @@
     // however - some additional info may be needed related to sceme and 
promopt
     // but these are not included as these feel like authenticator 
implementation 
     // concerns (not sure on this one).  At least its fair to say that an 
authenticator
-    // is a network host concern which would suggest that there is a 
NetworkHostDirector.
+    // is a network host concern which would suggest that there is a 
NetworkHostModel.
 
    /**
     * Return an immutable host identifier.  The host identifier shall be 

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginChangeEvent.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/PluginChangeEvent.java
        (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginChangeEvent.java
        Thu May 19 12:45:28 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.net.URI;
 import java.util.EventObject;

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginListener.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/PluginListener.java
   (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginListener.java
   Thu May 19 12:45:28 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.util.EventListener;
 

Copied: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginModel.java
 (from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/PluginDirector.java)
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/PluginDirector.java
   (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginModel.java
      Thu May 19 12:45:28 2005
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.net.URI;
 
 /**
- * A PluginDirector maintains information about the configuration of 
+ * A PluginModel maintains information about the configuration of 
  * a pluggable subsystem.
  */
-public interface PluginDirector
+public interface PluginModel
 {
    /**
     * Return the uri of the plugin to be used for cache management.

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryEvent.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/RegistryEvent.java
    (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryEvent.java
    Thu May 19 12:45:28 2005
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.util.EventObject;
 
 public abstract class RegistryEvent extends EventObject
 {
-    private final ContentDirector m_content;
-    private final RegistryDirector m_registry;
+    private final ContentModel m_content;
+    private final RegistryModel m_registry;
 
    /**
     * Creation of a new RegistryEvent signalling the addition
@@ -32,7 +32,7 @@
     * @param registry the content registry director
     * @param content the content director that was added or removed
     */   
-    public RegistryEvent( RegistryDirector registry, ContentDirector content 
)
+    public RegistryEvent( RegistryModel registry, ContentModel content )
     {
         super( registry );
         m_content = content;
@@ -43,7 +43,7 @@
     * Return the registry director initiating the event.
     * @return the registry director
     */
-    public RegistryDirector getRegistryDirector()
+    public RegistryModel getRegistryModel()
     {
         return m_registry;
     }
@@ -52,7 +52,7 @@
     * Return the content director that was added or removed.
     * @return the content director
     */
-    public ContentDirector getContentDirector()
+    public ContentModel getContentModel()
     {
         return m_content;
     }

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryListener.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/RegistryListener.java
 (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryListener.java
 Thu May 19 12:45:28 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.util.EventListener;
 

Copied: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryModel.java
 (from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/RegistryDirector.java)
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/RegistryDirector.java
 (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/RegistryModel.java
    Thu May 19 12:45:28 2005
@@ -16,22 +16,22 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.net.URI;
 
 /**
- * A RegistryDirector maintains information about the configuration of the 
Transit
- * content registry subsystem.  Instances of RegistryDirector shall be 
supplied to 
+ * 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.
  */
-public interface RegistryDirector extends PluginDirector
+public interface RegistryModel extends PluginModel
 {
    /**
     * Return an array of content directors currently assigned to the 
registry.
     * @return the content director array
     */
-    ContentDirector[] getContentDirectors();
+    ContentModel[] getContentModels();
 
    /**
     * Add a regstry change listener.

Copied: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/RepositoryModel.java
 (from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/RepositoryDirector.java)
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/RepositoryDirector.java
       (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/RepositoryModel.java
  Thu May 19 12:45:28 2005
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.net.URI;
 
 /**
- * A RepositoryDirector maintains information about the configuration of the 
Transit
+ * A RepositoryModel maintains information about the configuration of the 
Transit
  * repository service.
  */
-public interface RepositoryDirector extends PluginDirector
+public interface RepositoryModel extends PluginModel
 {
 }

Copied: 
development/main/transit/core/handler/src/main/net/dpml/transit/model/TransitModel.java
 (from r2623, 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/TransitDirector.java)
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/configuration/TransitDirector.java
  (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/model/TransitModel.java
     Thu May 19 12:45:28 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package net.dpml.transit.configuration;
+package net.dpml.transit.model;
 
 import java.net.URI;
 
@@ -24,27 +24,27 @@
  * The TransitDirector is an interface implemented by objects that
  * manage the configuration of a running transit system.
  */
-public interface TransitDirector
+public interface TransitModel
 {
    /**
-    * Return the cache director.
+    * Return the cache model.
     * @return the cache director
     */
-    CacheDirector getCacheDirector();
+    CacheModel getCacheModel();
 
    /**
-    * Return the director maintaining configuration information about
+    * Return the model maintaining configuration information about
     * the content registry.
     *
-    * @return the content director
+    * @return the content model
     */
-    RegistryDirector getContentRegistryDirector();
+    RegistryModel getContentRegistryModel();
 
    /**
-    * Return the director maintaining configuration information about
+    * Return the model maintaining configuration information about
     * the repository service.
     *
-    * @return the repository director
+    * @return the repository model
     */
-    RepositoryDirector getRepositoryDirector();
+    RepositoryModel getRepositoryModel();
 }