avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground BasicContextInterface.java ComplexComponent.java Exploitable.java SimpleComponent.java
Date Thu, 24 Oct 2002 04:12:46 GMT
mcconnell    2002/10/23 21:12:46

  Modified:    assembly build.xml default.properties
               assembly/src/java/org/apache/excalibur/merlin Main.java
               assembly/src/java/org/apache/excalibur/merlin/assembly
                        ContainerManager.java ServiceRegistry.java
                        TypeManager.java
               assembly/src/java/org/apache/excalibur/merlin/container
                        Container.java ContainerResource.java
                        DefaultContainer.java StateListener.java
                        Structural.java
               assembly/src/java/org/apache/excalibur/merlin/kernel
                        DefaultKernel.java
               assembly/src/java/org/apache/excalibur/merlin/model
                        Profile.java Resource.java
               assembly/src/java/org/apache/excalibur/merlin/model/verifier
                        MetaDataVerifier.java
               assembly/src/java/org/apache/excalibur/merlin/resource
                        AbstractLifestyleHandler.java LifestyleManager.java
                        PooledLifestyleHandler.java ResourceException.java
                        ResourceFactory.java ResourceProvider.java
                        ResourceRuntimeException.java
                        SingletonLifestyleHandler.java
                        ThreadLocalLifestyleHandler.java
                        TransientLifestyleHandler.java
               assembly/src/java/org/apache/excalibur/merlin/service
                        DefaultRegistry.java Handler.java Registry.java
                        ServiceLocator.java ServiceManagementContext.java
                        ServicePublisher.java ServiceURLConnection.java
               assembly/src/java/org/apache/excalibur/playground
                        BasicContextInterface.java ComplexComponent.java
                        Exploitable.java SimpleComponent.java
  Added:       assembly/src/etc HEADER.txt checkstyle.properties
  Log:
  General updates to the code-base based on a more strict checkstyle
  profile, including license header validation. Requires checkstyle 2.4.
  
  Revision  Changes    Path
  1.71      +12 -39    jakarta-avalon-excalibur/assembly/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- build.xml	23 Oct 2002 16:33:03 -0000	1.70
  +++ build.xml	24 Oct 2002 04:12:43 -0000	1.71
  @@ -210,56 +210,29 @@
       </javadoc>
     </target>
   
  -  <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  +  <target name="checkstyle">
  +    <taskdef classpath="${checkstyle.jar}"
  +       resource="checkstyletask.properties"/>
   
  -    <!-- this invocation of checkstyle requires that checkstyle be downloaded and setup -->
  -    <!-- thats why you are required to define do.checkstyle property to generate the report -->
  -
  -    <taskdef name="checkstyle"
  -       classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
  -      <classpath refid="project.class.path"/>
  -    </taskdef>
       <checkstyle
  -       lcurlyType="nl"
  -       lcurlyMethod="nl"
  -       lcurlyOther="nl"
  -       rcurly="ignore"
  -       allowProtected="false"
  -       allowPackage="false"
  -       allowNoAuthor="false"
  -       maxLineLen="250"
  -       maxMethodLen="180"
  -       maxConstructorLen="100"
  -       memberPattern="^m_[a-z][a-zA-Z0-9]*$"
  -       staticPattern="^c_[a-z][a-zA-Z0-9]*$"
  -       constPattern="(^c_[a-z][a-zA-Z0-9]*$)|([A-Z_]*$)"
  -       ignoreImportLen="true"
  -       allowTabs="false"
  -       javadocScope="protected"
  -       ignoreWhitespace="true"
  -       cacheFile="checkstyle.cache"
  -       failOnViolation="false"
  -       ignoreCastWhitespace="true">
  -      <fileset dir="${java.dir}">
  -        <include name="**/*.java"/>
  -      </fileset>
  +      properties="${etc.dir}/checkstyle.properties" 
  +      failOnViolation="false">
  +      <fileset dir="${src.dir}"
  +               includes="**/*.java"/>
  +      <property key="checkstyle.cache.file" file="${checkstyle-cache}"/>
         <formatter type="plain"/>
         <formatter type="xml" toFile="${build.dir}/checkstyle-results.xml"/>
       </checkstyle>
     </target>
   
  -  <target name="checkstyle-report"
  -     depends="checkstyle"
  -     if="do.checkstyle"
  +  <target name="checkstyle-report" depends="checkstyle" if="do.checkstyle"
        description="Generate Checkstyle Report">
  -
  -    <mkdir dir="${build.reports}/checkstyle"/>
  +    <mkdir dir="${build.reports}"/>
       <property name="checkstyle.pathhack" location="."/>
       <style style="${tools.dir}/etc/checkstyle-frames.xsl" in="${build.dir}/checkstyle-results.xml"
  -       out="${build.reports}/checkstyle/delete-me.html">
  -      <param name="pathhack" expression="${checkstyle.pathhack}"/>
  +       out="${build.reports}/delete-me.html.html">
  +            <param name="pathhack" expression="${checkstyle.pathhack}"/>
       </style>
  -
     </target>
   
     <!-- Creates the distribution -->
  
  
  
  1.20      +2 -0      jakarta-avalon-excalibur/assembly/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/default.properties,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- default.properties	10 Oct 2002 06:26:04 -0000	1.19
  +++ default.properties	24 Oct 2002 04:12:43 -0000	1.20
  @@ -121,6 +121,7 @@
   src.dir = src
   java.dir = ${src.dir}/java
   conf.dir = ${src.dir}/conf
  +etc.dir = ${src.dir}/etc
   test.dir = ${src.dir}/test
   
   tools.dir=${basedir}/../../jakarta-avalon/tools
  @@ -164,3 +165,4 @@
   excalibur.dir = ./..
   #apps.dir = ${excalibur.dir}/../jakarta-avalon-apps
   
  +checkstyle.cache = checkstyle.cache
  \ No newline at end of file
  
  
  
  1.1                  jakarta-avalon-excalibur/assembly/src/etc/HEADER.txt
  
  Index: HEADER.txt
  ===================================================================
  /* ==================================================================== 
   * The Apache Software License, Version 1.1 
   * 
   * Copyright (c) 2002 The Apache Software Foundation. All rights 
   * reserved. 
   * 
   * Redistribution and use in source and binary forms, with or without 
   * modification, are permitted provided that the following conditions 
   * are met: 
   * 
   * 1. Redistributions of source code must retain the above copyright 
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *    "This product includes software developed by the
   *    Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software 
   *    itself, if and wherever such third-party acknowledgments  
   *    normally appear.
   *
   * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
   *    must not be used to endorse or promote products derived from this
   *    software without prior written permission. For written 
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation. For more
   * information on the Apache Software Foundation, please see 
   * <http://www.apache.org/>.
   */
  
  
  1.1                  jakarta-avalon-excalibur/assembly/src/etc/checkstyle.properties
  
  Index: checkstyle.properties
  ===================================================================
  checkstyle.lcurly.type=nl
  checkstyle.lcurly.method=nl
  checkstyle.lcurly.other=nl
  
  checkstyle.rcurly=alone
  
  # TODO: Should not be ignored for readability!!!
  checkstyle.ignore.braces=no
  checkstyle.ignore.importlength=yes
  checkstyle.ignore.public.in.interface=no
  checkstyle.ignore.whitespace=yes
  checkstyle.ignore.whitespace.cast=yes
  
  checkstyle.paren.pad=space
  
  # TODO: Try to get the files ot match the default values
  # default 80 maxlinelen
  checkstyle.maxlinelen=250
  # default 2000
  checkstyle.maxfilelen=3000
  # default 150 maxmethodlen
  checkstyle.maxmethodlen=180
  # default 150 maxmethodlen
  checkstyle.maxconstructorlen=100
  
  # default 7
  checkstyle.maxparameters=13
  
  checkstyle.pattern.member=^m_[a-z](_?[a-zA-Z0-9])*$
  checkstyle.pattern.static=^c_[a-z](_?[a-zA-Z0-9])*$
  checkstyle.pattern.const=^[A-Z](_?[A-Z0-9]+)*$
  checkstyle.pattern.method=[a-z](_?[a-zA-Z0-9]+)*$
  checkstyle.pattern.parameter=[a-z](_?[a-zA-Z0-9]+)*$
  checkstyle.pattern.localvar=[a-z](_?[a-zA-Z0-9]+)*$
  
  # TODO: Use an invalid pattern temporarily until the TODOs have been resolved to make the nightly builds work!!!
  checkstyle.pattern.todo=xTODO:x
  
  checkstyle.javadoc.scope=protected
  checkstyle.javadoc.checkUnusedThrows=true
  
  checkstyle.require.packagehtml=yes
  
  checkstyle.allow.noauthor=no
  checkstyle.allow.protected=yes
  checkstyle.allow.package=no
  checkstyle.allow.tabs=no
  
  # The official header file
  checkstyle.header.file=src/etc/HEADER.txt
  
  # These instantiations should be illegal, use the static constants instead. 
  checkstyle.illegalInstantiations=java.lang.Boolean
  
  
  
  
  1.25      +2 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Main.java	23 Oct 2002 16:33:03 -0000	1.24
  +++ Main.java	24 Oct 2002 04:12:43 -0000	1.25
  @@ -168,6 +168,7 @@
                       }
                       catch( Throwable e )
                       {
  +                        // ignore it
                       }
                       finally
                       {
  
  
  
  1.41      +12 -6     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java
  
  Index: ContainerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- ContainerManager.java	23 Oct 2002 16:33:03 -0000	1.40
  +++ ContainerManager.java	24 Oct 2002 04:12:43 -0000	1.41
  @@ -918,7 +918,7 @@
   
           c.put( "name", profile.getName() );
           c.put( "block.name", getPath().replace( '/', '.' ).substring( 1 )
  -                             + "." + profile.getName() );
  +          + "." + profile.getName() );
           c.put( "app.home", m_home );
   
           //
  @@ -933,8 +933,9 @@
           }
           catch( Throwable e )
           {
  -            final String error = "Could not establish a lifestyle handler for the profile: "
  -                + profile.getName();
  +            final String error = 
  +              "Could not establish a lifestyle handler for the profile: "
  +              + profile.getName();
               throw new ResourceException( error, e );
           }
   
  @@ -1360,8 +1361,13 @@
                   }
   
                   profile.addProvider( role, resource );
  -                getLogger().debug( pad + "  associated supplier: " + supplier.getName() +
  -                                   " with profile: " + profile.getName() + " under the role: " + role );
  +                getLogger().debug( 
  +                  pad + "  associated supplier: " 
  +                  + supplier.getName() 
  +                  + " with profile: " 
  +                  + profile.getName() 
  +                  + " under the role: " 
  +                  + role );
                   map.add( supplier );
               }
           }
  
  
  
  1.8       +1 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ServiceRegistry.java
  
  Index: ServiceRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ServiceRegistry.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ServiceRegistry.java	23 Oct 2002 16:33:04 -0000	1.7
  +++ ServiceRegistry.java	24 Oct 2002 04:12:44 -0000	1.8
  @@ -61,7 +61,6 @@
   import org.apache.excalibur.meta.info.ReferenceDescriptor;
   import org.apache.excalibur.meta.info.ServiceDefinition;
   import org.apache.excalibur.meta.info.builder.ServiceBuilder;
  -import org.apache.excalibur.meta.verifier.VerifyException;
   
   /**
    * Internal table that holds available component type keyed relative
  
  
  
  1.27      +6 -5      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeManager.java
  
  Index: TypeManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeManager.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- TypeManager.java	23 Oct 2002 16:33:04 -0000	1.26
  +++ TypeManager.java	24 Oct 2002 04:12:44 -0000	1.27
  @@ -124,7 +124,7 @@
        * Flag indicating of the bootstap sequence of evaluating the classpath
        * and extensions declared at JVM launch have been assesed or not.
        */
  -    private static boolean m_bootstrap = true;
  +    private static boolean c_bootstrap = true;
   
   
       //===================================================================
  @@ -272,7 +272,7 @@
           // handle the bootstrap process
           //
   
  -        if( m_bootstrap )
  +        if( c_bootstrap )
           {
               String sep = System.getProperty( "path.separator" );
               String classpath = System.getProperty( "java.class.path" );
  @@ -285,7 +285,7 @@
                   scan( jar );
               }
   
  -            m_bootstrap = false;
  +            c_bootstrap = false;
           }
   
           //
  @@ -634,6 +634,7 @@
   
       /**
        * Test if a class is locally managed.
  +     * @param classname the class to test for locality
        * @return TRUE if the class is local to this manager
        */
       boolean isLocal( String classname )
  @@ -644,7 +645,7 @@
       /**
        * Resolve a {@link ServiceDefinition} from a classname.
        *
  -     * @param classname the service type
  +     * @param reference the reference descriptor
        * @return the service descriptor
        * @exception TypeException if the type is unknown
        */
  
  
  
  1.24      +3 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/Container.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Container.java	23 Oct 2002 16:33:05 -0000	1.23
  +++ Container.java	24 Oct 2002 04:12:44 -0000	1.24
  @@ -115,12 +115,14 @@
       /**
        * Request for the container to startup all subsidiary containers
        * and all contained components.
  +     * @exception Exception if an execution error occurs
        */
       void start() throws Exception;
   
       /**
        * Request for the container to stop all subsidiary containers
        * and all contained components.
  +     * @exception Exception if an execution error occurs
        */
       void stop() throws Exception;
   
  
  
  
  1.9       +4 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerResource.java
  
  Index: ContainerResource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerResource.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ContainerResource.java	23 Oct 2002 16:33:05 -0000	1.8
  +++ ContainerResource.java	24 Oct 2002 04:12:44 -0000	1.9
  @@ -130,7 +130,7 @@
       /**
        * Create a new container resource instance.
        *
  -     * @param the container type manager
  +     * @param manager the container type manager
        * @param profile the resource's profile
        * @param context the deployment context
        * @param handler the lifestyle handler
  @@ -307,6 +307,7 @@
   
       /**
        * Method invoked when the hosted container state changes.
  +     * @param event the state change event
        */
       public void stateChanged( StateEvent event )
       {
  @@ -503,6 +504,7 @@
           }
           catch( Throwable wakeup )
           {
  +            // ignore
           }
       }
   }
  
  
  
  1.47      +6 -88     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.java
  
  Index: DefaultContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- DefaultContainer.java	23 Oct 2002 16:33:05 -0000	1.46
  +++ DefaultContainer.java	24 Oct 2002 04:12:44 -0000	1.47
  @@ -136,8 +136,7 @@
       /**
        * The thread periodically checks for state change requests enter in
        * the m_action state member and attempts to bring the m_state value to
  -     * be equal to the m_action value and once achieved goes off for a little
  -     * sleep.
  +     * be equal to the m_action value.
        */
       private Integer m_action = new Integer( StateEvent.UNKNOWN );
   
  @@ -408,6 +407,7 @@
   
       /**
        * Implementation of the container shutdown process.
  +     * @exception Exception if an error occurs while stopping the component
        */
       public void stop() throws Exception
       {
  @@ -458,6 +458,9 @@
           fireStateChange( new StateEvent( this, m_descriptor.getName(), StateEvent.STOPPED ) );
       }
   
  +   /**
  +    * Suspension of the container.
  +    */
       public void suspend()
       {
           if( m_state < StateEvent.INITIALIZED )
  @@ -847,91 +850,6 @@
                       }
                   }
               }
  -        }
  -    }
  -
  -    /**
  -     * Creation of a new empty container associated as a subsidiary of this container
  -     * using the default container type and an empty classpath.
  -     *
  -     * @param name the name to assign to the new container
  -     * @return the new container
  -     * @exception Exception is an error occurs
  -     */
  -    //public Container addContainer( String name )
  -    //  throws Exception
  -    //{
  -    //    return addContainer( name, new ClasspathDescriptor() );
  -    //}
  -
  -    /**
  -     * Creation of a new empty container associated as a subsidiary of this container
  -     * using the same container profile as this container.
  -     *
  -     * @param name the name to assign to the new container
  -     * @param classpath the container classpath
  -     * @return the new container
  -     * @exception Exception is an error occurs
  -     */
  -    //public Container addContainer( String name, ClasspathDescriptor classpath )
  -    //  throws Exception
  -    //{
  -    //    return addContainer(
  -    //      new ContainerDescriptor( name, m_descriptor ), classpath );
  -    //}
  -
  -    /**
  -     * Utility to create a subsidiary container from a configuration.
  -     *
  -     * @param config the subsidiary container configuration
  -     * @return the new container
  -     * @exception Exception is an error occurs
  -     */
  -    //public Container addContainer( Configuration config ) throws Exception
  -    //{
  -    //    if( !(( m_state == StateEvent.INITIALIZED ) || ( m_state == StateEvent.SUSPENDED )) )
  -    //    {
  -    //        throw new IllegalStateException(
  -    //          "Container not in initialized or suspended state." );
  -    //    }
  -    //
  -    //    ContainerService service = m_factory.build( config );
  -    //    return service.getContainerInstance( this, null );
  -    //}
  -
  -    /**
  -     * Internal utility to create a subsidiary container.
  -     *
  -     * @param config the subsidiary container configuration
  -     * @return the new container
  -     * @exception Exception is an error occurs
  -     */
  -    //private Container addContainer(
  -    //                   ContainerDescriptor descriptor,
  -    //                   ClasspathDescriptor classpath )
  -    //  throws Exception
  -    //{
  -    //    if( !(( m_state == StateEvent.INITIALIZED ) || ( m_state == StateEvent.SUSPENDED )) )
  -    //    {
  -    //        throw new IllegalStateException(
  -    //          "Container not in initialized or suspended state." );
  -    //    }
  -    //
  -    //    ContainerService service = m_factory.build( descriptor, classpath );
  -    //    return service.getContainerInstance( this, null );
  -    //}
  -
  -    /**
  -     * Internal utility to sleep a bit.
  -     */
  -    private void sleep()
  -    {
  -        try
  -        {
  -            Thread.currentThread().sleep( 100 );
  -        }
  -        catch( Throwable wakeup )
  -        {
           }
       }
   }
  
  
  
  1.6       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/StateListener.java
  
  Index: StateListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/StateListener.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StateListener.java	23 Oct 2002 16:33:05 -0000	1.5
  +++ StateListener.java	24 Oct 2002 04:12:44 -0000	1.6
  @@ -68,6 +68,6 @@
        * Method invoked when a container state changes.
        * @param event the state event
        */
  -    public void stateChanged( StateEvent event );
  +    void stateChanged( StateEvent event );
   
   }
  
  
  
  1.5       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/Structural.java
  
  Index: Structural.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/Structural.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Structural.java	23 Oct 2002 16:33:05 -0000	1.4
  +++ Structural.java	24 Oct 2002 04:12:44 -0000	1.5
  @@ -69,5 +69,5 @@
        * Request the assembly of the container.
        * @exception AssemblyException if an assembly error occurs
        */
  -    public void assemble() throws AssemblyException;
  +    void assemble() throws AssemblyException;
   }
  
  
  
  1.58      +1 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- DefaultKernel.java	23 Oct 2002 16:33:06 -0000	1.57
  +++ DefaultKernel.java	24 Oct 2002 04:12:44 -0000	1.58
  @@ -87,7 +87,6 @@
   import org.apache.excalibur.merlin.model.LibraryDescriptor;
   import org.apache.excalibur.merlin.model.LoggingDescriptor;
   import org.apache.excalibur.merlin.model.Profile;
  -import org.apache.excalibur.merlin.model.Resource;
   import org.apache.excalibur.merlin.model.builder.XMLContainerCreator;
   import org.apache.excalibur.merlin.model.verifier.AssemblyVerifier;
   import org.apache.excalibur.merlin.model.verifier.MetaDataVerifier;
  
  
  
  1.31      +6 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Profile.java
  
  Index: Profile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Profile.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Profile.java	23 Oct 2002 16:33:06 -0000	1.30
  +++ Profile.java	24 Oct 2002 04:12:44 -0000	1.31
  @@ -642,6 +642,11 @@
           return buffer.toString();
       }
   
  +   /**
  +    * Returns a string representation of a mode value.
  +    * @param mode the mode value
  +    * @return the string representation
  +    */
       public static String modeToString( int mode )
       {
           if( mode == IMPLICIT )
  
  
  
  1.11      +56 -8     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Resource.java
  
  Index: Resource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Resource.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Resource.java	2 Oct 2002 01:52:16 -0000	1.10
  +++ Resource.java	24 Oct 2002 04:12:44 -0000	1.11
  @@ -1,10 +1,58 @@
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  +/* ==================================================================== 
  + * The Apache Software License, Version 1.1 
  + * 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
  + * reserved. 
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *    notice, this list of conditions and the following disclaimer.
    *
  - * 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.
  - */
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *    "This product includes software developed by the
  + *    Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software 
  + *    itself, if and wherever such third-party acknowledgments  
  + *    normally appear.
  + *
  + * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
  + *    must not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written 
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation. For more
  + * information on the Apache Software Foundation, please see 
  + * <http://www.apache.org/>.
  + */ 
  +
   package org.apache.excalibur.merlin.model;
   
   import java.net.URL;
  @@ -54,7 +102,7 @@
        * @param reference a reference to a service type
        * @return the service definition
        */
  -    public ServiceAccessPoint getServiceAccessPoint( ReferenceDescriptor reference );
  +    ServiceAccessPoint getServiceAccessPoint( ReferenceDescriptor reference );
   
       /**
        * Return the profile.
  
  
  
  1.13      +3 -3      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/MetaDataVerifier.java
  
  Index: MetaDataVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/MetaDataVerifier.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MetaDataVerifier.java	23 Oct 2002 16:33:08 -0000	1.12
  +++ MetaDataVerifier.java	24 Oct 2002 04:12:44 -0000	1.13
  @@ -224,8 +224,8 @@
       {
           final int count = profile.getAssociations().length;
           final boolean aquiresServices =
  -            Composable.class.isAssignableFrom( clazz ) ||
  -            Serviceable.class.isAssignableFrom( clazz );
  +            Composable.class.isAssignableFrom( clazz ) 
  +            || Serviceable.class.isAssignableFrom( clazz );
           if( !aquiresServices )
           {
               if( 0 != count )
  
  
  
  1.16      +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/AbstractLifestyleHandler.java
  
  Index: AbstractLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/AbstractLifestyleHandler.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AbstractLifestyleHandler.java	23 Oct 2002 16:33:08 -0000	1.15
  +++ AbstractLifestyleHandler.java	24 Oct 2002 04:12:45 -0000	1.16
  @@ -204,6 +204,7 @@
        * Returns an instance of the object type supported by the
        * manager to the client.
        *
  +     * @param context the execution context
        * @return an instance of the type defined by the profile
        * @exception Exception if an error occurs while attemping to aquire the object
        */
  @@ -305,6 +306,7 @@
        * of this method, the implemetation will trigger profile deployment in
        * advance of instance creation.
        *
  +     * @param context the execution context
        * @return an instance of the type defined by the profile
        * @exception Exception if an instantiation error occurs
        * @see DeploymentHelper
  @@ -316,9 +318,7 @@
           if( !m_initialized )
           {
               m_deployment.createLoggingCategories( m_profile );
  -            //Context context = m_deployment.createStandardContext( m_profile, m_context );
               Context c = m_deployment.createStandardContext( m_profile, context );
  -            //Map map = m_deployment.createExtensionContextMap( m_profile, m_context );
               Map map = m_deployment.createExtensionContextMap( m_profile, context );
               m_provider = new ResourceProvider( m_deployment, m_profile, c, map );
               m_initialized = true;
  
  
  
  1.9       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/LifestyleManager.java
  
  Index: LifestyleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/LifestyleManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LifestyleManager.java	23 Oct 2002 16:33:08 -0000	1.8
  +++ LifestyleManager.java	24 Oct 2002 04:12:45 -0000	1.9
  @@ -136,7 +136,7 @@
        * @exception Exception if an error occurs during handler establishment
        * @see DefaultLifestyleManager
        */
  -    public LifestyleHandler getHandler(
  +    LifestyleHandler getHandler(
           ContainerManager manager,
           DeploymentHelper deployment,
           LifecycleHelper helper,
  
  
  
  1.8       +55 -6     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/PooledLifestyleHandler.java
  
  Index: PooledLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/PooledLifestyleHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PooledLifestyleHandler.java	21 Oct 2002 14:55:35 -0000	1.7
  +++ PooledLifestyleHandler.java	24 Oct 2002 04:12:45 -0000	1.8
  @@ -1,10 +1,58 @@
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  +/* ==================================================================== 
  + * The Apache Software License, Version 1.1 
  + * 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
  + * reserved. 
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *    notice, this list of conditions and the following disclaimer.
    *
  - * 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.
  - */
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *    "This product includes software developed by the
  + *    Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software 
  + *    itself, if and wherever such third-party acknowledgments  
  + *    normally appear.
  + *
  + * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
  + *    must not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written 
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation. For more
  + * information on the Apache Software Foundation, please see 
  + * <http://www.apache.org/>.
  + */ 
  +
   package org.apache.excalibur.merlin.resource;
   
   import org.apache.avalon.framework.activity.Disposable;
  @@ -62,6 +110,7 @@
        * Returns an instance of the object type supported by the
        * manager to the client.
        *
  +     * @param context the execution context
        * @return an instance of the type defined by the profile
        * @exception Exception if an error occurs while aquiring the object
        */
  
  
  
  1.3       +55 -7     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceException.java
  
  Index: ResourceException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourceException.java	23 Aug 2002 06:57:48 -0000	1.2
  +++ ResourceException.java	24 Oct 2002 04:12:45 -0000	1.3
  @@ -1,10 +1,58 @@
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  +/* ==================================================================== 
  + * The Apache Software License, Version 1.1 
  + * 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
  + * reserved. 
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *    notice, this list of conditions and the following disclaimer.
    *
  - * 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.
  - */
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *    "This product includes software developed by the
  + *    Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software 
  + *    itself, if and wherever such third-party acknowledgments  
  + *    normally appear.
  + *
  + * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
  + *    must not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written 
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation. For more
  + * information on the Apache Software Foundation, please see 
  + * <http://www.apache.org/>.
  + */ 
  +
   package org.apache.excalibur.merlin.resource;
   
   import org.apache.avalon.framework.CascadingException;
  
  
  
  1.4       +53 -7     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceFactory.java
  
  Index: ResourceFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ResourceFactory.java	2 Oct 2002 01:52:17 -0000	1.3
  +++ ResourceFactory.java	24 Oct 2002 04:12:45 -0000	1.4
  @@ -1,12 +1,58 @@
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  +/* ==================================================================== 
  + * The Apache Software License, Version 1.1 
  + * 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
  + * reserved. 
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *    notice, this list of conditions and the following disclaimer.
    *
  - * 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.
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
    *
  - * Original contribution by OSM SARL, http://www.osm.net
  - */
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *    "This product includes software developed by the
  + *    Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software 
  + *    itself, if and wherever such third-party acknowledgments  
  + *    normally appear.
  + *
  + * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
  + *    must not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written 
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation. For more
  + * information on the Apache Software Foundation, please see 
  + * <http://www.apache.org/>.
  + */ 
  +
   package org.apache.excalibur.merlin.resource;
   
   import org.apache.avalon.framework.context.Context;
  
  
  
  1.8       +55 -7     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceProvider.java
  
  Index: ResourceProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceProvider.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ResourceProvider.java	2 Oct 2002 01:52:17 -0000	1.7
  +++ ResourceProvider.java	24 Oct 2002 04:12:45 -0000	1.8
  @@ -1,10 +1,58 @@
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  +/* ==================================================================== 
  + * The Apache Software License, Version 1.1 
  + * 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
  + * reserved. 
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *    notice, this list of conditions and the following disclaimer.
    *
  - * 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.
  - */
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *    "This product includes software developed by the
  + *    Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software 
  + *    itself, if and wherever such third-party acknowledgments  
  + *    normally appear.
  + *
  + * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
  + *    must not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written 
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation. For more
  + * information on the Apache Software Foundation, please see 
  + * <http://www.apache.org/>.
  + */ 
  +
   
   package org.apache.excalibur.merlin.resource;
   
  
  
  
  1.3       +55 -7     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceRuntimeException.java
  
  Index: ResourceRuntimeException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceRuntimeException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourceRuntimeException.java	23 Aug 2002 06:57:48 -0000	1.2
  +++ ResourceRuntimeException.java	24 Oct 2002 04:12:45 -0000	1.3
  @@ -1,10 +1,58 @@
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  +/* ==================================================================== 
  + * The Apache Software License, Version 1.1 
  + * 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
  + * reserved. 
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *    notice, this list of conditions and the following disclaimer.
    *
  - * 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.
  - */
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *    "This product includes software developed by the
  + *    Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software 
  + *    itself, if and wherever such third-party acknowledgments  
  + *    normally appear.
  + *
  + * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
  + *    must not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written 
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation. For more
  + * information on the Apache Software Foundation, please see 
  + * <http://www.apache.org/>.
  + */ 
  +
   package org.apache.excalibur.merlin.resource;
   
   import org.apache.avalon.framework.CascadingRuntimeException;
  
  
  
  1.11      +54 -8     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/SingletonLifestyleHandler.java
  
  Index: SingletonLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/SingletonLifestyleHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SingletonLifestyleHandler.java	21 Oct 2002 14:55:35 -0000	1.10
  +++ SingletonLifestyleHandler.java	24 Oct 2002 04:12:45 -0000	1.11
  @@ -1,12 +1,58 @@
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  +/* ==================================================================== 
  + * The Apache Software License, Version 1.1 
  + * 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
  + * reserved. 
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *    notice, this list of conditions and the following disclaimer.
    *
  - * 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.
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
    *
  - * Original contribution by OSM SARL, http://www.osm.net
  - */
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *    "This product includes software developed by the
  + *    Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software 
  + *    itself, if and wherever such third-party acknowledgments  
  + *    normally appear.
  + *
  + * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
  + *    must not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written 
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation. For more
  + * information on the Apache Software Foundation, please see 
  + * <http://www.apache.org/>.
  + */ 
  +
   package org.apache.excalibur.merlin.resource;
   
   import org.apache.avalon.framework.context.Context;
  @@ -60,7 +106,7 @@
       /**
        * Returns an instance of the object type supported by the
        * manager to the client.
  -     *
  +     * @param context the execution context
        * @return an instance of the type defined by the profile
        * @exception Exception if an access stage error occurs
        */
  
  
  
  1.7       +54 -8     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ThreadLocalLifestyleHandler.java
  
  Index: ThreadLocalLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ThreadLocalLifestyleHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ThreadLocalLifestyleHandler.java	21 Oct 2002 14:55:35 -0000	1.6
  +++ ThreadLocalLifestyleHandler.java	24 Oct 2002 04:12:45 -0000	1.7
  @@ -1,12 +1,58 @@
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  +/* ==================================================================== 
  + * The Apache Software License, Version 1.1 
  + * 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
  + * reserved. 
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *    notice, this list of conditions and the following disclaimer.
    *
  - * 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.
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
    *
  - * Original contribution by OSM SARL, http://www.osm.net
  - */
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *    "This product includes software developed by the
  + *    Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software 
  + *    itself, if and wherever such third-party acknowledgments  
  + *    normally appear.
  + *
  + * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
  + *    must not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written 
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation. For more
  + * information on the Apache Software Foundation, please see 
  + * <http://www.apache.org/>.
  + */ 
  +
   package org.apache.excalibur.merlin.resource;
   
   import org.apache.avalon.framework.context.Context;
  @@ -55,7 +101,7 @@
       /**
        * Returns an instance of the object type supported by the
        * manager to the client.
  -     *
  +     * @param context the execution context
        * @return an instance of the type defined by the profile
        * @exception Exception if an access phase error occurs
        */
  
  
  
  1.10      +54 -7     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/TransientLifestyleHandler.java
  
  Index: TransientLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/TransientLifestyleHandler.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TransientLifestyleHandler.java	21 Oct 2002 14:55:35 -0000	1.9
  +++ TransientLifestyleHandler.java	24 Oct 2002 04:12:45 -0000	1.10
  @@ -1,12 +1,58 @@
  -/*
  - * Copyright (C) The Apache Software Foundation. All rights reserved.
  +/* ==================================================================== 
  + * The Apache Software License, Version 1.1 
  + * 
  + * Copyright (c) 2002 The Apache Software Foundation. All rights 
  + * reserved. 
  + * 
  + * Redistribution and use in source and binary forms, with or without 
  + * modification, are permitted provided that the following conditions 
  + * are met: 
  + * 
  + * 1. Redistributions of source code must retain the above copyright 
  + *    notice, this list of conditions and the following disclaimer.
    *
  - * 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.
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
    *
  - * Original contribution by OSM SARL, http://www.osm.net
  - */
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *    "This product includes software developed by the
  + *    Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software 
  + *    itself, if and wherever such third-party acknowledgments  
  + *    normally appear.
  + *
  + * 4. The names "Jakarta", "Avalon", and "Apache Software Foundation" 
  + *    must not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written 
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation. For more
  + * information on the Apache Software Foundation, please see 
  + * <http://www.apache.org/>.
  + */ 
  +
   package org.apache.excalibur.merlin.resource;
   
   import java.util.ArrayList;
  @@ -52,6 +98,7 @@
        * Returns an instance of the object type supported by the
        * manager to the client.
        *
  +     * @param context the execution context
        * @return an instance of the type defined by the profile
        * @exception Exception if an access phase exception is thrown
        */
  
  
  
  1.11      +10 -5     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/DefaultRegistry.java
  
  Index: DefaultRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/DefaultRegistry.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultRegistry.java	23 Oct 2002 16:33:09 -0000	1.10
  +++ DefaultRegistry.java	24 Oct 2002 04:12:45 -0000	1.11
  @@ -135,6 +135,7 @@
        * @param parent the parent context
        * @param name the context name
        * @exception NullPointerException if the supplied name or parent is null
  +     * @exception MalformedURLException if the supplied name is inconsistent
        */
       public DefaultRegistry( final Registry parent, final String name )
           throws NullPointerException, MalformedURLException
  @@ -207,7 +208,7 @@
   
       /**
        * Bind a resource to the naming context.
  -     *
  +     * @param resource the resource to be bound
        * @exception IllegalArgumentException if the supplied resource
        *  name already exists within the immediate context
        */
  @@ -228,6 +229,7 @@
       /**
        * Unbind a resource from the naming context.
        *
  +     * @param resource the resource to be unbound
        * @exception IllegalArgumentException if the supplied resource is
        *   unknown within the immediate scope of the context
        */
  @@ -255,6 +257,7 @@
        * Resolves an object relative to the supplied URL.
        *
        * @param url the URL
  +     * @return the object corresponding to the supplied url
        * @exception Exception is an error occurs
        */
       public Object resolve( URL url ) throws Exception
  @@ -306,7 +309,9 @@
        * and fragment are protocol dependent.
        *
        * @param path the service uri
  -     * @exception Exception is an install error occurs
  +     * @return Resource the resource corresponding to the supplied URL
  +     * @exception InvalidPathException if the supplied path is invalid
  +     * @exception UnknownServiceException if the supplied path does not refer to a service
        */
       public Resource locate( String path ) throws UnknownServiceException, InvalidPathException
       {
  @@ -390,7 +395,7 @@
   
       /**
        * Returns a sub-registry by path.
  -     * @param uri the registry path
  +     * @param path the registry path
        * @return the subsidiary registry
        * @exception InvalidPathException if the supplied path is invalid
        * @exception UnknownServiceException if the supplied path does not refer to a registry
  @@ -467,7 +472,7 @@
   
       /**
        * Normalize a supplied path with the base URL of this registry.
  -     * @param path the uri path to normalize
  +     * @param url the uri path to normalize
        * @return the normalized path relative to this registry
        */
       public String normalize( URL url )
  
  
  
  1.8       +8 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/Handler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Handler.java	23 Oct 2002 16:33:09 -0000	1.7
  +++ Handler.java	24 Oct 2002 04:12:45 -0000	1.8
  @@ -179,10 +179,16 @@
           String user = url.getUserInfo();
   
           String host = url.getHost();
  -        if( host == null ) host = m_host;
  +        if( host == null ) 
  +        {
  +            host = m_host;
  +        }
   
           int port = url.getPort();
  -        if( port == -1 ) port = getDefaultPort();
  +        if( port == -1 ) 
  +        {
  +            port = getDefaultPort();
  +        }
   
           //
           // create authority string dependending of non-default port reference
  
  
  
  1.8       +4 -4      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/Registry.java
  
  Index: Registry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/Registry.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Registry.java	23 Oct 2002 16:33:09 -0000	1.7
  +++ Registry.java	24 Oct 2002 04:12:45 -0000	1.8
  @@ -75,20 +75,20 @@
        * @exception MalformedURLException if the name is invalid
        * @exception IllegalArgumentException if the name is already in use
        */
  -    public Registry createChild( String name )
  +    Registry createChild( String name )
           throws MalformedURLException, IllegalArgumentException;
   
       /**
        * Bind a resource to the naming context.
        * @param resource the resource
        */
  -    public void bind( Resource resource );
  +    void bind( Resource resource );
   
       /**
        * Unbind a resource from the naming context.
        * @param resource the resource
        */
  -    public void unbind( Resource resource );
  +    void unbind( Resource resource );
   
   }
   
  
  
  
  1.7       +6 -11     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceLocator.java
  
  Index: ServiceLocator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceLocator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ServiceLocator.java	23 Oct 2002 16:33:09 -0000	1.6
  +++ ServiceLocator.java	24 Oct 2002 04:12:45 -0000	1.7
  @@ -71,12 +71,13 @@
        *
        * @return the locator url
        */
  -    public URL getBase();
  +    URL getBase();
   
       /**
        * Resolves an object relative to the supplied URL.
        *
        * @param url the URL
  +     * @return the object resolved from the supplied URL
        * @exception Exception is an error occurs
        */
       Object resolve( URL url ) throws Exception;
  @@ -88,18 +89,12 @@
        * dependent).
        *
        * @param uri the service uri
  -     * @exception Exception is an install error occurs
  +     * @exception UnknownServiceException if the supplied URI cannot be resolved
  +     * @exception InvalidPathException if the supplied URI represents an invalid path
  +     * @return the resource
        * @deprecated
        */
       Resource locate( String uri ) throws UnknownServiceException, InvalidPathException;
  -
  -    /**
  -     * Normalize a supplied path with the base URL of this registry.
  -     * @param path the uri path to normalize
  -     * @return the normalized path relative to this registry
  -     * @deprecated
  -     */
  -    //public String normalize( String path );
   
   }
   
  
  
  
  1.10      +4 -4      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceManagementContext.java
  
  Index: ServiceManagementContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceManagementContext.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ServiceManagementContext.java	23 Oct 2002 16:33:09 -0000	1.9
  +++ ServiceManagementContext.java	24 Oct 2002 04:12:45 -0000	1.10
  @@ -75,20 +75,20 @@
        * @exception MalformedURLException if the name is invalid
        * @exception IllegalArgumentException if the name is already in use
        */
  -    public ServiceManagementContext createChild( String name )
  +    ServiceManagementContext createChild( String name )
           throws MalformedURLException, IllegalArgumentException;
   
       /**
        * Bind a resource to the naming context.
        * @param resource the resource
        */
  -    public void bind( Resource resource );
  +    void bind( Resource resource );
   
       /**
        * Unbind a resource from the naming context.
        * @param resource the resource
        */
  -    public void unbind( Resource resource );
  +    void unbind( Resource resource );
   
   }
   
  
  
  
  1.7       +6 -4      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServicePublisher.java
  
  Index: ServicePublisher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServicePublisher.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ServicePublisher.java	23 Oct 2002 16:33:09 -0000	1.6
  +++ ServicePublisher.java	24 Oct 2002 04:12:45 -0000	1.7
  @@ -76,20 +76,22 @@
        * Returns a list of sub-registries.
        * @return the subsidiary registries
        */
  -    public URL[] list();
  +    URL[] list();
   
       /**
        * Returns a list of sub-registries.
        * @return the subsidiary registries
        */
  -    public ServicePublisher[] getRegistries();
  +    ServicePublisher[] getRegistries();
   
       /**
        * Returns a sub-registry by path.
        * @param uri the registry path
        * @return the subsidiary registry
  +     * @exception UnknownServiceException if the name is invalid
  +     * @exception InvalidPathException if the name is already in use
        */
  -    public ServicePublisher getRegistry( String uri ) throws UnknownServiceException, InvalidPathException;
  +    ServicePublisher getRegistry( String uri ) throws UnknownServiceException, InvalidPathException;
   
   }
   
  
  
  
  1.8       +1 -0      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceURLConnection.java
  
  Index: ServiceURLConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/service/ServiceURLConnection.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ServiceURLConnection.java	23 Oct 2002 16:33:09 -0000	1.7
  +++ ServiceURLConnection.java	24 Oct 2002 04:12:45 -0000	1.8
  @@ -87,6 +87,7 @@
       /**
        * Creation of a new <code>ServiceURLConnection</code> handler.
        * @param url the base URL
  +     * @param registry the parent registry
        */
       public ServiceURLConnection( URL url, Registry registry )
       {
  
  
  
  1.7       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicContextInterface.java
  
  Index: BasicContextInterface.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicContextInterface.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BasicContextInterface.java	23 Oct 2002 16:33:10 -0000	1.6
  +++ BasicContextInterface.java	24 Oct 2002 04:12:45 -0000	1.7
  @@ -69,11 +69,11 @@
       /**
        * @return a string containing a location value
        */
  -    public String getLocation();
  +    String getLocation();
   
       /**
        * @return a file representing the working directory
        */
  -    public File getWorkingDirectory();
  +    File getWorkingDirectory();
   
   }
  
  
  
  1.8       +2 -0      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.java
  
  Index: ComplexComponent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ComplexComponent.java	23 Oct 2002 16:33:10 -0000	1.7
  +++ ComplexComponent.java	24 Oct 2002 04:12:45 -0000	1.8
  @@ -174,6 +174,7 @@
                           }
                           catch( Throwable e )
                           {
  +                            // ignore it
                           }
                       }
                   }
  @@ -196,6 +197,7 @@
           }
           catch( Throwable e )
           {
  +            // timeout
           }
       }
   
  
  
  
  1.6       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/Exploitable.java
  
  Index: Exploitable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/Exploitable.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Exploitable.java	23 Oct 2002 16:33:10 -0000	1.5
  +++ Exploitable.java	24 Oct 2002 04:12:45 -0000	1.6
  @@ -65,11 +65,11 @@
        * Method invoked by the extension handler for this type during
        * the create stage.
        */
  -    public void incarnate();
  +    void incarnate();
   
       /**
        * Method invoked by the extension handler for this type during
        * the destroy stage.
        */
  -    public void etherialize();
  +    void etherialize();
   }
  
  
  
  1.9       +2 -0      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/SimpleComponent.java
  
  Index: SimpleComponent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/SimpleComponent.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SimpleComponent.java	23 Oct 2002 16:33:10 -0000	1.8
  +++ SimpleComponent.java	24 Oct 2002 04:12:45 -0000	1.9
  @@ -184,6 +184,7 @@
                           }
                           catch( Throwable e )
                           {
  +                            // ignore it
                           }
                       }
                   }
  @@ -206,6 +207,7 @@
           }
           catch( Throwable e )
           {
  +            // timeout
           }
       }
   
  
  
  

--
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