notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2860 - in development/main/depot: console/src/main/net/dpml/depot console/src/main/net/dpml/depot/profile prefs/src/main/net/dpml/depot/prefs station/src/main/net/dpml/depot/station

From: mcconnell AT dpml.net
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2860 - in development/main/depot: console/src/main/net/dpml/depot console/src/main/net/dpml/depot/profile prefs/src/main/net/dpml/depot/prefs station/src/main/net/dpml/depot/station
Date: Tue, 14 Jun 2005 21:22:56 -0400

Author: mcconnell AT dpml.net
Date: Tue Jun 14 21:22:56 2005
New Revision: 2860

Modified:
development/main/depot/console/src/main/net/dpml/depot/Main.java

development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfile.java
development/main/depot/console/src/main/net/dpml/depot/profile/Profile.java

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

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

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

development/main/depot/station/src/main/net/dpml/depot/station/CodeBaseProfile.java

development/main/depot/station/src/main/net/dpml/depot/station/CodeBaseStorage.java
Log:
sync with transit

Modified: development/main/depot/console/src/main/net/dpml/depot/Main.java
==============================================================================
--- development/main/depot/console/src/main/net/dpml/depot/Main.java
(original)
+++ development/main/depot/console/src/main/net/dpml/depot/Main.java Tue
Jun 14 21:22:56 2005
@@ -230,7 +230,7 @@
Connection connection = profile.getConnection();
Registry registry = getRegistry( connection );

- URI uri = profile.getURI();
+ URI uri = profile.getCodeBaseURI();
try
{
TransitModel model = loadTransitModel( args, logger );

Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfile.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfile.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfile.java
Tue Jun 14 21:22:56 2005
@@ -32,7 +32,6 @@
public class ApplicationProfile extends Profile
{
private boolean m_enabled;
- private URI m_uri;
private boolean m_command;
private Connection m_connection;

@@ -47,9 +46,8 @@
Logger logger, Date creation, ProfileHome home, String id, String
title,
Properties properties, boolean command, Connection connection, URI
uri, boolean enabled )
{
- super( logger, creation, home, id, title, properties );
+ super( logger, creation, home, id, title, properties, uri );

- m_uri = uri;
m_enabled = enabled;
m_connection = connection;
m_command = command;
@@ -69,16 +67,6 @@
m_enabled = value;
}

- public URI getURI()
- {
- return m_uri;
- }
-
- public void setURI( URI uri )
- {
- m_uri = uri;
- }
-
public boolean getCommandPolicy()
{
return m_command;

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
Tue Jun 14 21:22:56 2005
@@ -24,18 +24,15 @@
import java.util.EventObject;
import java.util.EventListener;

-import net.dpml.transit.home.Home;
import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.DefaultModel;
+import net.dpml.transit.model.DisposableCodeBaseModel;
import net.dpml.transit.model.Disposable;
-import net.dpml.transit.model.DisposalEvent;
-import net.dpml.transit.model.DisposalListener;

/**
* A ProfileModel maintains information about the configuration
* of an application profile.
*/
-public class Profile extends DefaultModel implements Disposable
+public class Profile extends DisposableCodeBaseModel
{
private final ProfileHome m_home;
private final String m_id;
@@ -44,9 +41,10 @@
private Properties m_properties;

public Profile(
- Logger logger, Date creation, ProfileHome home, String id, String
title, Properties properties )
+ Logger logger, Date creation, ProfileHome home, String id, String
title,
+ Properties properties, URI uri )
{
- super( logger, creation );
+ super( logger, creation, home, uri );

m_id = id;
m_title = title;
@@ -83,86 +81,12 @@
// Disposable
//----------------------------------------------------------------------

- /**
- * Add a disposal listener to the model.
- * @param listener the listener to add
- */
- public void addDisposalListener( DisposalListener listener )
- {
- super.addListener( listener );
- }
-
- /**
- * Remove a disposal listener from the model.
- * @param listener the listener to remove
- */
- public void removeDisposalListener( DisposalListener listener )
- {
- super.removeListener( listener );
- }
-
public void dispose()
{
- VetoableDisposalEvent veto = new VetoableDisposalEvent( this );
- enqueueEvent( veto, false );
- DisposalEvent disposal = new DisposalEvent( this );
- enqueueEvent( disposal, false );
+ super.dispose();
if( null != m_home )
{
m_home.remove();
}
}
-
- protected void processEvent( EventObject event )
- {
- if( event instanceof DisposalEvent )
- {
- processDisposalEvent( (DisposalEvent) event );
- }
- else
- {
- super.processEvent( event );
- }
- }
-
- private void processDisposalEvent( DisposalEvent eventObject )
- {
- DisposalEvent event = (DisposalEvent) eventObject;
- EventListener[] listeners = listeners();
- for( int i=0; i<listeners.length; i++ )
- {
- EventListener listener = listeners[i];
- if( listener instanceof DisposalListener )
- {
- DisposalListener pl = (DisposalListener) listener;
- if( event instanceof VetoableDisposalEvent )
- {
- pl.disposing( event );
- }
- else
- {
- try
- {
- pl.disposed( event );
- }
- catch( Throwable e )
- {
- final String error =
- "Disposal listener notification error.";
- getLogger().error( error, e );
- }
- }
- }
- }
- }
-
- private static class VetoableDisposalEvent extends DisposalEvent
- {
- public VetoableDisposalEvent( Profile source )
- {
- super( source );
- }
- }
-
-
}

Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/ProfileHome.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/ProfileHome.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/ProfileHome.java
Tue Jun 14 21:22:56 2005
@@ -18,13 +18,13 @@

package net.dpml.depot.profile;

-import net.dpml.transit.home.Home;
+import net.dpml.transit.home.CodeBaseHome;
import net.dpml.transit.home.Removable;

/**
* A ProxyListener maintains information about the configuration of
* tranist proxy settings.
*/
-public interface ProfileHome extends Home, Removable
+public interface ProfileHome extends CodeBaseHome, Removable
{
}

Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/ProfileStorage.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/ProfileStorage.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/ProfileStorage.java
Tue Jun 14 21:22:56 2005
@@ -28,12 +28,12 @@
import net.dpml.transit.home.Home;
import net.dpml.transit.home.Removable;
import net.dpml.transit.model.Logger;
-import net.dpml.transit.unit.AbstractStorageUnit;
+import net.dpml.transit.unit.CodeBaseStorageUnit;

/**
* A ProfileHome maintains a persistent application profile.
*/
-public abstract class ProfileStorage extends AbstractStorageUnit implements
ProfileHome
+public abstract class ProfileStorage extends CodeBaseStorageUnit implements
ProfileHome
{
//
------------------------------------------------------------------------
// constructor

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ApplicationProfilePanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ApplicationProfilePanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ApplicationProfilePanel.java
Tue Jun 14 21:22:56 2005
@@ -381,7 +381,7 @@

private String getBasePath()
{
- URI base = m_profile.getURI();
+ URI base = m_profile.getCodeBaseURI();
if( null == base )
{
return "";

Modified:
development/main/depot/station/src/main/net/dpml/depot/station/CodeBaseProfile.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/station/CodeBaseProfile.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/station/CodeBaseProfile.java
Tue Jun 14 21:22:56 2005
@@ -39,16 +39,14 @@
public abstract class CodeBaseProfile extends Profile
{
private String m_classname;
- private URI m_uri;

public CodeBaseProfile(
Logger logger, Date creation, ProfileHome home, String id, String
title,
Properties properties, URI uri, String classname )
throws ProfileException
{
- super( logger, creation, home, id, title, properties );
+ super( logger, creation, home, id, title, properties, uri );

- m_uri = uri;
m_classname = classname;
}

@@ -61,15 +59,4 @@
{
m_classname = classname;
}
-
- public URI getCodeBaseURI()
- {
- return m_uri;
- }
-
- public void setCodeBaseURI( URI uri )
- {
- m_uri = uri;
- }
-
}

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
Tue Jun 14 21:22:56 2005
@@ -47,33 +47,6 @@
super( prefs, logger, creation, policy );
}

- protected URI getCodeBaseURI() throws ProfileException
- {
- Preferences prefs = getPreferences();
- String path = prefs.get( "uri", null );
- if( null != path )
- {
- try
- {
- return new URI( path );
- }
- catch( URISyntaxException e )
- {
- final String error =
- "Activation profile contains an invaid uri value."
- + "\nURI: " + path;
- throw new ProfileException( error, e );
- }
- }
- else
- {
- final String error =
- "Activation profile does not declare a codesource uri
attribute."
- + "\nPreferences: " + prefs;
- throw new ProfileException( error );
- }
- }
-
protected String getClassname() throws ProfileException
{
Preferences prefs = getPreferences();

svn commit: r2860 - in development/main/depot: console/src/main/net/dpml/depot console/src/main/net/dpml/depot/profile prefs/src/main/net/dpml/depot/prefs station/src/main/net/dpml/depot/station, mcconnell, 06/14/2005