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/merlin/container Container.java
Date Thu, 22 Aug 2002 10:25:24 GMT
mcconnell    2002/08/22 03:25:24

  Modified:    assembly/src/java/org/apache/excalibur/merlin/container
                        Container.java
  Log:
  checkstyle ok
  
  Revision  Changes    Path
  1.14      +4 -15     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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Container.java	12 Aug 2002 02:33:05 -0000	1.13
  +++ Container.java	22 Aug 2002 10:25:23 -0000	1.14
  @@ -8,13 +8,9 @@
   
   package org.apache.excalibur.merlin.container;
   
  -import org.apache.excalibur.merlin.Controller;
   import org.apache.excalibur.merlin.model.Profile;
   import org.apache.excalibur.merlin.model.Resource;
  -import org.apache.excalibur.merlin.model.ContainerDescriptor;
   import org.apache.excalibur.merlin.model.ClasspathDescriptor;
  -import org.apache.excalibur.meta.info.ReferenceDescriptor;
  -import org.apache.excalibur.meta.info.Type;
   
   /**
    * A <code>Container</code> is a manager of a set of components and as such,
is responsible 
  @@ -130,6 +126,7 @@
      /**
       * Add and assemble the supplied set of profiles.
       * @param profiles the profiles to assemble
  +    * @exception Exception is an install error occurs
       */
       void install( Profile[] profiles ) 
         throws Exception;
  @@ -139,6 +136,7 @@
       * using the same container profile as this container and an empty classpath.
       *
       * @param name the name to assign to the new container
  +    * @return the new child container
       * @exception Exception is an error occurs
       */
       Container addContainer( String name ) 
  @@ -150,19 +148,10 @@
       *
       * @param name the name to assign to the new container
       * @param classpath the container classpath
  +    * @return the new child container
       * @exception Exception is an error occurs
       */
       Container addContainer( String name, ClasspathDescriptor classpath ) 
         throws Exception;
   
  -   /**
  -    * Creation of a new empty container associated as a subsidiary of this container.
  -    *
  -    * @param name the name to apply to the new container
  -    * @param descriptor the container meta descriptor
  -    * @param classpath the container classpath
  -    * @exception Exception is an error occurs
  -    */
  -    //public Container addContainer( ContainerDescriptor descriptor, ClasspathDescriptor
classpath ) 
  -    //  throws Exception;
   }
  
  
  

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