avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From leosim...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel Kernel.java KernelLoader.java
Date Wed, 16 Apr 2003 14:22:46 GMT
leosimons    2003/04/16 07:22:46

  Modified:    merlin/merlin-spi/src/java/org/apache/avalon/merlin/block
                        Block.java
               merlin/merlin-spi/src/java/org/apache/avalon/merlin/container
                        Container.java ContainmentProfile.java
               merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel
                        Kernel.java KernelLoader.java
  Log:
  optimize imports, remove unused stuff.
  
  Revision  Changes    Path
  1.5       +2 -3      avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/block/Block.java
  
  Index: Block.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/block/Block.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Block.java	15 Apr 2003 14:33:43 -0000	1.4
  +++ Block.java	16 Apr 2003 14:22:44 -0000	1.5
  @@ -50,11 +50,10 @@
   
   package org.apache.avalon.merlin.block;
   
  -import java.net.URL;
   import org.apache.avalon.assembly.appliance.Appliance;
   
   /**
  - * A block is a deployment model supporting composite components. A block is 
  + * A block is a deployment model supporting composite components. A block is
    * both an appliance and a proxy to a container.  As an appliance it manages
    * the deployment of a root container.  As a container it handles delatation
    * of containment lifecycle operations to the managed container instance.
  
  
  
  1.2       +20 -21    avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/container/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/container/Container.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Container.java	11 Apr 2003 15:51:38 -0000	1.1
  +++ Container.java	16 Apr 2003 14:22:45 -0000	1.2
  @@ -1,14 +1,14 @@
  -/* ==================================================================== 
  - * 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 
  +/* ====================================================================
  + * 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
  @@ -20,13 +20,13 @@
    *    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  
  + *    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" 
  + * 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 
  + *    software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache",
  @@ -49,17 +49,16 @@
    *
    * 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 
  + * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  - */ 
  + */
   
   package org.apache.avalon.merlin.container;
   
   import org.apache.avalon.framework.Version;
  -import org.apache.avalon.assembly.appliance.DependencyGraph;
   
   /**
  - * <p>A container is node in a containment heirachy. It defines a scope 
  + * <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:dev@avalon.apache.org">Avalon Development Team</a>
  @@ -72,7 +71,7 @@
       public static final String PATH_SEPERATOR = "/";
   
      /**
  -    * Startup the components in this container and startup all subsidiary 
  +    * Startup the components in this container and startup all subsidiary
       * containers.
       * @exception Exception if a startup error occurs
       */
  
  
  
  1.3       +20 -20    avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/container/ContainmentProfile.java
  
  Index: ContainmentProfile.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/container/ContainmentProfile.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContainmentProfile.java	15 Apr 2003 03:06:17 -0000	1.2
  +++ ContainmentProfile.java	16 Apr 2003 14:22:45 -0000	1.3
  @@ -1,14 +1,14 @@
  -/* ==================================================================== 
  - * 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 
  +/* ====================================================================
  + * 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
  @@ -20,13 +20,13 @@
    *    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  
  + *    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" 
  + * 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 
  + *    software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache",
  @@ -49,18 +49,19 @@
    *
    * 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 
  + * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
  - */ 
  + */
   
   package org.apache.avalon.merlin.container;
   
   import java.util.ArrayList;
  +
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.meta.info.Type;
  -import org.apache.avalon.meta.model.LoggingDirective;
   import org.apache.avalon.meta.model.ContextDirective;
  +import org.apache.avalon.meta.model.LoggingDirective;
   import org.apache.avalon.meta.model.Mode;
   import org.apache.avalon.meta.model.Profile;
   
  @@ -225,7 +226,6 @@
        */
       public Profile[] getComponents( Mode mode )
       {
  -        ArrayList list = new ArrayList();
           Profile[] components = getComponents( );
           return selectComponentsByMode( components, mode );
       }
  
  
  
  1.3       +2 -4      avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java
  
  Index: Kernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Kernel.java	6 Apr 2003 19:24:52 -0000	1.2
  +++ Kernel.java	16 Apr 2003 14:22:45 -0000	1.3
  @@ -50,12 +50,10 @@
   
   package org.apache.avalon.merlin.kernel;
   
  -import java.net.URL;
  -
   import org.apache.avalon.merlin.block.Block;
   
   /**
  - * A service that provides support for the establishment and management of a set 
  + * A service that provides support for the establishment and management of a set
    * of component container.
    * <p><b>UML</b></p>
    * <p><image src="doc-files/Kernel.gif" border="0"/></p>
  
  
  
  1.2       +8 -11     avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/KernelLoader.java
  
  Index: KernelLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/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	13 Mar 2003 01:05:57 -0000	1.1
  +++ KernelLoader.java	16 Apr 2003 14:22:45 -0000	1.2
  @@ -4,11 +4,8 @@
   
   import java.util.Map;
   
  -import org.apache.avalon.merlin.kernel.Kernel;
  -import org.apache.avalon.merlin.kernel.KernelException;
  -
   /**
  - * The KernelLoader provides support for the establishment of a kernel 
  + * The KernelLoader provides support for the establishment of a kernel
    * instance.
    *
    * @see Kernel
  @@ -17,8 +14,8 @@
   {
   
      /**
  -    * Creation of a new Kernel instance.  Arguments passed 
  -    * passed to the kernel build operation are detailed in the following 
  +    * Creation of a new Kernel instance.  Arguments passed
  +    * passed to the kernel build operation are detailed in the following
       * table.
       *
       * <table BORDER="1" CELLSPACING="0" CELLPADDING="3" WIDTH="90%" >
  @@ -28,12 +25,12 @@
       *   <tr>
       *     <td><code>urn:merlin:home</code></td>
       *     <td>{@link java.io.File}</td>
  -    *     <td>The working home directory.</td> 
  +    *     <td>The working home directory.</td>
       *   </tr>
       *   <tr>
       *     <td><code>urn:merlin:system</code></td>
       *     <td>{@link java.io.File}</td>
  -    *     <td>The Merlin system directory.</td> 
  +    *     <td>The Merlin system directory.</td>
       *   </tr>
       *   <tr>
       *     <td><code>urn:merlin:classloader.common</code></td>
  @@ -43,13 +40,13 @@
       *   <tr>
       *     <td><code>urn:merlin:classloader.system</code></td>
       *     <td>{@link java.lang.ClassLoader}</td>
  -    *     <td>The Merlin internal classloader.</td> 
  +    *     <td>The Merlin internal classloader.</td>
       *   </tr>
       *   <tr>
       *     <td><code>urn:merlin:debug</code></td>
       *     <td>{@link java.lang.String}</td>
  -    *     <td>An optional system logging priority (a value of INFO, WARN, ERROR,
or DEBUG) to 
  -    *       be used for internal Merlin execution.</td> 
  +    *     <td>An optional system logging priority (a value of INFO, WARN, ERROR,
or DEBUG) to
  +    *       be used for internal Merlin execution.</td>
       *   </tr>
       * </table>
       *
  
  
  

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


Mime
View raw message