Skip to Content.
Sympa Menu

notify-dpml - r1989 - in trunk/main/transit/core/src: main/dpml/transit main/dpml/transit/artifact main/dpml/transit/info main/dpml/transit/link main/dpml/transit/local main/dpml/util main/net/dpml/transit main/net/dpml/util test/net/dpml/transit/test

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1989 - in trunk/main/transit/core/src: main/dpml/transit main/dpml/transit/artifact main/dpml/transit/info main/dpml/transit/link main/dpml/transit/local main/dpml/util main/net/dpml/transit main/net/dpml/util test/net/dpml/transit/test
  • Date: Tue, 24 Apr 2007 19:52:48 +0200

Author: mcconnell
Date: 2007-04-24 19:52:45 +0200 (Tue, 24 Apr 2007)
New Revision: 1989

Modified:
trunk/main/transit/core/src/main/dpml/transit/DefaultCacheHandler.java
trunk/main/transit/core/src/main/dpml/transit/DefaultResourceHost.java
trunk/main/transit/core/src/main/dpml/transit/DelegatingAuthenticator.java
trunk/main/transit/core/src/main/dpml/transit/NetworkLoader.java
trunk/main/transit/core/src/main/dpml/transit/StandardLinkManager.java
trunk/main/transit/core/src/main/dpml/transit/TransitContext.java
trunk/main/transit/core/src/main/dpml/transit/artifact/Handler.java
trunk/main/transit/core/src/main/dpml/transit/info/CacheDirective.java
trunk/main/transit/core/src/main/dpml/transit/info/TransitDirective.java
trunk/main/transit/core/src/main/dpml/transit/info/TransitEncoder.java
trunk/main/transit/core/src/main/dpml/transit/link/LinkURLConnection.java
trunk/main/transit/core/src/main/dpml/transit/local/LocalURLConnection.java
trunk/main/transit/core/src/main/dpml/util/ConfigurationHandler.java
trunk/main/transit/core/src/main/dpml/util/ElementHelper.java
trunk/main/transit/core/src/main/dpml/util/Main.java
trunk/main/transit/core/src/main/dpml/util/ObjectUtils.java
trunk/main/transit/core/src/main/dpml/util/StandardClassLoader.java
trunk/main/transit/core/src/main/dpml/util/SystemClassLoader.java
trunk/main/transit/core/src/main/net/dpml/transit/ContentHandler.java

trunk/main/transit/core/src/main/net/dpml/transit/LinkNotFoundException.java
trunk/main/transit/core/src/main/net/dpml/transit/Transit.java
trunk/main/transit/core/src/main/net/dpml/util/Resolver.java

trunk/main/transit/core/src/test/net/dpml/transit/test/ArtifactTestCase.java
Log:
checkstyle updates in the transit package

Modified:
trunk/main/transit/core/src/main/dpml/transit/DefaultCacheHandler.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/DefaultCacheHandler.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/DefaultCacheHandler.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -25,24 +25,19 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Properties;
import java.util.Date;
import java.util.Iterator;
-import java.util.Map;
import java.util.Hashtable;
-import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.Comparator;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;

import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.management.MBeanException;

import net.dpml.transit.Artifact;
import net.dpml.transit.CacheManager;
@@ -69,6 +64,8 @@
*/
class DefaultCacheHandler implements Cache, CacheManager
{
+ private static final File TRANSIT_DATA = DATA;
+
//
------------------------------------------------------------------------
// state
//
------------------------------------------------------------------------

Modified:
trunk/main/transit/core/src/main/dpml/transit/DefaultResourceHost.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/DefaultResourceHost.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/DefaultResourceHost.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -21,16 +21,12 @@

import dpml.util.PropertyResolver;

-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
+import dpml.transit.info.HostDirective;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.PrintWriter;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
@@ -45,15 +41,18 @@
import java.util.HashSet;
import java.util.Properties;

+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
import net.dpml.transit.Artifact;
import net.dpml.transit.HostManager;
import net.dpml.transit.Layout;
import net.dpml.transit.TransitException;
-import net.dpml.transit.Transit;
import net.dpml.transit.Monitor;

-import dpml.transit.info.HostDirective;
-
import net.dpml.util.Logger;

import static net.dpml.transit.Transit.DATA;
@@ -66,6 +65,10 @@
*/
class DefaultResourceHost implements Host, HostManager, Comparable<Host>
{
+ static
+ {
+ final File data = DATA; // static initialization
+ }
//
------------------------------------------------------------------------
// state
//
------------------------------------------------------------------------

Modified:
trunk/main/transit/core/src/main/dpml/transit/DelegatingAuthenticator.java
===================================================================
---
trunk/main/transit/core/src/main/dpml/transit/DelegatingAuthenticator.java
2007-04-24 16:43:19 UTC (rev 1988)
+++
trunk/main/transit/core/src/main/dpml/transit/DelegatingAuthenticator.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -19,15 +19,12 @@

package dpml.transit;

-import java.io.PrintWriter;
import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

-import net.dpml.transit.Transit;
-
/**
* Internal class used to handle delegated authentication.
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>

Modified: trunk/main/transit/core/src/main/dpml/transit/NetworkLoader.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/NetworkLoader.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/NetworkLoader.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -29,7 +29,6 @@
import net.dpml.transit.ArtifactException;
import net.dpml.transit.Monitor;
import net.dpml.transit.TransitException;
-import net.dpml.transit.Transit;

/**
* Nework loader utility.

Modified:
trunk/main/transit/core/src/main/dpml/transit/StandardLinkManager.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/StandardLinkManager.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/StandardLinkManager.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -183,6 +183,9 @@
}
}

+ /**
+ * URI holder class.
+ */
private static final class URIHolder
{
private final URI m_uri;

Modified: trunk/main/transit/core/src/main/dpml/transit/TransitContext.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/TransitContext.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/TransitContext.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -22,7 +22,6 @@
import java.lang.management.ManagementFactory;
import java.net.PasswordAuthentication;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.Properties;
import java.util.Hashtable;
import java.util.ArrayList;
@@ -30,23 +29,18 @@

import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.management.MBeanException;

import net.dpml.util.Logger;
import dpml.util.DefaultLogger;

-import net.dpml.transit.Artifact;
import net.dpml.transit.Transit;
import net.dpml.transit.TransitManager;
import net.dpml.transit.LinkManager;
-import net.dpml.transit.TransitError;
import net.dpml.transit.TransitException;
import net.dpml.transit.Layout;
import net.dpml.transit.Monitor;
import net.dpml.transit.ContentHandler;
-import net.dpml.transit.ContentManager;

-import dpml.transit.info.TransitDirective;
import dpml.transit.info.ProxyDirective;
import dpml.transit.info.CacheDirective;
import dpml.transit.info.TransitDirective;
@@ -128,7 +122,7 @@
* Return the singleton context.
* @return the secure context
*/
- public synchronized static TransitContext getInstance()
+ public static synchronized TransitContext getInstance()
{
if( null == m_CONTEXT )
{

Modified: trunk/main/transit/core/src/main/dpml/transit/artifact/Handler.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/artifact/Handler.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/artifact/Handler.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -22,7 +22,6 @@
import dpml.util.DefaultLogger;

import java.io.IOException;
-import java.io.PrintWriter;

import java.net.URL;
import java.net.URLConnection;

Modified:
trunk/main/transit/core/src/main/dpml/transit/info/CacheDirective.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/info/CacheDirective.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/info/CacheDirective.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Stephen J. McConnell.
+ * Copyright 2005-2007 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -205,13 +205,9 @@
{
return false;
}
- else if( !Arrays.equals( m_hosts, directive.m_hosts ) )
- {
- return false;
- }
else
{
- return true;
+ return Arrays.equals( m_hosts, directive.m_hosts );
}
}
else

Modified:
trunk/main/transit/core/src/main/dpml/transit/info/TransitDirective.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/info/TransitDirective.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/info/TransitDirective.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Stephen J. McConnell.
+ * Copyright 2005-2007 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@
* Utility method to load a transit configuration from XML.
* @param url the url identifying the configuration source
* @return the configuration directive
- * @exception Exception if an error occurs during configuration loading
+ * @exception IOException if an error occurs during configuration loading
*/
public static TransitDirective decode( URL url ) throws IOException
{
@@ -60,7 +60,7 @@
* output stream.
* @param directive the transit directive to externalize
* @param stream the output stream
- * @exception Exception if an error occurs
+ * @exception IOException if an IO error occurs
*/
public static void encode(
TransitDirective directive, OutputStream stream ) throws IOException

Modified:
trunk/main/transit/core/src/main/dpml/transit/info/TransitEncoder.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/info/TransitEncoder.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/info/TransitEncoder.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -18,26 +18,13 @@

package dpml.transit.info;

-import dpml.util.ElementHelper;
-
-import java.net.URL;
-import java.net.URLConnection;
-import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;

-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import net.dpml.util.Logger;

-import org.xml.sax.ErrorHandler;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-
/**
* Utility class supporting the writing of Transit directives to XML.
*

Modified:
trunk/main/transit/core/src/main/dpml/transit/link/LinkURLConnection.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/transit/link/LinkURLConnection.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/transit/link/LinkURLConnection.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -31,7 +31,6 @@

import net.dpml.transit.Transit;
import net.dpml.transit.Artifact;
-import net.dpml.transit.UnsupportedSchemeException;
import net.dpml.transit.LinkManager;

/**

Modified:
trunk/main/transit/core/src/main/dpml/transit/local/LocalURLConnection.java
===================================================================
---
trunk/main/transit/core/src/main/dpml/transit/local/LocalURLConnection.java
2007-04-24 16:43:19 UTC (rev 1988)
+++
trunk/main/transit/core/src/main/dpml/transit/local/LocalURLConnection.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -26,7 +26,6 @@
import java.io.OutputStream;
import java.io.FileOutputStream;
import java.io.File;
-import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.security.AccessController;

Modified: trunk/main/transit/core/src/main/dpml/util/ConfigurationHandler.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/util/ConfigurationHandler.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/util/ConfigurationHandler.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -28,8 +28,6 @@
import java.util.Properties;
import java.util.logging.LogManager;

-import net.dpml.transit.Transit;
-
import static net.dpml.transit.Transit.DATA;

/**
@@ -39,6 +37,8 @@
*/
public class ConfigurationHandler
{
+ private static final File TRANSIT_DATA = DATA;
+
/**
* Creation of the logging controller.
*/

Modified: trunk/main/transit/core/src/main/dpml/util/ElementHelper.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/util/ElementHelper.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/util/ElementHelper.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -22,8 +22,6 @@
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Properties;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;

Modified: trunk/main/transit/core/src/main/dpml/util/Main.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/util/Main.java 2007-04-24
16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/util/Main.java 2007-04-24
17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Stephen J. McConnell.
+ * Copyright 2005-2007 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,12 +19,7 @@
package dpml.util;

import dpml.transit.StandardMonitor;
-import dpml.util.DefaultLogger;
-import dpml.util.PropertyResolver;
-import dpml.util.CLIHelper;
-import dpml.util.PID;

-import java.io.File;
import java.net.URI;
import java.net.URL;
import java.rmi.RMISecurityManager;
@@ -50,6 +45,11 @@
*/
public final class Main
{
+ static
+ {
+ final String version = VERSION; // trigger static field
initialization
+ }
+
private static Main m_MAIN;
private static final PID PROCESS_ID = new PID();

@@ -230,7 +230,7 @@
if( Artifact.isRecognized( uri ) )
{
URL url = Artifact.toURL( uri );
- Tool tool = (Tool) url.getContent( new Class[]{ Tool.class }
);
+ Tool tool = (Tool) url.getContent( new Class[]{Tool.class} );
if( null == tool )
{
final String error =

Modified: trunk/main/transit/core/src/main/dpml/util/ObjectUtils.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/util/ObjectUtils.java 2007-04-24
16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/util/ObjectUtils.java 2007-04-24
17:52:45 UTC (rev 1989)
@@ -24,7 +24,7 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public class ObjectUtils
+public final class ObjectUtils
{
private ObjectUtils()
{

Modified: trunk/main/transit/core/src/main/dpml/util/StandardClassLoader.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/util/StandardClassLoader.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/util/StandardClassLoader.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 Stephen J. McConnell
+ * Copyright (c) 2005-2007 Stephen J. McConnell
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -323,12 +323,22 @@
buffer.append( "\n" );
}

+ /**
+ * Return a string representation of a classloader.
+ * @param clazz the class identifying the classloaderto decode
+ * @return the string representation
+ */
public static String toString( Class clazz )
{
ClassLoader anchor = clazz.getClassLoader();
return toString( anchor );
}

+ /**
+ * Return a string representation of a classloader.
+ * @param anchor the anchor classloader
+ * @return the string representation
+ */
public static String toString( ClassLoader anchor )
{
StringBuffer buffer = new StringBuffer();
@@ -340,6 +350,12 @@
return buffer.toString();
}

+ /**
+ * Return a string representation of two classloaders up to the comomon
classloader
+ * @param primary the primary class
+ * @param secondary the secondary class
+ * @return the string representation
+ */
public static String toString( Class primary, Class secondary )
{
if( null == primary )

Modified: trunk/main/transit/core/src/main/dpml/util/SystemClassLoader.java
===================================================================
--- trunk/main/transit/core/src/main/dpml/util/SystemClassLoader.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/dpml/util/SystemClassLoader.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Stephen J. McConnell.
+ * Copyright 2005-2007 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@

package dpml.util;

-import dpml.util.DefaultLogger;
-
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -30,7 +28,6 @@
import net.dpml.util.Logger;

import net.dpml.transit.Transit;
-import net.dpml.transit.LinkManager;

/**
* The SystemClassLoader is a URLClassLoader that supports late binding of

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/ContentHandler.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/ContentHandler.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/net/dpml/transit/ContentHandler.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Stephen McConnell.
+ * Copyright 2006-2007 Stephen McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,11 +18,6 @@

package net.dpml.transit;

-import java.io.IOException;
-import java.net.URLConnection;
-
-import net.dpml.transit.ContentManager;
-
/**
* Abstract base class for artifact content handler.
*

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/LinkNotFoundException.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/LinkNotFoundException.java
2007-04-24 16:43:19 UTC (rev 1988)
+++
trunk/main/transit/core/src/main/net/dpml/transit/LinkNotFoundException.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2005 Stephen J. McConnell.
+ * Copyright 2004-2007 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@

import java.net.URI;

-import net.dpml.transit.ArtifactNotFoundException;
-
/**
* Exception to indicate that a link could not be located.
*

Modified: trunk/main/transit/core/src/main/net/dpml/transit/Transit.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/Transit.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/net/dpml/transit/Transit.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2006 Stephen McConnell.
+ * Copyright 2004-2007 Stephen McConnell.
* Copyright 2004-2005 Niclas Hedhman.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,20 +21,14 @@

import dpml.util.DefaultLogger;

-import dpml.transit.*;
+import dpml.transit.TransitContext;
+import dpml.transit.info.TransitDirective;

import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.FileNotFoundException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
import java.net.URI;
import java.net.URL;

-import dpml.transit.info.TransitDirective;
-
import net.dpml.util.Logger;

/**
@@ -194,7 +188,7 @@
* @return the singleton transit instance
* @exception TransitError if an error occurs during establishment
*/
- public synchronized static Transit getInstance() throws TransitError
+ public static synchronized Transit getInstance() throws TransitError
{
if( null == m_INSTANCE )
{
@@ -322,6 +316,7 @@

/**
* Return the content handler fo the supplied content type.
+ * @param type the content handler type
* @return the content handler or null if no content handler found
*/
public ContentHandler getContentHandler( String type )

Modified: trunk/main/transit/core/src/main/net/dpml/util/Resolver.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/util/Resolver.java
2007-04-24 16:43:19 UTC (rev 1988)
+++ trunk/main/transit/core/src/main/net/dpml/util/Resolver.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Stephen J. McConnell.
+ * Copyright 2006-2007 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@

package net.dpml.util;

-import java.net.URI;
-import java.net.URISyntaxException;
-
/**
* Interace implemented by a value (key, ref, and property) resolver.
*
@@ -30,22 +27,6 @@
public interface Resolver
{
/**
- * Utility function supporting resolution of uris containing 'resource'
or
- * 'alias' schemes. If the supplied uri scheme is 'resource' or 'alias'
the
- * reference is resolved to a artifact type, group and name from which a
- * resource is resolved and the uri returned. If the scheme is resource
- * the usi of the resource is returned. If the scheme is 'alias' a
- * link alias is returned. If the scheme is not 'resource' or 'alias'
- * the argument will be evaluated as a normal transit artifact uri
- * specification.
- *
- * @param ref the uri argument
- * @return the uri value
- * @exception URISyntaxException if an error occurs during uri creation
- */
- //URI toURI( String ref ) throws URISyntaxException;
-
- /**
* Return a property value.
* @param key the property key
* @return the property value

Modified:
trunk/main/transit/core/src/test/net/dpml/transit/test/ArtifactTestCase.java
===================================================================
---
trunk/main/transit/core/src/test/net/dpml/transit/test/ArtifactTestCase.java
2007-04-24 16:43:19 UTC (rev 1988)
+++
trunk/main/transit/core/src/test/net/dpml/transit/test/ArtifactTestCase.java
2007-04-24 17:52:45 UTC (rev 1989)
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2006 Stephen J. McConnell.
+ * Copyright 2004-2007 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@

package net.dpml.transit.test;

-import java.net.URI;
-
import junit.framework.TestCase;

import net.dpml.transit.layout.ClassicLayout;




  • r1989 - in trunk/main/transit/core/src: main/dpml/transit main/dpml/transit/artifact main/dpml/transit/info main/dpml/transit/link main/dpml/transit/local main/dpml/util main/net/dpml/transit main/net/dpml/util test/net/dpml/transit/test, mcconnell at BerliOS, 04/24/2007

Archive powered by MHonArc 2.6.24.

Top of Page