notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
svn commit: r2832 - in development/main: depot/console/src/main/net/dpml/depot/profile depot/prefs/src/main/net/dpml/depot/prefs depot/station/src/main/net/dpml/depot/station metro/composition/content/src/main/net/dpml/composition/content test/plugins/layout/src/main/net/dpml/test/layout transit/core/handler/src/main/net/dpml/transit transit/core/handler/src/main/net/dpml/transit/artifact transit/core/handler/src/main/net/dpml/transit/cache transit/core/handler/src/main/net/dpml/transit/content transit/core/handler/src/main/net/dpml/transit/layout transit/core/handler/src/main/net/dpml/transit/manager 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 transit/core/handler/src/test/net/dpml/transit/test
- From: mcconnell AT dpml.net
- To: notify-dpml AT lists.ibiblio.org
- Subject: svn commit: r2832 - in development/main: depot/console/src/main/net/dpml/depot/profile depot/prefs/src/main/net/dpml/depot/prefs depot/station/src/main/net/dpml/depot/station metro/composition/content/src/main/net/dpml/composition/content test/plugins/layout/src/main/net/dpml/test/layout transit/core/handler/src/main/net/dpml/transit transit/core/handler/src/main/net/dpml/transit/artifact transit/core/handler/src/main/net/dpml/transit/cache transit/core/handler/src/main/net/dpml/transit/content transit/core/handler/src/main/net/dpml/transit/layout transit/core/handler/src/main/net/dpml/transit/manager 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 transit/core/handler/src/test/net/dpml/transit/test
- Date: Mon, 13 Jun 2005 03:10:16 -0400
Author: mcconnell AT dpml.net
Date: Mon Jun 13 03:10:16 2005
New Revision: 2832
Added:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultCacheModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultContentModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentRegistryModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultContentRegistryModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultDisposablePluginModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultDisposablePluginModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultHostModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultLayoutModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutRegistryModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultLayoutRegistryModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultPluginModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultPluginModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultProxyModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultProxyModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultRepositoryModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultRepositoryModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultTransitModel.java
- copied, changed from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultTransitModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/
- copied from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/CacheHandler.java
- copied, changed from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/CacheHandler.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ClassicLayout.java
- copied, changed from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/ClassicLayout.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ContentRegistry.java
- copied, changed from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/content/ContentRegistry.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
- copied, changed from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/DefaultCacheHandler.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultContentRegistry.java
- copied, changed from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/content/DefaultContentRegistry.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultLayoutRegistry.java
- copied, changed from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/DefaultLayoutRegistry.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultResourceHost.java
- copied, changed from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/DefaultResourceHost.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/EclipseLayout.java
- copied, changed from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/EclipseLayout.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/Layout.java
- copied, changed from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/Layout.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/LayoutRegistry.java
- copied, changed from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/LayoutRegistry.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ResourceHost.java
- copied, changed from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/ResourceHost.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ZipCache.java
- copied, changed from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/ZipCache.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/package.html
- copied unchanged from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/package.html
Removed:
development/main/transit/core/handler/src/main/net/dpml/transit/cache/
development/main/transit/core/handler/src/main/net/dpml/transit/content/
development/main/transit/core/handler/src/main/net/dpml/transit/layout/
development/main/transit/core/handler/src/main/net/dpml/transit/manager/
Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/BootstrapProfile.java
development/main/depot/console/src/main/net/dpml/depot/profile/DepotModel.java
development/main/depot/console/src/main/net/dpml/depot/profile/Profile.java
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheModelPanel.java
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryModelPanel.java
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryModelPanel.java
development/main/depot/station/src/main/net/dpml/depot/station/CodeBaseStorage.java
development/main/depot/station/src/main/net/dpml/depot/station/StationProfile.java
development/main/depot/station/src/main/net/dpml/depot/station/StationStorage.java
development/main/metro/composition/content/src/main/net/dpml/composition/content/CompositionContentHandlerRegistry.java
development/main/test/plugins/layout/src/main/net/dpml/test/layout/DemoLayout.java
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
development/main/transit/core/handler/src/main/net/dpml/transit/Transit.java
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactURLConnection.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/ProxyStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/RepositoryStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitPreferences.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitStorageUnit.java
development/main/transit/core/handler/src/test/net/dpml/transit/test/ArtifactTestCase.java
development/main/transit/core/handler/src/test/net/dpml/transit/test/MimeHandlerTestCase.java
Log:
More tightening up of the Transit API including merging of the management an
model classes under the model package namespace and merging of layout, and
cache under the runtime namespect.
Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/BootstrapProfile.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/BootstrapProfile.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/BootstrapProfile.java
Mon Jun 13 03:10:16 2005
@@ -23,7 +23,7 @@
import java.util.Properties;
import net.dpml.transit.model.Logger;
-import net.dpml.transit.manager.DefaultModel;
+import net.dpml.transit.model.DefaultModel;
import net.dpml.transit.home.Home;
/**
Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/DepotModel.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/DepotModel.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/DepotModel.java
Mon Jun 13 03:10:16 2005
@@ -26,7 +26,7 @@
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.manager.DefaultModel;
+import net.dpml.transit.model.DefaultModel;
/**
* A ProfileModel maintains information about the configuration
Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/Profile.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/Profile.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/Profile.java
Mon Jun 13 03:10:16 2005
@@ -25,7 +25,7 @@
import net.dpml.transit.home.Home;
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.ModificationEvent;
-import net.dpml.transit.manager.DefaultModel;
+import net.dpml.transit.model.DefaultModel;
/**
* A ProfileModel maintains information about the configuration
Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheModelPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheModelPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheModelPanel.java
Mon Jun 13 03:10:16 2005
@@ -53,7 +53,7 @@
import net.dpml.transit.model.LayoutRegistryModel;
import net.dpml.transit.model.HostModel;
import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.cache.CacheHandler;
+import net.dpml.transit.runtime.CacheHandler;
/**
* Runnable plugin that handles DPML environment setup.
Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryModelPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryModelPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryModelPanel.java
Mon Jun 13 03:10:16 2005
@@ -49,8 +49,7 @@
import javax.swing.table.TableColumnModel;
import net.dpml.transit.Transit;
-import net.dpml.transit.util.ExceptionHelper;
-import net.dpml.transit.content.ContentRegistry;
+import net.dpml.transit.runtime.ContentRegistry;
import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.model.ContentModel;
import net.dpml.transit.model.UnknownKeyException;
@@ -191,8 +190,8 @@
"Unexpected error while attempting to handle the
'Controller' action. "
+ "\nCODEBASE: "
+
getClass().getProtectionDomain().getCodeSource().getLocation().toString();
- String message = ExceptionHelper.packException( error, e,
true );
- System.err.println( message );
+ Logger logger = Logger.getLogger( "depot.prefs" );
+ logger.log( Level.SEVERE, error, e );
}
}
}
Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryModelPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryModelPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryModelPanel.java
Mon Jun 13 03:10:16 2005
@@ -46,8 +46,8 @@
import javax.swing.table.TableColumnModel;
import net.dpml.transit.Transit;
-import net.dpml.transit.layout.LayoutRegistry;
-import net.dpml.transit.layout.Layout;
+import net.dpml.transit.runtime.Layout;
+import net.dpml.transit.runtime.LayoutRegistry;
import net.dpml.transit.model.LayoutRegistryModel;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutModel;
Modified:
development/main/depot/station/src/main/net/dpml/depot/station/CodeBaseStorage.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/station/CodeBaseStorage.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/station/CodeBaseStorage.java
Mon Jun 13 03:10:16 2005
@@ -28,7 +28,6 @@
import net.dpml.transit.home.Home;
import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.depot.profile.PluginProfile;
import net.dpml.depot.profile.ProfileException;
Modified:
development/main/depot/station/src/main/net/dpml/depot/station/StationProfile.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/station/StationProfile.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/station/StationProfile.java
Mon Jun 13 03:10:16 2005
@@ -24,7 +24,7 @@
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.manager.DefaultModel;
+import net.dpml.transit.model.DefaultModel;
import net.dpml.transit.home.Home;
import net.dpml.depot.profile.ProfileException;
Modified:
development/main/depot/station/src/main/net/dpml/depot/station/StationStorage.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/station/StationStorage.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/station/StationStorage.java
Mon Jun 13 03:10:16 2005
@@ -28,7 +28,6 @@
import net.dpml.transit.model.Logger;
import net.dpml.transit.home.Home;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.unit.AbstractStorageUnit;
import net.dpml.depot.profile.ProfileException;
@@ -100,32 +99,6 @@
}
//
------------------------------------------------------------------------
- // ModificationListener
- //
------------------------------------------------------------------------
-
- /**
- * Notify a listener of a change to the manager modification date.
- * @param event the modification event
- */
- public void modified( ModificationEvent event )
- {
- if( getStoragePolicy() )
- {
- try
- {
- StationProfile manager = (StationProfile) event.getModel();
- Date date = new Date();
- store( manager );
- manager.setCreationDate( date );
- }
- catch( Throwable e )
- {
- getLogger().error( "storage failure", e );
- }
- }
- }
-
- //
------------------------------------------------------------------------
// utils
//
------------------------------------------------------------------------
Modified:
development/main/metro/composition/content/src/main/net/dpml/composition/content/CompositionContentHandlerRegistry.java
==============================================================================
---
development/main/metro/composition/content/src/main/net/dpml/composition/content/CompositionContentHandlerRegistry.java
(original)
+++
development/main/metro/composition/content/src/main/net/dpml/composition/content/CompositionContentHandlerRegistry.java
Mon Jun 13 03:10:16 2005
@@ -29,7 +29,7 @@
import net.dpml.transit.model.ContentModel;
import net.dpml.transit.model.DuplicateKeyException;
import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.content.DefaultContentRegistry;
+import net.dpml.transit.runtime.DefaultContentRegistry;
/**
* A registry of descriptions of plugable content handlers. This
implementation
Modified:
development/main/test/plugins/layout/src/main/net/dpml/test/layout/DemoLayout.java
==============================================================================
---
development/main/test/plugins/layout/src/main/net/dpml/test/layout/DemoLayout.java
(original)
+++
development/main/test/plugins/layout/src/main/net/dpml/test/layout/DemoLayout.java
Mon Jun 13 03:10:16 2005
@@ -19,7 +19,7 @@
package net.dpml.test.layout;
import net.dpml.transit.artifact.Artifact;
-import net.dpml.transit.layout.Layout;
+import net.dpml.transit.runtime.Layout;
/**
* A layout manager used to vaidate plugin layout handlers in Transit.
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
Mon Jun 13 03:10:16 2005
@@ -20,16 +20,8 @@
import net.dpml.lang.NullArgumentException;
-import net.dpml.transit.cache.CacheHandler;
-import net.dpml.transit.cache.DefaultCacheHandler;
-import net.dpml.transit.content.ContentRegistry;
-import net.dpml.transit.content.DefaultContentRegistry;
import net.dpml.transit.link.FileLinkManager;
import net.dpml.transit.link.LinkManager;
-import net.dpml.transit.layout.Layout;
-import net.dpml.transit.layout.LayoutRegistry;
-import net.dpml.transit.layout.DefaultLayoutRegistry;
-import net.dpml.transit.layout.ClassicLayout;
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.CacheModel;
import net.dpml.transit.model.TransitModel;
@@ -47,6 +39,14 @@
import net.dpml.transit.network.TransitAuthenticatorImpl;
import net.dpml.transit.repository.Repository;
import net.dpml.transit.repository.StandardLoader;
+import net.dpml.transit.runtime.CacheHandler;
+import net.dpml.transit.runtime.DefaultCacheHandler;
+import net.dpml.transit.runtime.ContentRegistry;
+import net.dpml.transit.runtime.DefaultContentRegistry;
+import net.dpml.transit.runtime.Layout;
+import net.dpml.transit.runtime.LayoutRegistry;
+import net.dpml.transit.runtime.DefaultLayoutRegistry;
+import net.dpml.transit.runtime.ClassicLayout;
import net.dpml.transit.util.Util;
import java.io.File;
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/Transit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/Transit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/Transit.java
Mon Jun 13 03:10:16 2005
@@ -44,7 +44,7 @@
import net.dpml.transit.home.TransitHome;
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.TransitModel;
-import net.dpml.transit.manager.DefaultTransitModel;
+import net.dpml.transit.model.DefaultTransitModel;
import net.dpml.transit.unit.TransitStorageUnit;
/**
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
Mon Jun 13 03:10:16 2005
@@ -33,14 +33,14 @@
import net.dpml.transit.Transit;
import net.dpml.transit.TransitException;
import net.dpml.transit.SecuredTransitContext;
-import net.dpml.transit.content.ContentRegistry;
-import net.dpml.transit.cache.CacheHandler;
-import net.dpml.transit.layout.ClassicLayout;
-import net.dpml.transit.layout.Layout;
-import net.dpml.transit.util.MimeTypeHandler;
-import net.dpml.transit.util.StreamUtils;
import net.dpml.transit.repository.Repository;
import net.dpml.transit.repository.Plugin;
+import net.dpml.transit.runtime.ContentRegistry;
+import net.dpml.transit.runtime.CacheHandler;
+import net.dpml.transit.runtime.ClassicLayout;
+import net.dpml.transit.runtime.Layout;
+import net.dpml.transit.util.MimeTypeHandler;
+import net.dpml.transit.util.StreamUtils;
/**
* Artifact URL protocol connection processor.
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultCacheModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultCacheModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.io.File;
import java.io.IOException;
@@ -44,29 +44,6 @@
import net.dpml.transit.TransitError;
import net.dpml.transit.home.CacheHome;
-import net.dpml.transit.model.CacheModel;
-import net.dpml.transit.model.LayoutModel;
-import net.dpml.transit.model.HostModel;
-import net.dpml.transit.model.PluginChangeEvent;
-import net.dpml.transit.model.PluginListener;
-import net.dpml.transit.model.CacheListener;
-import net.dpml.transit.model.FileChangeEvent;
-import net.dpml.transit.model.HostNodeEvent;
-import net.dpml.transit.model.HostChangeEvent;
-import net.dpml.transit.model.HostPriorityEvent;
-import net.dpml.transit.model.HostLayoutEvent;
-import net.dpml.transit.model.HostNameEvent;
-import net.dpml.transit.model.HostListener;
-import net.dpml.transit.model.ModelException;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.DisposalListener;
-import net.dpml.transit.model.DisposalEvent;
-import net.dpml.transit.model.VetoDisposalException;
-import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.ModelReferenceException;
import net.dpml.transit.util.PropertyResolver;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultContentModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultContentModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.net.URI;
import java.util.EventObject;
@@ -24,13 +24,6 @@
import java.util.Date;
import net.dpml.transit.home.ContentHome;
-import net.dpml.transit.model.ContentModel;
-import net.dpml.transit.model.PluginModel;
-import net.dpml.transit.model.PluginChangeEvent;
-import net.dpml.transit.model.ContentEvent;
-import net.dpml.transit.model.ContentListener;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.Logger;
/**
* Default implementation of a content manager that maintains an active
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentRegistryModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultContentRegistryModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultContentRegistryModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentRegistryModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.net.URI;
import java.util.Collections;
@@ -28,21 +28,6 @@
import java.util.EventListener;
import net.dpml.transit.home.ContentRegistryHome;
-import net.dpml.transit.model.ContentModel;
-import net.dpml.transit.model.ContentRegistryListener;
-import net.dpml.transit.model.ContentRegistryEvent;
-import net.dpml.transit.model.ContentRegistryModel;
-import net.dpml.transit.model.PluginChangeEvent;
-import net.dpml.transit.model.PluginListener;
-import net.dpml.transit.model.ModelException;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.ContentRegistryModel;
-import net.dpml.transit.model.ContentModel;
-import net.dpml.transit.model.ModelReferenceException;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.ModificationEvent;
/**
* Default implementation of a content handler registry manager that
maitains
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultDisposablePluginModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultDisposablePluginModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultDisposablePluginModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultDisposablePluginModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.net.URI;
import java.util.Date;
@@ -27,11 +27,6 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
-import net.dpml.transit.model.Disposable;
-import net.dpml.transit.model.DisposalListener;
-import net.dpml.transit.model.DisposalEvent;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.PluginModel;
import net.dpml.transit.home.PluginHome;
/**
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultHostModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultHostModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.io.IOException;
import java.util.Date;
@@ -31,25 +31,6 @@
import java.net.PasswordAuthentication;
import net.dpml.transit.home.HostHome;
-import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.HostChangeEvent;
-import net.dpml.transit.model.HostEvent;
-import net.dpml.transit.model.HostLayoutEvent;
-import net.dpml.transit.model.HostListener;
-import net.dpml.transit.model.HostModel;
-import net.dpml.transit.model.HostNameEvent;
-import net.dpml.transit.model.HostPriorityEvent;
-import net.dpml.transit.model.LayoutModel;
-import net.dpml.transit.model.LayoutListener;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.ModelException;
-import net.dpml.transit.model.PluginModel;
-import net.dpml.transit.model.PluginChangeEvent;
-import net.dpml.transit.model.BootstrapException;
-import net.dpml.transit.model.DisposalEvent;
-import net.dpml.transit.model.DisposalListener;
-import net.dpml.transit.model.VetoDisposalException;
import net.dpml.transit.network.RequestIdentifier;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultLayoutModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultLayoutModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.net.URI;
import java.util.EventObject;
@@ -24,17 +24,6 @@
import java.util.Date;
import net.dpml.transit.home.LayoutHome;
-import net.dpml.transit.model.LayoutModel;
-import net.dpml.transit.model.PluginModel;
-import net.dpml.transit.model.PluginChangeEvent;
-import net.dpml.transit.model.LayoutEvent;
-import net.dpml.transit.model.LayoutListener;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.ModificationEvent;
-import net.dpml.transit.manager.DefaultModel.Strategy;
-import net.dpml.transit.manager.DefaultModel.Plugin;
-import net.dpml.transit.manager.DefaultModel.Local;
/**
* Default implementation of a content manager that maintains an active
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutRegistryModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultLayoutRegistryModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultLayoutRegistryModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutRegistryModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.util.ArrayList;
import java.util.Date;
@@ -32,20 +32,6 @@
import java.net.URI;
import net.dpml.transit.home.LayoutRegistryHome;
-import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.LayoutModel;
-import net.dpml.transit.model.PluginChangeEvent;
-import net.dpml.transit.model.LayoutRegistryListener;
-import net.dpml.transit.model.LayoutRegistryEvent;
-import net.dpml.transit.model.PluginListener;
-import net.dpml.transit.model.ModelException;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.ModelReferenceException;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.ModificationEvent;
-import net.dpml.transit.model.VetoDisposalException;
/**
* Default implementation of a layout subsystem that maitains
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.net.URI;
import java.util.Date;
@@ -28,14 +28,6 @@
import java.util.WeakHashMap;
import net.dpml.transit.home.Home;
-import net.dpml.transit.model.Model;
-import net.dpml.transit.model.ModificationEvent;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.Model;
-import net.dpml.transit.model.DisposalEvent;
-import net.dpml.transit.model.DisposalListener;
-import net.dpml.transit.model.VetoDisposalException;
/**
* A abstract base class that established an event queue and handles event
dispatch
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultPluginModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultPluginModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultPluginModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultPluginModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.net.URI;
import java.util.Date;
@@ -27,12 +27,6 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
-import net.dpml.transit.model.PluginModel;
-import net.dpml.transit.model.PluginChangeEvent;
-import net.dpml.transit.model.PluginListener;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.PluginModel;
-
import net.dpml.transit.home.PluginHome;
/**
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultProxyModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultProxyModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultProxyModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultProxyModel.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.io.File;
import java.io.IOException;
@@ -26,13 +26,6 @@
import java.net.PasswordAuthentication;
import java.net.URL;
-import net.dpml.transit.model.ProxyModel;
-import net.dpml.transit.model.ProxyListener;
-import net.dpml.transit.model.ProxyEvent;
-import net.dpml.transit.model.ModelException;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.ModificationListener;
-
import net.dpml.transit.home.ProxyHome;
import net.dpml.transit.network.RequestIdentifier;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultRepositoryModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultRepositoryModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultRepositoryModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultRepositoryModel.java
Mon Jun 13 03:10:16 2005
@@ -16,15 +16,13 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.net.URI;
import java.util.EventObject;
import java.util.Date;
import net.dpml.transit.home.RepositoryHome;
-import net.dpml.transit.model.RepositoryModel;
-import net.dpml.transit.model.Logger;
/**
* Default implementation of a pluggable repository model.
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultTransitModel.java
(from r2830,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultTransitModel.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/DefaultTransitModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultTransitModel.java
Mon Jun 13 03:10:16 2005
@@ -16,21 +16,12 @@
* limitations under the License.
*/
-package net.dpml.transit.manager;
+package net.dpml.transit.model;
import java.util.Date;
import java.util.EventObject;
import net.dpml.transit.home.TransitHome;
-import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.TransitModel;
-import net.dpml.transit.model.CacheModel;
-import net.dpml.transit.model.ContentRegistryModel;
-import net.dpml.transit.model.RepositoryModel;
-import net.dpml.transit.model.ProxyModel;
-import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.ModificationEvent;
/**
* The DefaultTransitManager class maintains an active configuration of the
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/CacheHandler.java
(from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/CacheHandler.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/cache/CacheHandler.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/CacheHandler.java
Mon Jun 13 03:10:16 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-package net.dpml.transit.cache;
+package net.dpml.transit.runtime;
import net.dpml.lang.NullArgumentException;
import net.dpml.transit.SecuredTransitContext;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ClassicLayout.java
(from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/ClassicLayout.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/layout/ClassicLayout.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ClassicLayout.java
Mon Jun 13 03:10:16 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-package net.dpml.transit.layout;
+package net.dpml.transit.runtime;
import net.dpml.transit.artifact.Artifact;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ContentRegistry.java
(from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/content/ContentRegistry.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/content/ContentRegistry.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ContentRegistry.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.content;
+package net.dpml.transit.runtime;
import java.io.IOException;
import java.net.ContentHandler;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
(from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/DefaultCacheHandler.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/cache/DefaultCacheHandler.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
Mon Jun 13 03:10:16 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-package net.dpml.transit.cache;
+package net.dpml.transit.runtime;
import java.io.BufferedInputStream;
import java.io.File;
@@ -34,12 +34,6 @@
import java.util.Properties;
import java.util.TreeMap;
import java.util.WeakHashMap;
-import java.util.prefs.Preferences;
-import java.util.prefs.PreferenceChangeListener;
-import java.util.prefs.PreferenceChangeEvent;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.NodeChangeListener;
-import java.util.prefs.NodeChangeEvent;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -51,9 +45,6 @@
import net.dpml.transit.artifact.Artifact;
import net.dpml.transit.artifact.ArtifactAlreadyExistsException;
import net.dpml.transit.artifact.ArtifactNotFoundException;
-import net.dpml.transit.layout.Layout;
-import net.dpml.transit.layout.LayoutRegistry;
-import net.dpml.transit.layout.DefaultLayoutRegistry;
import net.dpml.transit.model.CacheModel;
import net.dpml.transit.model.CacheListener;
import net.dpml.transit.model.Logger;
@@ -69,10 +60,7 @@
import net.dpml.transit.util.Util;
/**
- * Default cache handler that maintains a file based cache. The handler
registers a
- * listener on the CacheHandler preferences node to listen for changes
related to
- * cache configuration, and another listener for changes to subsidiary node
changes
- * reflecting the addition, modification and removal of hosts.
+ * Default cache handler that maintains a file based cache.
*/
public class DefaultCacheHandler implements CacheHandler, CacheListener,
Handler
{
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultContentRegistry.java
(from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/content/DefaultContentRegistry.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/content/DefaultContentRegistry.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultContentRegistry.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.content;
+package net.dpml.transit.runtime;
import java.io.IOException;
import java.net.URI;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultLayoutRegistry.java
(from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/DefaultLayoutRegistry.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/layout/DefaultLayoutRegistry.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultLayoutRegistry.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.layout;
+package net.dpml.transit.runtime;
import java.io.IOException;
import java.net.URI;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultResourceHost.java
(from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/DefaultResourceHost.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/cache/DefaultResourceHost.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultResourceHost.java
Mon Jun 13 03:10:16 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-package net.dpml.transit.cache;
+package net.dpml.transit.runtime;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
@@ -48,19 +48,16 @@
import java.util.HashMap;
import java.util.HashSet;
+import net.dpml.transit.Handler;
import net.dpml.transit.Transit;
import net.dpml.transit.TransitException;
import net.dpml.transit.artifact.Artifact;
-import net.dpml.transit.layout.ClassicLayout;
-import net.dpml.transit.layout.LayoutRegistry;
-import net.dpml.transit.layout.Layout;
import net.dpml.transit.network.ConnectionCache;
import net.dpml.transit.network.DelegatingAuthenticator;
import net.dpml.transit.network.NetworkLoader;
import net.dpml.transit.network.RequestIdentifier;
import net.dpml.transit.network.TransitAuthenticator;
import net.dpml.transit.network.TransitAuthenticatorImpl;
-import net.dpml.transit.Handler;
import net.dpml.transit.model.HostModel;
import net.dpml.transit.model.HostListener;
import net.dpml.transit.model.HostNameEvent;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/EclipseLayout.java
(from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/EclipseLayout.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/layout/EclipseLayout.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/EclipseLayout.java
Mon Jun 13 03:10:16 2005
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-package net.dpml.transit.layout;
+package net.dpml.transit.runtime;
import net.dpml.transit.artifact.Artifact;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/Layout.java
(from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/Layout.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/layout/Layout.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/Layout.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.layout;
+package net.dpml.transit.runtime;
import net.dpml.transit.artifact.Artifact;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/LayoutRegistry.java
(from r2828,
development/main/transit/core/handler/src/main/net/dpml/transit/layout/LayoutRegistry.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/layout/LayoutRegistry.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/LayoutRegistry.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.layout;
+package net.dpml.transit.runtime;
import java.io.IOException;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ResourceHost.java
(from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/ResourceHost.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/cache/ResourceHost.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ResourceHost.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.cache;
+package net.dpml.transit.runtime;
import net.dpml.transit.artifact.Artifact;
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ZipCache.java
(from r2831,
development/main/transit/core/handler/src/main/net/dpml/transit/cache/ZipCache.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/cache/ZipCache.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/ZipCache.java
Mon Jun 13 03:10:16 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.transit.cache;
+package net.dpml.transit.runtime;
import net.dpml.transit.artifact.Artifact;
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
Mon Jun 13 03:10:16 2005
@@ -26,7 +26,7 @@
import java.util.prefs.BackingStoreException;
import net.dpml.transit.home.CacheHome;
-import net.dpml.transit.manager.DefaultCacheModel;
+import net.dpml.transit.model.DefaultCacheModel;
import net.dpml.transit.model.CacheModel;
import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.model.LayoutModel;
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
Mon Jun 13 03:10:16 2005
@@ -24,7 +24,7 @@
import java.util.prefs.BackingStoreException;
import net.dpml.transit.home.ContentRegistryHome;
-import net.dpml.transit.manager.DefaultContentRegistryModel;
+import net.dpml.transit.model.DefaultContentRegistryModel;
import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.model.ContentModel;
import net.dpml.transit.model.ModificationEvent;
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
Mon Jun 13 03:10:16 2005
@@ -23,7 +23,7 @@
import java.util.prefs.BackingStoreException;
import net.dpml.transit.home.ContentHome;
-import net.dpml.transit.manager.DefaultContentModel;
+import net.dpml.transit.model.DefaultContentModel;
import net.dpml.transit.model.ContentModel;
import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.LayoutModel;
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
Mon Jun 13 03:10:16 2005
@@ -24,10 +24,10 @@
import java.util.prefs.BackingStoreException;
import java.net.PasswordAuthentication;
-import net.dpml.transit.manager.DefaultModel.Local;
-import net.dpml.transit.manager.DefaultModel.Plugin;
-import net.dpml.transit.manager.DefaultHostModel;
import net.dpml.transit.home.HostHome;
+import net.dpml.transit.model.DefaultModel.Local;
+import net.dpml.transit.model.DefaultModel.Plugin;
+import net.dpml.transit.model.DefaultHostModel;
import net.dpml.transit.model.HostModel;
import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.Logger;
@@ -38,6 +38,7 @@
import net.dpml.transit.model.DisposalEvent;
import net.dpml.transit.model.DisposalListener;
import net.dpml.transit.model.Model;
+import net.dpml.transit.runtime.DefaultResourceHost;
/**
* The LayoutHelper class is responsible for the setup of initial factory
@@ -49,8 +50,7 @@
// state
//
------------------------------------------------------------------------
- private static final String DEFAULT_HOST_CLASSNAME =
- "net.dpml.transit.host.DefaultResourceHost";
+ private static final String DEFAULT_HOST_CLASSNAME =
DefaultResourceHost.class.getName();
//
------------------------------------------------------------------------
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
Mon Jun 13 03:10:16 2005
@@ -26,7 +26,7 @@
import net.dpml.transit.home.LayoutHome;
import net.dpml.transit.home.LayoutRegistryHome;
-import net.dpml.transit.manager.DefaultLayoutRegistryModel;
+import net.dpml.transit.model.DefaultLayoutRegistryModel;
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutRegistryModel;
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
Mon Jun 13 03:10:16 2005
@@ -23,15 +23,16 @@
import java.util.prefs.BackingStoreException;
import net.dpml.transit.home.LayoutHome;
-import net.dpml.transit.manager.DefaultModel.Plugin;
-import net.dpml.transit.manager.DefaultModel.Local;
-import net.dpml.transit.manager.DefaultLayoutModel;
+import net.dpml.transit.model.DefaultModel.Plugin;
+import net.dpml.transit.model.DefaultModel.Local;
+import net.dpml.transit.model.DefaultLayoutModel;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.DisposalEvent;
import net.dpml.transit.model.DisposalListener;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.Logger;
+import net.dpml.transit.runtime.ClassicLayout;
/**
* The LayoutHelper class is responsible for the setup of initial factory
@@ -98,12 +99,20 @@
String classname = prefs.get( "classname", null );
if( null != classname )
{
+ // just temporarily
+ if( "net.dpml.transit.layout.ClassicLayout".equals(
classname ) )
+ {
+ prefs.put( "classname", ClassicLayout.class.getName() );
+ classname = ClassicLayout.class.getName();
+ }
+
Local local = new Local( classname, false );
return new DefaultLayoutModel( logger, creation, this, id,
local, title );
}
else
{
- Local local = new Local(
"net.dpml.transit.layout.ClassicLayout", false );
+ classname = ClassicLayout.class.getName();
+ Local local = new Local( classname, false );
return new DefaultLayoutModel( logger, creation, this, id,
local, title );
}
}
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ProxyStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ProxyStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ProxyStorageUnit.java
Mon Jun 13 03:10:16 2005
@@ -24,7 +24,7 @@
import java.util.Date;
import net.dpml.transit.home.ProxyHome;
-import net.dpml.transit.manager.DefaultProxyModel;
+import net.dpml.transit.model.DefaultProxyModel;
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.ProxyModel;
import net.dpml.transit.model.ModificationListener;
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
Mon Jun 13 03:10:16 2005
@@ -27,7 +27,7 @@
import net.dpml.transit.model.RepositoryModel;
import net.dpml.transit.model.ModificationListener;
import net.dpml.transit.model.ModificationEvent;
-import net.dpml.transit.manager.DefaultRepositoryModel;
+import net.dpml.transit.model.DefaultRepositoryModel;
import net.dpml.transit.model.Logger;
/**
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitPreferences.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitPreferences.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitPreferences.java
Mon Jun 13 03:10:16 2005
@@ -44,10 +44,10 @@
import net.dpml.transit.Transit;
import net.dpml.transit.TransitException;
-import net.dpml.transit.cache.CacheHandler;
-import net.dpml.transit.layout.Layout;
-import net.dpml.transit.layout.ClassicLayout;
-import net.dpml.transit.layout.EclipseLayout;
+import net.dpml.transit.runtime.Layout;
+import net.dpml.transit.runtime.ClassicLayout;
+import net.dpml.transit.runtime.EclipseLayout;
+import net.dpml.transit.runtime.CacheHandler;
import net.dpml.transit.util.Util;
import net.dpml.transit.model.CacheModel;
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitStorageUnit.java
Mon Jun 13 03:10:16 2005
@@ -40,7 +40,7 @@
import net.dpml.transit.model.RepositoryModel;
import net.dpml.transit.model.TransitModel;
-import net.dpml.transit.manager.DefaultTransitModel;
+import net.dpml.transit.model.DefaultTransitModel;
/**
Modified:
development/main/transit/core/handler/src/test/net/dpml/transit/test/ArtifactTestCase.java
==============================================================================
---
development/main/transit/core/handler/src/test/net/dpml/transit/test/ArtifactTestCase.java
(original)
+++
development/main/transit/core/handler/src/test/net/dpml/transit/test/ArtifactTestCase.java
Mon Jun 13 03:10:16 2005
@@ -19,8 +19,8 @@
package net.dpml.transit.test;
import junit.framework.TestCase;
-import net.dpml.transit.layout.ClassicLayout;
-import net.dpml.transit.layout.Layout;
+import net.dpml.transit.runtime.ClassicLayout;
+import net.dpml.transit.runtime.Layout;
import net.dpml.transit.artifact.Artifact;
/**
Modified:
development/main/transit/core/handler/src/test/net/dpml/transit/test/MimeHandlerTestCase.java
==============================================================================
---
development/main/transit/core/handler/src/test/net/dpml/transit/test/MimeHandlerTestCase.java
(original)
+++
development/main/transit/core/handler/src/test/net/dpml/transit/test/MimeHandlerTestCase.java
Mon Jun 13 03:10:16 2005
@@ -21,6 +21,7 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+
import net.dpml.transit.util.MimeTypeHandler;
public class MimeHandlerTestCase extends TestCase
- svn commit: r2832 - in development/main: depot/console/src/main/net/dpml/depot/profile depot/prefs/src/main/net/dpml/depot/prefs depot/station/src/main/net/dpml/depot/station metro/composition/content/src/main/net/dpml/composition/content test/plugins/layout/src/main/net/dpml/test/layout transit/core/handler/src/main/net/dpml/transit transit/core/handler/src/main/net/dpml/transit/artifact transit/core/handler/src/main/net/dpml/transit/cache transit/core/handler/src/main/net/dpml/transit/content transit/core/handler/src/main/net/dpml/transit/layout transit/core/handler/src/main/net/dpml/transit/manager 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 transit/core/handler/src/test/net/dpml/transit/test, mcconnell, 06/13/2005
Archive powered by MHonArc 2.6.24.