Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2631 - in development/main: magic/core/src/main/net/dpml/magic/tasks transit/core/handler/src/main/net/dpml/transit/manager transit/core/handler/src/main/net/dpml/transit/model transit/core/handler/src/test/net/dpml/transit/artifact transit/core/handler/src/test/net/dpml/transit/manager

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT dpml.net
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r2631 - in development/main: magic/core/src/main/net/dpml/magic/tasks transit/core/handler/src/main/net/dpml/transit/manager transit/core/handler/src/main/net/dpml/transit/model transit/core/handler/src/test/net/dpml/transit/artifact transit/core/handler/src/test/net/dpml/transit/manager
  • Date: Thu, 19 May 2005 15:41:25 +0000

Author: mcconnell AT dpml.net
Date: Thu May 19 15:41:23 2005
New Revision: 2631

Removed:
development/main/transit/core/handler/src/test/net/dpml/transit/artifact/
Modified:

development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java

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

development/main/transit/core/handler/src/test/net/dpml/transit/manager/TransitManagerTestCase.java
Log:
bumping and tweaking

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
Thu May 19 15:41:23 2005
@@ -344,8 +344,8 @@
junit.addConfiguredSysproperty( work );

final Environment.Variable testBaseDir = new Environment.Variable();
- testBaseDir .setKey( "project.test.dir" );
- testBaseDir .setValue( working.toString() );
+ testBaseDir.setKey( "project.test.dir" );
+ testBaseDir.setValue( working.toString() );
junit.addConfiguredSysproperty( testBaseDir );

final Environment.Variable basedir = new Environment.Variable();

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
Thu May 19 15:41:23 2005
@@ -46,15 +46,11 @@
private final List m_list = new LinkedList();
private File m_cache;

- public CacheManager( Logger logger, URI uri, File cache, HostModel[]
hosts )
+ public CacheManager( Logger logger, File cache, HostModel boot )
{
- super( logger, uri );
+ super( logger, null );
m_cache = cache;
- for( int i=0; i<hosts.length; i++ )
- {
- HostModel d = hosts[i];
- m_list.add( d );
- }
+ m_list.add( boot );
}

public void setCacheModel( File dir )

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
Thu May 19 15:41:23 2005
@@ -43,19 +43,37 @@
{
private final String m_id;

+ private String m_name;
+ private URL m_base;
+ private URL m_index;
+ private boolean m_enabled = true;
+ private boolean m_trusted = false;
+ private Authenticator m_authenticator;
+ private URI m_resolver;
+ private boolean m_available = false;
+
public HostManager( Logger logger, String id )
{
- this( logger, id, null );
+ this( logger, null, id );
+ }
+
+ public HostManager( Logger logger, URI plugin, String id )
+ {
+ this( logger, plugin, id, null );
}

- public HostManager( Logger logger, String id, URI uri )
+ public HostManager( Logger logger, URI plugin, String id, Map features )
{
- super( logger, uri );
+ super( logger, plugin );
if( null == id )
{
throw new NullPointerException( "id" );
}
m_id = id;
+ if( null != features )
+ {
+ setFeatures( features, false );
+ }
}

public void setPluginURI( URI uri )
@@ -69,7 +87,82 @@

public void setFeatures( Map map )
{
- throw new UnsupportedOperationException( "setFeatures/0" );
+ setFeatures( map, true );
+ }
+
+ private void setFeatures( Map map, boolean notify )
+ {
+ synchronized( this ) // prevent access during batch update
+ {
+ String name = m_name;
+ URL base = m_base;
+ URL index = m_index;
+ boolean enabled = m_enabled;
+ boolean trusted = m_trusted;
+ Authenticator authenticator = m_authenticator;
+ URI resolver = m_resolver;
+
+ String[] keys = (String[]) map.keySet().toArray( new String[0] );
+ for( int i=0; i<keys.length; i++ )
+ {
+ String key = keys[i];
+ try
+ {
+ if( "name".equals( key ) )
+ {
+ m_name = (String) map.get( key );
+ }
+ else if( "base".equals( key ) )
+ {
+ m_base = (URL) map.get( key );
+ }
+ else if( "index".equals( key ) )
+ {
+ m_index = (URL) map.get( key );
+ }
+ else if( "enabled".equals( key ) )
+ {
+ m_enabled = ((Boolean)map.get( key )).booleanValue();
+ }
+ else if( "trusted".equals( key ) )
+ {
+ m_trusted = ((Boolean)map.get( key )).booleanValue();
+ }
+ else if( "authenticator".equals( key ) )
+ {
+ m_authenticator = (Authenticator) map.get( key );
+ }
+ else if( "resolver".equals( key ) )
+ {
+ m_resolver = (URI) map.get( key );
+ }
+ }
+ catch( Throwable e )
+ {
+ m_name = name;
+ m_base = base;
+ m_index = index;
+ m_enabled = enabled;
+ m_trusted = trusted;
+ m_authenticator = authenticator;
+ m_resolver = resolver;
+
+ final String error =
+ "Unexpected error while handling client supplied
feature map."
+ + "\nKey: " + key;
+ throw new IllegalArgumentException( error );
+ }
+ }
+
+ // TODO: construct a set of keys that correspond to changed
values
+
+ m_available = m_base != null;
+ if( notify )
+ {
+ HostChangeEvent event = new HostChangeEvent( this, keys );
+ super.enqueueEvent( event );
+ }
+ }
}

//----------------------------------------------------------------------
@@ -78,7 +171,7 @@

/**
* Return an immutable host identifier. The host identifier shall be
- * guranteed to be unique and constant for the life of the director.
+ * guranteed to be unique and constant for the life of the model.
*/
public String getID()
{
@@ -86,12 +179,27 @@
}

/**
+ * Return the available status.
+ * @return TRUE if available
+ */
+ public boolean getAvailable()
+ {
+ synchronized( this )
+ {
+ return m_available;
+ }
+ }
+
+ /**
* Return the name of the resource host. The value returned may be used
to uniquely
* identify the host within the set of managed hosts.
*/
public String getHostName()
{
- throw new UnsupportedOperationException( "getHostName/0" );
+ synchronized( this )
+ {
+ return m_name;
+ }
}

/**
@@ -100,16 +208,22 @@
*/
public URL getBaseURL()
{
- throw new UnsupportedOperationException( "getBaseURL/0" );
+ synchronized( this )
+ {
+ return m_base;
+ }
}

/**
* Return index url.
* @return the index url
*/
- public String getIndexURL()
+ public URL getIndexURL()
{
- throw new UnsupportedOperationException( "getIndexURL/0" );
+ synchronized( this )
+ {
+ return m_index;
+ }
}

/**
@@ -118,7 +232,10 @@
*/
public boolean getEnabled()
{
- throw new UnsupportedOperationException( "getEnabled/0" );
+ synchronized( this )
+ {
+ return m_enabled;
+ }
}

/**
@@ -127,7 +244,10 @@
*/
public boolean getTrusted()
{
- throw new UnsupportedOperationException( "getTrusted/0" );
+ synchronized( this )
+ {
+ return m_trusted;
+ }
}

/**
@@ -136,7 +256,10 @@
*/
public Authenticator getAuthenticator()
{
- throw new UnsupportedOperationException( "getAuthenticator/0" );
+ synchronized( this )
+ {
+ return m_authenticator;
+ }
}

/**
@@ -145,11 +268,14 @@
*/
public URI getLocationResolverPluginURI()
{
- throw new UnsupportedOperationException( "getAuthenticator/0" );
+ synchronized( this )
+ {
+ return m_resolver;
+ }
}

/**
- * Add a host change listener to the director.
+ * Add a host change listener to the model.
* @param listener the host change listener to add
*/
public void addHostListener( HostListener listener )
@@ -158,7 +284,7 @@
}

/**
- * Remove a host change listener from the director.
+ * Remove a host change listener from the model.
* @param listener the host change listener to remove
*/
public void removeHostListener( HostListener listener )

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
Thu May 19 15:41:23 2005
@@ -43,14 +43,14 @@
{
private final List m_list = new LinkedList();

- public RegistryManager( Logger logger, URI uri, ContentModel[] content )
+ public RegistryManager( Logger logger )
+ {
+ this( logger, null );
+ }
+
+ public RegistryManager( Logger logger, URI uri )
{
super( logger, uri );
- for( int i=0; i<content.length; i++ )
- {
- ContentModel c = content[i];
- m_list.add( c );
- }
}

public void setPluginURI( URI uri )

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
Thu May 19 15:41:23 2005
@@ -50,6 +50,14 @@
String getID();

/**
+ * Return the available status. A host model may declare itself as
unavailable
+ * if its data model is incomplete or inconsitent.
+ *
+ * @return TRUE if available
+ */
+ public boolean getAvailable();
+
+ /**
* Return the name of the resource host. The value returned may be used
to uniquely
* identify the host within the set of managed hosts.
*/
@@ -65,7 +73,7 @@
* Return index url.
* @return the index url
*/
- String getIndexURL();
+ URL getIndexURL();

/**
* Return the enabled status of the host.

Modified:
development/main/transit/core/handler/src/test/net/dpml/transit/manager/TransitManagerTestCase.java
==============================================================================
---
development/main/transit/core/handler/src/test/net/dpml/transit/manager/TransitManagerTestCase.java
(original)
+++
development/main/transit/core/handler/src/test/net/dpml/transit/manager/TransitManagerTestCase.java
Thu May 19 15:41:23 2005
@@ -18,16 +18,48 @@

package net.dpml.transit.manager;

+import java.io.File;
+import java.util.logging.Logger;
+
import junit.framework.TestCase;

+import net.dpml.transit.model.RepositoryModel;
+import net.dpml.transit.model.CacheModel;
+import net.dpml.transit.model.RegistryModel;
+
+
/**
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
*/
public class TransitManagerTestCase extends TestCase
{
+ private RepositoryManager m_repository;
+ private RegistryManager m_registry;
+ private CacheManager m_cache;
+ private TransitManager m_manager;
+
+ public void setUp() throws Exception
+ {
+ String testPath = System.getProperty( "basedir" );
+
+ File cache = new File( "target/test/cache" );
+ Logger logger = Logger.getLogger( "test" );
+ m_repository = new RepositoryManager( logger );
+ m_registry = new RegistryManager( logger );
+ File localDir = new File( "target/test/local" );
+ HostManager local = new HostManager( logger, "local" );
+ m_cache = new CacheManager( logger, cache, local );
+ m_manager = new TransitManager( m_cache, m_registry, m_repository );
+ }
+
public void testTransitManager()
{
- // TODO
+ RepositoryModel repository = m_manager.getRepositoryModel();
+ assertEquals( "repository", m_repository, repository );
+ RegistryModel registry = m_manager.getContentRegistryModel();
+ assertEquals( "registry", m_registry, registry );
+ CacheModel cache = m_manager.getCacheModel();
+ assertEquals( "cache", m_cache, cache );
}
}




  • svn commit: r2631 - in development/main: magic/core/src/main/net/dpml/magic/tasks transit/core/handler/src/main/net/dpml/transit/manager transit/core/handler/src/main/net/dpml/transit/model transit/core/handler/src/test/net/dpml/transit/artifact transit/core/handler/src/test/net/dpml/transit/manager, mcconnell, 05/19/2005

Archive powered by MHonArc 2.6.24.

Top of Page