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/merlin-core/src/java/org/apache/avalon/merlin/container/builder ContainerBuilder.java ContainerCreator.java XMLContainerCreator.java
Date Sun, 13 Apr 2003 03:36:47 GMT
mcconnell    2003/04/12 20:36:47

  Modified:    merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder
                        ContainerBuilder.java ContainerCreator.java
                        XMLContainerCreator.java
  Log:
  Remove unused classloader parameter.
  
  Revision  Changes    Path
  1.3       +2 -2      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/ContainerBuilder.java
  
  Index: ContainerBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/ContainerBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContainerBuilder.java	13 Apr 2003 02:37:06 -0000	1.2
  +++ ContainerBuilder.java	13 Apr 2003 03:36:47 -0000	1.3
  @@ -108,7 +108,7 @@
               loader.getResourceAsStream( xprofile );
   
           final ContainerCreator creator = getXMLContainerCreator( xprofile );
  -        return creator.createPackagedContainmentProfiles( loader, type, inputStream );
  +        return creator.createPackagedContainmentProfiles( type, inputStream );
       }
   
       /**
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/ContainerCreator.java
  
  Index: ContainerCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/ContainerCreator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContainerCreator.java	13 Apr 2003 02:37:06 -0000	1.2
  +++ ContainerCreator.java	13 Apr 2003 03:36:47 -0000	1.3
  @@ -80,7 +80,7 @@
        * @throws Exception if an error occurs while creating the descriptor
        */
       ContainmentProfile[] createPackagedContainmentProfiles(
  -        ClassLoader loader, Type type, InputStream inputStream )
  +        Type type, InputStream inputStream )
           throws Exception;
   
       /**
  
  
  
  1.4       +4 -8      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/XMLContainerCreator.java
  
  Index: XMLContainerCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/XMLContainerCreator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLContainerCreator.java	13 Apr 2003 02:37:06 -0000	1.3
  +++ XMLContainerCreator.java	13 Apr 2003 03:36:47 -0000	1.4
  @@ -125,14 +125,13 @@
        * container type, loaded from specified {@link InputStream}.  If the
        * input stream is null, an implicit profile will be created.
        *
  -     * @param loader the classloader to use
        * @param type the base type
        * @param inputStream the InputStream to load Type from
        * @return the created set of container profiles
        * @throws Exception if an error occurs
        */
       public ContainmentProfile[] createPackagedContainmentProfiles(
  -        ClassLoader loader, Type type, InputStream inputStream )
  +        Type type, InputStream inputStream )
           throws Exception
       {
           if( inputStream != null )
  @@ -140,8 +139,7 @@
               final InputSource input = new InputSource( inputStream );
               final Configuration configuration =
                   ConfigurationBuilder.build( input );
  -            return createPackagedContainmentProfiles(
  -                loader, type, configuration );
  +            return createPackagedContainmentProfiles( type, configuration );
           }
           else
           {
  @@ -214,14 +212,12 @@
        * Create an array of {@link ContainmentProfile} object for specified
        * type from configuration data associated with a single type.
        *
  -     * @param loader the classloader to use
        * @param type the base component type
        * @param info the configuration
        * @return the created set of profiles
        * @throws ConfigurationException if an error occurs
        */
  -    private ContainmentProfile[] createPackagedContainmentProfiles(
  -        ClassLoader loader, Type type, final Configuration info )
  +    private ContainmentProfile[] createPackagedContainmentProfiles( Type type, final Configuration
info )
           throws Exception
       {
           ArrayList vector = new ArrayList();
  
  
  

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


Mime
View raw message