notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2857 - in development/main: depot/console/src/main/net/dpml/depot/profile depot/prefs/src/main/net/dpml/depot/prefs test/unit/plus/src/test/net/dpml/test/acme/plus transit/core/handler/src/main/net/dpml/transit transit/core/handler/src/main/net/dpml/transit/home transit/core/handler/src/main/net/dpml/transit/model transit/core/handler/src/main/net/dpml/transit/runtime transit/core/handler/src/main/net/dpml/transit/unit

From: mcconnell AT dpml.net
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2857 - in development/main: depot/console/src/main/net/dpml/depot/profile depot/prefs/src/main/net/dpml/depot/prefs test/unit/plus/src/test/net/dpml/test/acme/plus transit/core/handler/src/main/net/dpml/transit transit/core/handler/src/main/net/dpml/transit/home transit/core/handler/src/main/net/dpml/transit/model transit/core/handler/src/main/net/dpml/transit/runtime transit/core/handler/src/main/net/dpml/transit/unit
Date: Tue, 14 Jun 2005 18:55:59 -0400

Author: mcconnell AT dpml.net
Date: Tue Jun 14 18:55:57 2005
New Revision: 2857

Added:

development/main/transit/core/handler/src/main/net/dpml/transit/home/CodeBaseHome.java
- copied, changed from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/home/PluginHome.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/CodeBaseEvent.java
- copied, changed from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginChangeEvent.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/CodeBaseListener.java
- copied, changed from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginListener.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/CodeBaseModel.java
- copied, changed from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCodeBaseModel.java
- copied, changed from r2849,
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultPluginModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DisposableCodeBaseModel.java
- copied, changed from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultDisposablePluginModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/unit/CodeBaseStorageUnit.java
- copied, changed from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/unit/PluginStorageUnit.java
Removed:

development/main/transit/core/handler/src/main/net/dpml/transit/home/PluginHome.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultDisposablePluginModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultPluginModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/HostAvailabilityEvent.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/PluginModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/unit/PluginStorageUnit.java
Modified:

development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfileStorage.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/DepotPreferencesPanel.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/PluginModelPanel.java

development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/URLTestCase.java

development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java

development/main/transit/core/handler/src/main/net/dpml/transit/home/CacheHome.java

development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentHome.java

development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentRegistryHome.java

development/main/transit/core/handler/src/main/net/dpml/transit/home/HostHome.java

development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutHome.java

development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutRegistryHome.java

development/main/transit/core/handler/src/main/net/dpml/transit/home/RepositoryHome.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentRegistryModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentRegistryModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutRegistryModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultRepositoryModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/HostModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/LayoutModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/LayoutRegistryModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/RepositoryModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java

development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultContentRegistry.java

development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultLayoutRegistry.java

development/main/transit/core/handler/src/main/net/dpml/transit/unit/CacheStorageUnit.java

development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentRegistryStorageUnit.java

development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentStorageUnit.java

development/main/transit/core/handler/src/main/net/dpml/transit/unit/HostStorageUnit.java

development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutRegistryStorageUnit.java

development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutStorageUnit.java

development/main/transit/core/handler/src/main/net/dpml/transit/unit/RepositoryStorageUnit.java
Log:
Enhancements relating to class naming.

Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfileStorage.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfileStorage.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfileStorage.java
Tue Jun 14 18:55:57 2005
@@ -46,11 +46,6 @@
// constructor
//
------------------------------------------------------------------------

- protected ApplicationProfile getApplicationProfile()
- {
- return m_profile;
- }
-
public ApplicationProfileStorage(
Preferences prefs, Logger logger, Date creation, boolean policy )
throws ProfileException
@@ -69,6 +64,15 @@
logger, creation, this, id, title, properties, command,
connection, uri, enabled );
}

+ //
------------------------------------------------------------------------
+ // impl
+ //
------------------------------------------------------------------------
+
+ protected ApplicationProfile getApplicationProfile()
+ {
+ return m_profile;
+ }
+
protected URI getPluginURI() throws ProfileException
{
Preferences prefs = getPreferences();

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/DepotPreferencesPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/DepotPreferencesPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/DepotPreferencesPanel.java
Tue Jun 14 18:55:57 2005
@@ -115,7 +115,7 @@
public void run()
{
m_depotPanel = new DepotModelPanel( m_window, m_depot );
- tabbedPane.addTab( "Profiles", m_depotPanel );
+ tabbedPane.addTab( "Applications", m_depotPanel );
}
}
);

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/PluginModelPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/PluginModelPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/PluginModelPanel.java
Tue Jun 14 18:55:57 2005
@@ -51,9 +51,9 @@

import net.dpml.transit.Transit;
import net.dpml.transit.TransitException;
-import net.dpml.transit.model.PluginModel;
-import net.dpml.transit.model.PluginListener;
-import net.dpml.transit.model.PluginChangeEvent;
+import net.dpml.transit.model.CodeBaseModel;
+import net.dpml.transit.model.CodeBaseListener;
+import net.dpml.transit.model.CodeBaseEvent;
import net.dpml.transit.repository.Plugin;
import net.dpml.transit.repository.Repository;

@@ -63,7 +63,7 @@
* @author <a href="mailto:mcconnell AT osm.net";>OSM</a>
*/
class PluginModelPanel extends ClassicPanel
- implements PluginListener, PropertyChangeListener, DocumentListener
+ implements CodeBaseListener, PropertyChangeListener, DocumentListener
{
//--------------------------------------------------------------
// state
@@ -74,7 +74,7 @@
private JButton m_ok;
private JButton m_revert;
private SettingsAction m_settings;
- private PluginModel m_manager;
+ private CodeBaseModel m_manager;
private PropertyChangeSupport m_propertyChangeSupport;
private Action m_action;

@@ -97,7 +97,7 @@
* @param service the class that a plugin controller must implement
*/
public PluginModelPanel(
- JDialog parent, PluginModel manager, Class service ) throws Exception
+ JDialog parent, CodeBaseModel manager, Class service ) throws
Exception
{
this( parent, manager, null, service );
}
@@ -119,7 +119,7 @@
* @param service the class that a plugin controller must implement
*/
public PluginModelPanel(
- JDialog parent, PluginModel manager, Action action, Class service )
throws Exception
+ JDialog parent, CodeBaseModel manager, Action action, Class service )
throws Exception
{
super();

@@ -130,7 +130,7 @@

m_ok = new JButton( new OKAction( "Install", service ) );
m_revert = new JButton( new RevertAction( "Undo" ) );
- m_manager.addPluginListener( this );
+ m_manager.addCodeBaseListener( this );

setLayout( new BorderLayout() );
setBackground( Color.white );
@@ -269,7 +269,7 @@

private String getControllerFieldText()
{
- URI uri = m_manager.getPluginURI();
+ URI uri = m_manager.getCodeBaseURI();
if( null == uri )
{
return "artifact:plugin:";
@@ -282,7 +282,7 @@

private String getControllerPath()
{
- URI uri = m_manager.getPluginURI();
+ URI uri = m_manager.getCodeBaseURI();
if( null == uri )
{
return null;
@@ -297,9 +297,9 @@
// PluginListener
//--------------------------------------------------------------

- public void pluginChanged( PluginChangeEvent event )
+ public void codeBaseChanged( CodeBaseEvent event )
{
- URI uri = event.getPluginURI();
+ URI uri = event.getCodeBaseURI();
String artifact = "";
if( uri != null )
{
@@ -317,7 +317,7 @@

private void dispose()
{
- m_manager.removePluginListener( this );
+ m_manager.removeCodeBaseListener( this );
}

private class CloseAction extends AbstractAction
@@ -470,14 +470,14 @@
{
if( "".equals( text ) )
{
- m_manager.setPluginURI( null );
+ m_manager.setCodeBaseURI( null );
}
else
{
URI uri = validateControllerSpec( m_parent, text,
m_service );
if( null != uri )
{
- m_manager.setPluginURI( uri );
+ m_manager.setCodeBaseURI( uri );
}
}
}

Modified:
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/URLTestCase.java
==============================================================================
---
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/URLTestCase.java
(original)
+++
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/URLTestCase.java
Tue Jun 14 18:55:57 2005
@@ -130,7 +130,7 @@
TransitHome home = new TransitStorageUnit( prefs );
home.clearBeforeInitialization( true );
TransitModel MODEL = home.create();
- MODEL.getContentRegistryModel().setPluginURI( uri );
+ MODEL.getContentRegistryModel().setCodeBaseURI( uri );
TRANSIT = Transit.getInstance( MODEL );
}
catch( Throwable e )

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
Tue Jun 14 18:55:57 2005
@@ -25,9 +25,9 @@
import net.dpml.transit.model.TransitModel;
import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.PluginListener;
-import net.dpml.transit.model.PluginChangeEvent;
-import net.dpml.transit.model.PluginModel;
+import net.dpml.transit.model.CodeBaseListener;
+import net.dpml.transit.model.CodeBaseEvent;
+import net.dpml.transit.model.CodeBaseModel;
import net.dpml.transit.model.ProxyModel;
import net.dpml.transit.model.ProxyListener;
import net.dpml.transit.model.ProxyEvent;
@@ -173,7 +173,7 @@
/**
* The transit plugin listener.
*/
- private PluginListener m_listener;
+ private CodeBaseListener m_listener;

//------------------------------------------------------------------
// constructors
@@ -317,8 +317,8 @@
synchronized( m_listener )
{
ContentRegistryModel model = m_model.getContentRegistryModel();
- model.addPluginListener( m_listener );
- URI uri = model.getPluginURI();
+ model.addCodeBaseListener( m_listener );
+ URI uri = model.getCodeBaseURI();
if( null != uri )
{
setContentRegistry( model );
@@ -335,7 +335,7 @@
{
synchronized( m_registry )
{
- URI uri = model.getPluginURI();
+ URI uri = model.getCodeBaseURI();
if( null != uri )
{
m_logger.info( "loading custom content handler registry" );
@@ -383,8 +383,8 @@
synchronized( m_listener )
{
CacheModel model = m_model.getCacheModel();
- model.addPluginListener( m_listener );
- URI uri = model.getPluginURI();
+ model.addCodeBaseListener( m_listener );
+ URI uri = model.getCodeBaseURI();
if( null != uri )
{
setCacheHandler( model );
@@ -402,7 +402,7 @@
{
synchronized( m_cacheHandler )
{
- URI uri = model.getPluginURI();
+ URI uri = model.getCodeBaseURI();
if( null != uri )
{
m_logger.info( "loading custom cache handler" );
@@ -475,16 +475,16 @@
*
* @param manager the transit manager
*/
- private class TransitListener implements PluginListener
+ private class TransitListener implements CodeBaseListener
{
/**
* Notification of the change to a plugin uri assigned to a
sub-system.
* @param event a plugin change event
*/
- public void pluginChanged( PluginChangeEvent event )
+ public void codeBaseChanged( CodeBaseEvent event )
{
- PluginModel model = event.getPluginModel();
- URI uri = event.getPluginURI();
+ CodeBaseModel model = event.getCodeBaseModel();
+ URI uri = event.getCodeBaseURI();
if( getLogger().isDebugEnabled() )
{
final String message =

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/CacheHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/CacheHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/CacheHome.java
Tue Jun 14 18:55:57 2005
@@ -27,7 +27,7 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public interface CacheHome extends PluginHome
+public interface CacheHome extends CodeBaseHome
{
void setCacheDirectory( File cache );

Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/home/CodeBaseHome.java
(from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/home/PluginHome.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/PluginHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/CodeBaseHome.java
Tue Jun 14 18:55:57 2005
@@ -25,9 +25,9 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public interface PluginHome extends Home
+public interface CodeBaseHome extends Home
{
- URI getPluginURI();
+ URI getCodeBaseURI();

- void setPluginURI( URI uri );
+ void setCodeBaseURI( URI uri );
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentHome.java
Tue Jun 14 18:55:57 2005
@@ -23,7 +23,7 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public interface ContentHome extends PluginHome
+public interface ContentHome extends CodeBaseHome
{
void setTitle( String title );

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentRegistryHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentRegistryHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentRegistryHome.java
Tue Jun 14 18:55:57 2005
@@ -27,7 +27,7 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public interface ContentRegistryHome extends PluginHome
+public interface ContentRegistryHome extends CodeBaseHome
{
ContentModel createContentModel( String type );

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/HostHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/HostHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/HostHome.java
Tue Jun 14 18:55:57 2005
@@ -28,7 +28,7 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public interface HostHome extends PluginHome
+public interface HostHome extends CodeBaseHome
{
void setHostSettings(
URL base, URL index, boolean enabled, boolean trusted, LayoutModel
layout,

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutHome.java
Tue Jun 14 18:55:57 2005
@@ -23,7 +23,7 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public interface LayoutHome extends PluginHome
+public interface LayoutHome extends CodeBaseHome
{
void setTitle( String title );

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutRegistryHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutRegistryHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutRegistryHome.java
Tue Jun 14 18:55:57 2005
@@ -25,7 +25,7 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public interface LayoutRegistryHome extends PluginHome
+public interface LayoutRegistryHome extends CodeBaseHome
{
LayoutModel createLayoutModel( String id );
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/RepositoryHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/RepositoryHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/RepositoryHome.java
Tue Jun 14 18:55:57 2005
@@ -23,6 +23,6 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public interface RepositoryHome extends PluginHome
+public interface RepositoryHome extends CodeBaseHome
{
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java
Tue Jun 14 18:55:57 2005
@@ -26,7 +26,7 @@
* cache subsystem. Instances of CacheModel shall be supplied to cache
handler
* implementations as constructor arguments.
*/
-public interface CacheModel extends PluginModel, Disposable
+public interface CacheModel extends CodeBaseModel, Disposable
{
static final String CACHE_LOCATION_KEY = "dpml.transit.cache.location";
static final String CACHE_CLASS_KEY = "dpml.transit.cache.class";

Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/CodeBaseEvent.java
(from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginChangeEvent.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginChangeEvent.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/CodeBaseEvent.java
Tue Jun 14 18:55:57 2005
@@ -24,23 +24,23 @@
/**
* An event pertaining to the change in a plugin uri.
*/
-public class PluginChangeEvent extends EventObject
+public class CodeBaseEvent extends EventObject
{
private final URI m_plugin;

- public PluginChangeEvent( PluginModel source, URI plugin )
+ public CodeBaseEvent( CodeBaseModel source, URI plugin )
{
super( source );

m_plugin = plugin;
}

- public PluginModel getPluginModel()
+ public CodeBaseModel getCodeBaseModel()
{
- return (PluginModel) getSource();
+ return (CodeBaseModel) getSource();
}

- public URI getPluginURI()
+ public URI getCodeBaseURI()
{
return m_plugin;
}

Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/CodeBaseListener.java
(from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginListener.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginListener.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/CodeBaseListener.java
Tue Jun 14 18:55:57 2005
@@ -24,12 +24,12 @@
* Interface implemented by objects concerning with plugin
* bindings.
*/
-public interface PluginListener extends EventListener
+public interface CodeBaseListener extends EventListener
{
/**
* Notification of the change to a plugin uri assigned to a sub-system.
* @param event a plugin change event
*/
- void pluginChanged( PluginChangeEvent event );
+ void codeBaseChanged( CodeBaseEvent event );

}

Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/CodeBaseModel.java
(from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/PluginModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/CodeBaseModel.java
Tue Jun 14 18:55:57 2005
@@ -24,30 +24,30 @@
* A PluginModel maintains information about the configuration of
* a pluggable subsystem.
*/
-public interface PluginModel extends Model
+public interface CodeBaseModel extends Model
{
/**
* Return the uri of the plugin to be used for cache management.
* @return the cache handler plugin uri
*/
- URI getPluginURI();
+ URI getCodeBaseURI();

/**
* Set the plugin uri value.
* @param uri the plugin uri
*/
- void setPluginURI( URI uri );
+ void setCodeBaseURI( URI uri );

/**
- * Add a plugin listener to the director.
+ * Add a codebase listener to the model.
* @param listener the listener to add
*/
- void addPluginListener( PluginListener listener );
+ void addCodeBaseListener( CodeBaseListener listener );

/**
- * Remove a plugin listener from the director.
+ * Remove a codebase listener from the model.
* @param listener the listener to remove
*/
- void removePluginListener( PluginListener listener );
+ void removeCodeBaseListener( CodeBaseListener listener );

}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentModel.java
Tue Jun 14 18:55:57 2005
@@ -25,7 +25,7 @@
* of a content handler. Instances of ContentModel are used as
* constructor arguments to content handler plugins.
*/
-public interface ContentModel extends PluginModel, Disposable
+public interface ContentModel extends CodeBaseModel, Disposable
{
/**
* Return the immutable content type identifier.

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentRegistryModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentRegistryModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/ContentRegistryModel.java
Tue Jun 14 18:55:57 2005
@@ -26,7 +26,7 @@
* content registry subsystem. Instances of RegistryModel shall be supplied
to
* registry implementations as constructor arguments.
*/
-public interface ContentRegistryModel extends PluginModel
+public interface ContentRegistryModel extends CodeBaseModel
{
/**
* Return an array of content directors currently assigned to the
registry.

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
Tue Jun 14 18:55:57 2005
@@ -54,7 +54,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 DefaultCacheModel extends DefaultDisposablePluginModel
+public class DefaultCacheModel extends DisposableCodeBaseModel
implements CacheModel, DisposalListener
{
//
------------------------------------------------------------------------

Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCodeBaseModel.java
(from r2849,
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultPluginModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultPluginModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCodeBaseModel.java
Tue Jun 14 18:55:57 2005
@@ -27,7 +27,7 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;

-import net.dpml.transit.home.PluginHome;
+import net.dpml.transit.home.CodeBaseHome;

/**
* An abstract plugin manager is an implementation that monitors
configuration changes
@@ -38,13 +38,13 @@
* @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 abstract class DefaultPluginModel extends DefaultModel implements
PluginModel
+public abstract class DefaultCodeBaseModel extends DefaultModel implements
CodeBaseModel
{
//
------------------------------------------------------------------------
// state
//
------------------------------------------------------------------------

- private final PluginHome m_home;
+ private final CodeBaseHome m_home;

private URI m_uri;

@@ -52,7 +52,7 @@
// constructor
//
------------------------------------------------------------------------

- public DefaultPluginModel( Logger logger, Date creation, PluginHome
home, URI uri )
+ public DefaultCodeBaseModel( Logger logger, Date creation, CodeBaseHome
home, URI uri )
{
super( logger, creation );
m_uri = uri;
@@ -67,27 +67,27 @@
* Set the plugin uri value.
* @return the plugin uri
*/
- public void setPluginURI( URI uri )
+ public void setCodeBaseURI( URI uri )
{
- setPluginURI( uri, true );
+ setCodeBaseURI( uri, true );
}

/**
* Set the plugin uri value.
* @return the plugin uri
*/
- protected void setPluginURI( URI uri, boolean notify )
+ protected void setCodeBaseURI( URI uri, boolean notify )
{
synchronized( m_lock )
{
m_uri = uri;
if( m_home.isMutable() )
{
- m_home.setPluginURI( uri );
+ m_home.setCodeBaseURI( uri );
}
if( notify )
{
- PluginChangeEvent e = new PluginChangeEvent( this, m_uri );
+ CodeBaseEvent e = new CodeBaseEvent( this, m_uri );
super.enqueueEvent( e );
}
}
@@ -97,7 +97,7 @@
* Return the plugin uri.
* @return the plugin uri
*/
- public URI getPluginURI()
+ public URI getCodeBaseURI()
{
synchronized( m_lock )
{
@@ -106,19 +106,19 @@
}

/**
- * Add a plugin listener to the director.
+ * Add a codebase listener to the model.
* @param listener the listener to add
*/
- public void addPluginListener( PluginListener listener )
+ public void addCodeBaseListener( CodeBaseListener listener )
{
super.addListener( listener );
}

/**
- * Remove a plugin listener from the director.
+ * Remove a codebase listener from the model.
* @param listener the listener to remove
*/
- public void removePluginListener( PluginListener listener )
+ public void removeCodeBaseListener( CodeBaseListener listener )
{
super.removeListener( listener );
}
@@ -127,17 +127,17 @@
// internals
//
------------------------------------------------------------------------

- protected PluginHome getPluginHome()
+ protected CodeBaseHome getCodeBaseHome()
{
return m_home;
}

protected void processEvent( EventObject eventObject )
{
- if( eventObject instanceof PluginChangeEvent )
+ if( eventObject instanceof CodeBaseEvent )
{
- PluginChangeEvent event = (PluginChangeEvent) eventObject;
- processPluginChangeEvent( event );
+ CodeBaseEvent event = (CodeBaseEvent) eventObject;
+ processCodeBaseEvent( event );
}
else
{
@@ -145,23 +145,23 @@
}
}

- private void processPluginChangeEvent( PluginChangeEvent event )
+ private void processCodeBaseEvent( CodeBaseEvent event )
{
EventListener[] listeners = super.listeners();
for( int i=0; i<listeners.length; i++ )
{
EventListener listener = listeners[i];
- if( listener instanceof PluginListener )
+ if( listener instanceof CodeBaseListener )
{
- PluginListener pl = (PluginListener) listener;
+ CodeBaseListener pl = (CodeBaseListener) listener;
try
{
- pl.pluginChanged( event );
+ pl.codeBaseChanged( event );
}
catch( Throwable e )
{
final String error =
- "PluginListener notification error.";
+ "CodeBaseListener notification error.";
getLogger().error( error, e );
}
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
Tue Jun 14 18:55:57 2005
@@ -31,7 +31,7 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public class DefaultContentModel extends DefaultDisposablePluginModel
implements ContentModel
+public class DefaultContentModel extends DisposableCodeBaseModel implements
ContentModel
{
//----------------------------------------------------------------------
// state

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentRegistryModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentRegistryModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentRegistryModel.java
Tue Jun 14 18:55:57 2005
@@ -36,7 +36,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 DefaultContentRegistryModel extends DefaultPluginModel
+public class DefaultContentRegistryModel extends DisposableCodeBaseModel
implements ContentRegistryModel
{
//
------------------------------------------------------------------------

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
Tue Jun 14 18:55:57 2005
@@ -43,7 +43,7 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public class DefaultHostModel extends DefaultDisposablePluginModel
+public class DefaultHostModel extends DisposableCodeBaseModel
implements HostModel, DisposalListener
{
private final HostHome m_home;
@@ -90,7 +90,7 @@
if( strategy instanceof Plugin )
{
Plugin plugin = (Plugin) strategy;
- setPluginURI( plugin.getURI(), false );
+ setCodeBaseURI( plugin.getURI(), false );
m_bootstrap = false;
}
else
@@ -232,7 +232,7 @@
{
if( isBootstrap() )
{
- if( null != layout.getPluginURI() )
+ if( null != layout.getCodeBaseURI() )
{
final String error =
"Illegal attempt to assign a plugin based layout to a
bootstrap host."

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
Tue Jun 14 18:55:57 2005
@@ -32,7 +32,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 DefaultLayoutModel extends DefaultDisposablePluginModel
implements LayoutModel
+public class DefaultLayoutModel extends DisposableCodeBaseModel implements
LayoutModel
{
//----------------------------------------------------------------------
// state
@@ -62,7 +62,7 @@
if( strategy instanceof Plugin )
{
Plugin plugin = (Plugin) strategy;
- setPluginURI( plugin.getURI() );
+ setCodeBaseURI( plugin.getURI() );
m_classname = null;
m_bootstrap = false;
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutRegistryModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutRegistryModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutRegistryModel.java
Tue Jun 14 18:55:57 2005
@@ -40,7 +40,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 DefaultLayoutRegistryModel extends DefaultPluginModel
+public class DefaultLayoutRegistryModel extends DisposableCodeBaseModel
implements LayoutRegistryModel
{
//
------------------------------------------------------------------------

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultRepositoryModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultRepositoryModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultRepositoryModel.java
Tue Jun 14 18:55:57 2005
@@ -29,7 +29,7 @@
*
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public class DefaultRepositoryModel extends DefaultPluginModel implements
RepositoryModel
+public class DefaultRepositoryModel extends DisposableCodeBaseModel
implements RepositoryModel
{
public DefaultRepositoryModel( Logger logger, Date creation,
RepositoryHome home, URI uri )
{

Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DisposableCodeBaseModel.java
(from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultDisposablePluginModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultDisposablePluginModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DisposableCodeBaseModel.java
Tue Jun 14 18:55:57 2005
@@ -27,18 +27,18 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;

-import net.dpml.transit.home.PluginHome;
+import net.dpml.transit.home.CodeBaseHome;

/**
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
-public abstract class DefaultDisposablePluginModel extends
DefaultPluginModel implements Disposable
+public abstract class DisposableCodeBaseModel extends DefaultCodeBaseModel
implements Disposable
{
//
------------------------------------------------------------------------
// constructor
//
------------------------------------------------------------------------

- public DefaultDisposablePluginModel( Logger logger, Date creation,
PluginHome home, URI uri )
+ public DisposableCodeBaseModel( Logger logger, Date creation,
CodeBaseHome home, URI uri )
{
super( logger, creation, home, uri );
}
@@ -122,7 +122,7 @@

private static class VetoableDisposalEvent extends DisposalEvent
{
- public VetoableDisposalEvent( PluginModel source )
+ public VetoableDisposalEvent( CodeBaseModel source )
{
super( source );
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostModel.java
Tue Jun 14 18:55:57 2005
@@ -33,7 +33,7 @@
* synchronization via change events raised by implementations of this
* interface.
*/
-public interface HostModel extends PluginModel, Comparable, Disposable
+public interface HostModel extends CodeBaseModel, Comparable, Disposable
{
/**
* Return an immutable host identifier. The host identifier shall be

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/LayoutModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/LayoutModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/LayoutModel.java
Tue Jun 14 18:55:57 2005
@@ -24,7 +24,7 @@
* A LayoutModel maintains information about the configuration
* of a location resolver.
*/
-public interface LayoutModel extends PluginModel, Disposable
+public interface LayoutModel extends CodeBaseModel, Disposable
{
/**
* Return the immutable resolver identifier.

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/LayoutRegistryModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/LayoutRegistryModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/LayoutRegistryModel.java
Tue Jun 14 18:55:57 2005
@@ -24,7 +24,7 @@
* A LayoutRegistryModel maintains information about the configuration of
the Transit
* location resolver models.
*/
-public interface LayoutRegistryModel extends PluginModel
+public interface LayoutRegistryModel extends CodeBaseModel
{
/**
* Return the set of location resolver models.

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/RepositoryModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/RepositoryModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/RepositoryModel.java
Tue Jun 14 18:55:57 2005
@@ -24,6 +24,6 @@
* A RepositoryModel maintains information about the configuration of the
Transit
* repository service.
*/
-public interface RepositoryModel extends PluginModel
+public interface RepositoryModel extends CodeBaseModel
{
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
Tue Jun 14 18:55:57 2005
@@ -143,7 +143,7 @@
for( int i=0; i<hosts.length; i++ )
{
HostModel host = hosts[i];
- if( null == host.getPluginURI() )
+ if( null == host.getCodeBaseURI() )
{
String id = host.getID();
ResourceHost handler = createDefaultResourceHost( host );
@@ -281,7 +281,7 @@
for( int i=0; i<hosts.length; i++ )
{
HostModel host = hosts[i];
- if( null != host.getPluginURI() )
+ if( null != host.getCodeBaseURI() )
{
try
{
@@ -658,7 +658,7 @@
private ResourceHost createResourceHost( HostModel model )
throws UnknownHostException, TransitException, IOException
{
- URI uri = model.getPluginURI();
+ URI uri = model.getCodeBaseURI();
if( null == uri )
{
return createDefaultResourceHost( model );
@@ -688,7 +688,7 @@

protected Class loadResourceHostClass( HostModel model ) throws
TransitException
{
- URI uri = model.getPluginURI();
+ URI uri = model.getCodeBaseURI();
Class clazz = (Class) m_plugins.get( uri );
if( null != clazz )
{

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultContentRegistry.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultContentRegistry.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultContentRegistry.java
Tue Jun 14 18:55:57 2005
@@ -101,7 +101,7 @@
try
{
ContentModel model = m_model.getContentModel( type );
- if( null != model.getPluginURI() )
+ if( null != model.getCodeBaseURI() )
{
return getContentHandler( model );
}
@@ -129,7 +129,7 @@
synchronized( m_handlers )
{
ContentModel model = event.getContentModel();
- if( null != model.getPluginURI() )
+ if( null != model.getCodeBaseURI() )
{
try
{
@@ -140,7 +140,7 @@
final String error =
"Internal error while attempting to add a content
handler."
+ "\nContent Type: " + model.getContentType()
- + "\nPlugin URI: " + model.getPluginURI();
+ + "\nPlugin URI: " + model.getCodeBaseURI();
m_logger.error( error, e );
}
}
@@ -165,7 +165,7 @@
final String error =
"Internal error while attempting to remove a content
handler."
+ "\nContent Type: " + model.getContentType()
- + "\nPlugin URI: " + model.getPluginURI();
+ + "\nPlugin URI: " + model.getCodeBaseURI();
m_logger.error( error, e );
}
}
@@ -203,7 +203,7 @@

protected Class loadContentHandlerClass( ContentModel model ) throws
TransitException
{
- URI uri = model.getPluginURI();
+ URI uri = model.getCodeBaseURI();

Class clazz = (Class) m_plugins.get( uri );
if( null != clazz )

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultLayoutRegistry.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultLayoutRegistry.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultLayoutRegistry.java
Tue Jun 14 18:55:57 2005
@@ -142,7 +142,7 @@

protected Class loadLayoutClass( LayoutModel model ) throws
TransitException
{
- URI uri = model.getPluginURI();
+ URI uri = model.getCodeBaseURI();
Class clazz = (Class) m_plugins.get( uri );
if( null != clazz )
{

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CacheStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CacheStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CacheStorageUnit.java
Tue Jun 14 18:55:57 2005
@@ -45,7 +45,7 @@
* The LayoutRegistryHelper class provides support for the crreating of a
* ContentRegistryModel based on a supplied preferences node.
*/
-class CacheStorageUnit extends PluginStorageUnit implements CacheHome
+class CacheStorageUnit extends CodeBaseStorageUnit implements CacheHome
{
//
------------------------------------------------------------------------
// constructor

Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CodeBaseStorageUnit.java
(from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/unit/PluginStorageUnit.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/PluginStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CodeBaseStorageUnit.java
Tue Jun 14 18:55:57 2005
@@ -23,7 +23,7 @@
import java.util.prefs.BackingStoreException;
import java.util.Date;

-import net.dpml.transit.home.PluginHome;
+import net.dpml.transit.home.CodeBaseHome;
import net.dpml.transit.model.RepositoryModel;
import net.dpml.transit.model.ModificationListener;
import net.dpml.transit.model.ModificationEvent;
@@ -33,13 +33,13 @@
* The LayoutHelper class is responsible for the setup of initial factory
* default preference settings.
*/
-abstract class PluginStorageUnit extends AbstractStorageUnit implements
PluginHome
+abstract class CodeBaseStorageUnit extends AbstractStorageUnit implements
CodeBaseHome
{
//
------------------------------------------------------------------------
// constructor
//
------------------------------------------------------------------------

- PluginStorageUnit( Preferences prefs, Logger logger, Date creation,
boolean policy )
+ CodeBaseStorageUnit( Preferences prefs, Logger logger, Date creation,
boolean policy )
{
super( prefs, logger, creation, policy );
}
@@ -48,12 +48,12 @@
// PluginHome
//
------------------------------------------------------------------------

- public URI getPluginURI()
+ public URI getCodeBaseURI()
{
return getURI( "uri" );
}

- public void setPluginURI( URI uri )
+ public void setCodeBaseURI( URI uri )
{
setURI( "uri", uri );
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentRegistryStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentRegistryStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentRegistryStorageUnit.java
Tue Jun 14 18:55:57 2005
@@ -35,7 +35,7 @@
* The LayoutRegistryHelper class provides support for the crreating of a
* ContentRegistryModel based on a supplied preferences node.
*/
-class ContentRegistryStorageUnit extends PluginStorageUnit implements
ContentRegistryHome
+class ContentRegistryStorageUnit extends CodeBaseStorageUnit implements
ContentRegistryHome
{
//
------------------------------------------------------------------------
// constructor
@@ -96,7 +96,7 @@
list.add( manager );
}
ContentModel[] managers = (ContentModel[]) list.toArray( new
ContentModel[0] );
- URI uri = getPluginURI();
+ URI uri = getCodeBaseURI();
return new DefaultContentRegistryModel( logger, creation, this,
uri, managers );
}
catch( Exception e )

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentStorageUnit.java
Tue Jun 14 18:55:57 2005
@@ -33,7 +33,7 @@
* The ContentSorageUnit class is responsible for the setup of initial
factory
* default preference settings.
*/
-class ContentStorageUnit extends PluginStorageUnit implements ContentHome
+class ContentStorageUnit extends CodeBaseStorageUnit implements ContentHome
{
//
------------------------------------------------------------------------
// constructor
@@ -74,7 +74,7 @@
Preferences prefs = getPreferences();
Logger logger = getLogger();
Date creation = getCreationDate();
- URI uri = getPluginURI();
+ URI uri = getCodeBaseURI();
String type = prefs.name();
String title = prefs.get( "title", type );
return new DefaultContentModel( logger, creation, this, uri, type,
title );

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/HostStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/HostStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/HostStorageUnit.java
Tue Jun 14 18:55:57 2005
@@ -44,7 +44,7 @@
* The LayoutHelper class is responsible for the setup of initial factory
* default preference settings.
*/
-class HostStorageUnit extends PluginStorageUnit implements HostHome
+class HostStorageUnit extends CodeBaseStorageUnit implements HostHome
{
//
------------------------------------------------------------------------
// state
@@ -157,7 +157,7 @@
}
else
{
- URI uri = getPluginURI();
+ URI uri = getCodeBaseURI();
return new DefaultHostModel(
logger, creation, this, id,
new Plugin( uri ), base, index, name, trusted,
@@ -263,9 +263,9 @@
boolean enabled = model.getEnabled();
LayoutModel layout = model.getLayoutModel();
PasswordAuthentication auth = model.getAuthentication();
- URI uri = model.getPluginURI();
+ URI uri = model.getCodeBaseURI();

- setPluginURI( uri );
+ setCodeBaseURI( uri );
setURL( "base", base );
setURL( "index", index );
setTrusted( trusted );

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutRegistryStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutRegistryStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutRegistryStorageUnit.java
Tue Jun 14 18:55:57 2005
@@ -37,7 +37,7 @@
* The LayoutHelper class is responsible for the setup of initial factory
* default preference settings.
*/
-class LayoutRegistryStorageUnit extends PluginStorageUnit implements
LayoutRegistryHome
+class LayoutRegistryStorageUnit extends CodeBaseStorageUnit implements
LayoutRegistryHome
{
//
------------------------------------------------------------------------
// state
@@ -54,7 +54,7 @@
{
super( prefs, logger, creation, policy );

- URI uri = getPluginURI();
+ URI uri = getCodeBaseURI();
LayoutModel[] layouts = createLayoutModels();
m_manager = new DefaultLayoutRegistryModel( logger, creation, this,
uri, layouts );
}

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutStorageUnit.java
Tue Jun 14 18:55:57 2005
@@ -39,7 +39,7 @@
* The LayoutHelper class is responsible for the setup of initial factory
* default preference settings.
*/
-class LayoutStorageUnit extends PluginStorageUnit implements LayoutHome
+class LayoutStorageUnit extends CodeBaseStorageUnit implements LayoutHome
{
//
------------------------------------------------------------------------
// constructor
@@ -87,7 +87,7 @@
Preferences prefs = getPreferences();
Logger logger = getLogger();
Date creation = getCreationDate();
- URI uri = getPluginURI();
+ URI uri = getCodeBaseURI();
String id = prefs.name();
String title = prefs.get( "title", id );
if( null != uri )

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/RepositoryStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/RepositoryStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/RepositoryStorageUnit.java
Tue Jun 14 18:55:57 2005
@@ -34,7 +34,7 @@
* The LayoutHelper class is responsible for the setup of initial factory
* default preference settings.
*/
-class RepositoryStorageUnit extends PluginStorageUnit implements
RepositoryHome
+class RepositoryStorageUnit extends CodeBaseStorageUnit implements
RepositoryHome
{
//
------------------------------------------------------------------------
// constructor
@@ -55,7 +55,7 @@
Preferences prefs = getPreferences();
Logger logger = getLogger();
Date creation = getCreationDate();
- URI uri = getPluginURI();
+ URI uri = getCodeBaseURI();
return new DefaultRepositoryModel( logger, creation, this, uri );
}
}

svn commit: r2857 - in development/main: depot/console/src/main/net/dpml/depot/profile depot/prefs/src/main/net/dpml/depot/prefs test/unit/plus/src/test/net/dpml/test/acme/plus transit/core/handler/src/main/net/dpml/transit transit/core/handler/src/main/net/dpml/transit/home transit/core/handler/src/main/net/dpml/transit/model transit/core/handler/src/main/net/dpml/transit/runtime transit/core/handler/src/main/net/dpml/transit/unit, mcconnell, 06/14/2005