avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service DefaultRegistry.java Handler.java InvalidPathException.java Registry.java ServiceLocator.java ServiceManagementContext.java ServicePublisher.java ServiceURLConnection.java ServiceURLFactory.java UnknownServiceException.java
Date Thu, 09 Jan 2003 15:20:01 GMT
mcconnell    2003/01/09 07:20:00

  Modified:    merlin/src/java/org/apache/avalon/merlin/container
                        Container.java ContainerDescriptor.java
                        ContainerException.java ContainerLoader.java
                        ContainerRuntimeException.java
                        DefaultContainer.java DefaultContainer.xinfo
                        StateEvent.java StateListener.java
               merlin/src/java/org/apache/avalon/merlin/container/builder
                        ContainerBuilder.java ContainerCreator.java
                        XMLContainerCreator.java
               merlin/src/java/org/apache/avalon/merlin/kernel
                        DefaultKernel.java KernelException.java
                        KernelLoader.java
               merlin/src/java/org/apache/avalon/merlin/service
                        DefaultRegistry.java Handler.java
                        InvalidPathException.java Registry.java
                        ServiceLocator.java ServiceManagementContext.java
                        ServicePublisher.java ServiceURLConnection.java
                        ServiceURLFactory.java UnknownServiceException.java
  Log:
  Minor updates releated to javadoc and migration to Locator interface.
  
  Revision  Changes    Path
  1.5       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/Container.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Container.java	9 Jan 2003 03:59:39 -0000	1.4
  +++ Container.java	9 Jan 2003 15:19:59 -0000	1.5
  @@ -62,7 +62,7 @@
    * <p>A container is node in a containment heirachy. It defines a scope 
    * scope of execution for the components contained within it.</p>
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public interface Container
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerDescriptor.java
  
  Index: ContainerDescriptor.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerDescriptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContainerDescriptor.java	27 Dec 2002 16:41:44 -0000	1.2
  +++ ContainerDescriptor.java	9 Jan 2003 15:19:59 -0000	1.3
  @@ -131,7 +131,7 @@
    *
    * @see org.apache.avalon.meta.model.Profile
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public class ContainerDescriptor extends Profile
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerException.java
  
  Index: ContainerException.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerException.java	3 Dec 2002 07:08:02 -0000	1.1
  +++ ContainerException.java	9 Jan 2003 15:19:59 -0000	1.2
  @@ -60,7 +60,7 @@
   /**
    * Exception to indicate that there was a container related error.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public final class ContainerException
  
  
  
  1.10      +6 -3      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerLoader.java
  
  Index: ContainerLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerLoader.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ContainerLoader.java	9 Jan 2003 11:26:25 -0000	1.9
  +++ ContainerLoader.java	9 Jan 2003 15:19:59 -0000	1.10
  @@ -77,7 +77,7 @@
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.DefaultContext;
  -import org.apache.avalon.framework.context.Contextualizable;
  +//import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.service.DefaultServiceManager;
  @@ -95,6 +95,9 @@
   import org.apache.avalon.assembly.logging.LoggingManager;
   import org.apache.avalon.assembly.logging.LoggingDescriptor;
   import org.apache.avalon.assembly.logging.DefaultLoggingManager;
  +import org.apache.avalon.assembly.locator.Contextualizable;
  +import org.apache.avalon.assembly.locator.DefaultLocator;
  +import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.engine.EngineClassLoader;
   import org.apache.avalon.assembly.engine.model.LibraryDescriptor;
   import org.apache.avalon.assembly.engine.model.ClasspathDescriptor;
  @@ -214,7 +217,7 @@
                   engine = new EngineClassLoader( parent );
               }
               engine.enableLogging( logger.getChildLogger( "engine" ) );
  -            DefaultContext context = new DefaultContext();
  +            DefaultLocator context = new DefaultLocator();
               context.put( "urn:assembly:home", home );
               context.put( "urn:assembly:engine.extensions", extensions );
               context.put( "urn:assembly:engine.classpath", classpath );
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerRuntimeException.java
  
  Index: ContainerRuntimeException.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/ContainerRuntimeException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerRuntimeException.java	3 Dec 2002 07:08:02 -0000	1.1
  +++ ContainerRuntimeException.java	9 Jan 2003 15:19:59 -0000	1.2
  @@ -60,7 +60,7 @@
   /**
    * Exception to indicate that there was a container related runtime error.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public final class ContainerRuntimeException
  
  
  
  1.13      +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.java
  
  Index: DefaultContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultContainer.java	9 Jan 2003 03:59:39 -0000	1.12
  +++ DefaultContainer.java	9 Jan 2003 15:19:59 -0000	1.13
  @@ -87,7 +87,7 @@
    * <p>Default implementation of a container model within which a set 
    * of components and subsidiary containers are managed.</p>
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public class DefaultContainer extends AbstractLogEnabled 
  
  
  
  1.6       +1 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.xinfo
  
  Index: DefaultContainer.xinfo
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.xinfo,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultContainer.xinfo	28 Dec 2002 01:31:25 -0000	1.5
  +++ DefaultContainer.xinfo	9 Jan 2003 15:19:59 -0000	1.6
  @@ -8,8 +8,7 @@
   This software is published under the terms of the Apache Software License
   version 1.1, a copy of which has been included with this distribution in
   the LICENSE.txt file.
  -
  -@author  Stephen McConnell
  +@author mailto:avalon-dev@jakarta.apache.org
   @version 1.0 12/03/2001
   -->
   
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/StateEvent.java
  
  Index: StateEvent.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/StateEvent.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StateEvent.java	9 Jan 2003 03:59:39 -0000	1.1
  +++ StateEvent.java	9 Jan 2003 15:19:59 -0000	1.2
  @@ -60,7 +60,7 @@
   /**
    * The <code>StateEvent</code> is an event raised by a component
    * signally a change in state.
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public class StateEvent extends EventObject
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/StateListener.java
  
  Index: StateListener.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/StateListener.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StateListener.java	9 Jan 2003 03:59:39 -0000	1.1
  +++ StateListener.java	9 Jan 2003 15:19:59 -0000	1.2
  @@ -57,7 +57,7 @@
   
   /**
    * A <code>StateListener</code> listens to <code>StateEvent</code>
events.
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/builder/ContainerBuilder.java
  
  Index: ContainerBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/builder/ContainerBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerBuilder.java	3 Dec 2002 07:08:02 -0000	1.1
  +++ ContainerBuilder.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -66,7 +66,7 @@
    * A ContainerCreator is responsible for building {@link ContainerDescriptor}
    * objects from Configuration objects.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public final class ContainerBuilder
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/builder/ContainerCreator.java
  
  Index: ContainerCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/builder/ContainerCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerCreator.java	3 Dec 2002 07:08:02 -0000	1.1
  +++ ContainerCreator.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -64,7 +64,7 @@
    * Simple interface used to create {@link ContainerDescriptor}
    * from stream or Configuration sorce.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public interface ContainerCreator
  
  
  
  1.8       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/builder/XMLContainerCreator.java
  
  Index: XMLContainerCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/builder/XMLContainerCreator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XMLContainerCreator.java	27 Dec 2002 16:43:10 -0000	1.7
  +++ XMLContainerCreator.java	9 Jan 2003 15:20:00 -0000	1.8
  @@ -93,7 +93,7 @@
    * from a Configuration object. The format for Configuration object
    * is specified in the <a href="package-summary.html#external">package summary</a>.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public class XMLContainerCreator extends XMLProfileCreator
  
  
  
  1.25      +11 -10    avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/DefaultKernel.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- DefaultKernel.java	9 Jan 2003 11:26:25 -0000	1.24
  +++ DefaultKernel.java	9 Jan 2003 15:20:00 -0000	1.25
  @@ -79,6 +79,9 @@
   import org.apache.avalon.assembly.appliance.Appliance;
   import org.apache.avalon.assembly.appliance.ApplianceContext;
   import org.apache.avalon.assembly.appliance.DefaultApplianceContext;
  +import org.apache.avalon.assembly.locator.Contextualizable;
  +import org.apache.avalon.assembly.locator.Locator;
  +import org.apache.avalon.assembly.locator.DefaultLocator;
   import org.apache.avalon.framework.CascadingException;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  @@ -91,8 +94,6 @@
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.context.DefaultContext;
  -import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.service.DefaultServiceManager;
   import org.apache.avalon.merlin.block.Block;
  @@ -208,7 +209,7 @@
       /**
        * The system context.
        */
  -    private Context m_system;
  +    private DefaultLocator m_system;
   
       /**
        * The list of blocks established by the kernel.
  @@ -243,7 +244,7 @@
       * @param context the runtime context
       * @exception ContextException if an error occurs during the contextualization phase
       */
  -    public void contextualize( Context context ) throws ContextException
  +    public void contextualize( Locator context ) throws ContextException
       {
           m_home = (File) context.get( "urn:assembly:home" );
           m_bootstrap = (ClassLoader) context.get( "urn:avalon:classloader" );
  @@ -886,7 +887,7 @@
                 CREATOR.createLoggingDescriptor( 
                   m_kernelConfig.getChild( "logging" ), root );
   
  -            DefaultContext context = new DefaultContext();
  +            DefaultLocator context = new DefaultLocator();
               context.put( "urn:assembly:home", m_home );
               context.put( "urn:assembly:logging.descriptor", descriptor );
               context.makeReadOnly();
  @@ -935,8 +936,8 @@
           {
               EngineClassLoader engine = new EngineClassLoader( m_bootstrap );
               engine.enableLogging( getLogger().getChildLogger( "engine" ) );
  -            Context system = getSystemContext();
  -            DefaultContext context = new DefaultContext( system );
  +            Locator system = getSystemContext();
  +            DefaultLocator context = new DefaultLocator( system );
               context.put( "urn:assembly:engine.bootstrap", "true" );
               context.put( "urn:assembly:engine.extensions", extensions );
               context.put( "urn:assembly:engine.classpath", classpath );
  @@ -967,11 +968,11 @@
       * Create the system context.
       * @return the system context
       */
  -    private Context getSystemContext()
  +    private Locator getSystemContext()
       {
           if( m_system == null )
           {
  -            DefaultContext context = new DefaultContext();
  +            DefaultLocator context = new DefaultLocator();
               context.put( "urn:assembly:home", m_home );
               context.put( "urn:merlin:domain", m_registry.getBase().getHost() );
               context.makeReadOnly();
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/KernelException.java
  
  Index: KernelException.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/KernelException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- KernelException.java	3 Dec 2002 07:08:03 -0000	1.1
  +++ KernelException.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -55,7 +55,7 @@
   /**
    * Exception to indicate that there was a kernel related error.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public final class KernelException
  
  
  
  1.2       +5 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/KernelLoader.java
  
  Index: KernelLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/KernelLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- KernelLoader.java	6 Jan 2003 01:13:40 -0000	1.1
  +++ KernelLoader.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -28,7 +28,7 @@
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.DefaultContext;
  -import org.apache.avalon.framework.context.Contextualizable;
  +//import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.merlin.block.Block;
   import org.apache.avalon.merlin.block.DefaultBlock;
  @@ -36,6 +36,9 @@
   import org.apache.avalon.merlin.kernel.DefaultKernel;
   import org.apache.avalon.merlin.kernel.KernelException;
   import org.apache.avalon.assembly.util.ExceptionHelper;
  +import org.apache.avalon.assembly.locator.Contextualizable;
  +import org.apache.avalon.assembly.locator.DefaultLocator;
  +import org.apache.avalon.assembly.locator.Locator;
   
   /**
    * Merlin commandline bootstrap handler.
  @@ -104,7 +107,7 @@
                return;
           }
   
  -        DefaultContext context = new DefaultContext();
  +        DefaultLocator context = new DefaultLocator();
           context.put( "urn:assembly:home", base );
           context.put( "urn:avalon:classloader", loader );
           context.makeReadOnly();
  
  
  
  1.4       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/DefaultRegistry.java
  
  Index: DefaultRegistry.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/DefaultRegistry.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultRegistry.java	27 Dec 2002 16:45:38 -0000	1.3
  +++ DefaultRegistry.java	9 Jan 2003 15:20:00 -0000	1.4
  @@ -67,7 +67,7 @@
   /**
    * Default implementation of a service management context.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public class DefaultRegistry implements Registry
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/Handler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Handler.java	17 Dec 2002 09:58:46 -0000	1.1
  +++ Handler.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -65,7 +65,7 @@
    * requires that the appropriate handler be supplied to the URL
    * constructor.</p>
    * <p>
  - * @author <a href="mailto:mcconnell@osm.net">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    */
   public class Handler extends URLStreamHandler
   {
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/InvalidPathException.java
  
  Index: InvalidPathException.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/InvalidPathException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InvalidPathException.java	17 Dec 2002 09:58:46 -0000	1.1
  +++ InvalidPathException.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -58,7 +58,7 @@
   /**
    * Exception to indicate that service URI is invalid.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public final class InvalidPathException
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/Registry.java
  
  Index: Registry.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/Registry.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Registry.java	17 Dec 2002 09:58:46 -0000	1.1
  +++ Registry.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -62,7 +62,7 @@
   /**
    * Interface used to register an established service.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public interface Registry extends ServicePublisher
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServiceLocator.java
  
  Index: ServiceLocator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServiceLocator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceLocator.java	17 Dec 2002 09:58:46 -0000	1.1
  +++ ServiceLocator.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -60,7 +60,7 @@
   /**
    * Interface used to register an established service.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public interface ServiceLocator
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServiceManagementContext.java
  
  Index: ServiceManagementContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServiceManagementContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceManagementContext.java	17 Dec 2002 09:58:46 -0000	1.1
  +++ ServiceManagementContext.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -61,7 +61,7 @@
   /**
    * Interface used to register an established service.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public interface ServiceManagementContext extends ServiceLocator
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServicePublisher.java
  
  Index: ServicePublisher.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServicePublisher.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServicePublisher.java	17 Dec 2002 09:58:46 -0000	1.1
  +++ ServicePublisher.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -62,7 +62,7 @@
   /**
    * Interface used to register an established service.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public interface ServicePublisher extends ServiceLocator
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServiceURLConnection.java
  
  Index: ServiceURLConnection.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServiceURLConnection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceURLConnection.java	17 Dec 2002 09:58:46 -0000	1.1
  +++ ServiceURLConnection.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -64,7 +64,7 @@
    * the <code>ServiceURLConnection</code> are created by a service
    * URL <code>Handler</code> class.
    * @see Handler
  - * @author <a href="mailto:mcconnell@osm.net">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    */
   public class ServiceURLConnection extends URLConnection
   {
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServiceURLFactory.java
  
  Index: ServiceURLFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/ServiceURLFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceURLFactory.java	17 Dec 2002 09:58:46 -0000	1.1
  +++ ServiceURLFactory.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -61,7 +61,7 @@
   /**
    * URL protocol handler factory for the native access protocol.
    * @see Handler
  - * @author <a href="mailto:mcconnell@osm.net">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    */
   public class ServiceURLFactory implements URLStreamHandlerFactory
   {
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/UnknownServiceException.java
  
  Index: UnknownServiceException.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/UnknownServiceException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UnknownServiceException.java	17 Dec 2002 09:58:46 -0000	1.1
  +++ UnknownServiceException.java	9 Jan 2003 15:20:00 -0000	1.2
  @@ -60,7 +60,7 @@
   /**
    * Exception to indicate that a requested service is unknown.
    *
  - * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public final class UnknownServiceException
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message