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/assembly/src/java/org/apache/avalon/assembly/appliance DefaultAppliance.java DefaultApplianceContext.java DefaultApplianceManager.java MappedServiceManager.java
Date Sat, 21 Dec 2002 03:44:09 GMT
mcconnell    2002/12/20 19:44:08

  Modified:    assembly/src/java/org/apache/avalon/assembly/appliance
                        DefaultAppliance.java DefaultApplianceContext.java
                        DefaultApplianceManager.java
                        MappedServiceManager.java
  Log:
  Doc updates and spelling.
  
  Revision  Changes    Path
  1.16      +5 -10     avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DefaultAppliance.java	21 Dec 2002 03:28:37 -0000	1.15
  +++ DefaultAppliance.java	21 Dec 2002 03:44:08 -0000	1.16
  @@ -83,7 +83,10 @@
   import org.apache.avalon.meta.model.ContextDirective;
   
   /**
  - * Default implementation of an applaince.
  + * Default implementation of an appliance that supports the association of 
  + * depedent appliance instances, appliance lifestyle handler, and establishes
  + * the appliance URL.
  + *
    * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
  @@ -297,14 +300,6 @@
       public String getName()
       {
           return m_name;
  -    }
  -
  -   /**
  -    * Get the appliance context.
  -    */
  -    public ApplianceContext getApplianceContext()
  -    {
  -        return m_context;
       }
   
       /**
  
  
  
  1.2       +10 -9     avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceContext.java
  
  Index: DefaultApplianceContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultApplianceContext.java	21 Dec 2002 03:28:37 -0000	1.1
  +++ DefaultApplianceContext.java	21 Dec 2002 03:44:08 -0000	1.2
  @@ -86,7 +86,8 @@
   
   /**
    * An appliance context aggregates the set of arguments that are supplied to
  - * and appliance instance.
  + * and appliance instance. These arguments are applied relative to a base
  + * profile declared under the appliance context constructor.
    * 
    * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
  @@ -184,7 +185,7 @@
       */
       public void setName( String name ) throws NullPointerException, IllegalStateException
       {
  -        checkWritable();
  +        checkWriteable();
           if( name == null )
           {
               throw new NullPointerException( "name" );
  @@ -236,7 +237,7 @@
       public void setLoggingDirective( LoggingDirective directives ) 
         throws IllegalStateException, NullPointerException
       {
  -        checkWritable();
  +        checkWriteable();
           if( directives == null )
           {
               throw new NullPointerException( "logging" );
  @@ -278,7 +279,7 @@
       */
       public void setPartitionName( final String name ) throws IllegalStateException
       {
  -        checkWritable();
  +        checkWriteable();
           if( name == null )
           {
               m_partition = PARTITION_DELIMITER;
  @@ -319,7 +320,7 @@
       */
       public void setActivationPolicy( final boolean policy )
       {
  -        checkWritable();
  +        checkWriteable();
           m_activation = policy;
       }
   
  @@ -344,7 +345,7 @@
       */
       public void setDeploymentContext( final Map map ) throws IllegalStateException
       {
  -        checkWritable();
  +        checkWriteable();
           m_context = map;
       }
   
  @@ -373,7 +374,7 @@
        */
       public void addParameters( Parameters parameters ) throws IllegalStateException, NullPointerException
       {
  -        checkWritable();
  +        checkWriteable();
           if( parameters == null )
           {
               throw new NullPointerException("parameters");
  @@ -410,7 +411,7 @@
        */
       public void addConfiguration( Configuration config ) throws IllegalStateException,
NullPointerException
       {
  -        checkWritable();
  +        checkWriteable();
           if( config == null )
           {
               throw new NullPointerException("configuration");
  
  
  
  1.10      +2 -7      avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceManager.java
  
  Index: DefaultApplianceManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultApplianceManager.java	20 Dec 2002 11:54:28 -0000	1.9
  +++ DefaultApplianceManager.java	21 Dec 2002 03:44:08 -0000	1.10
  @@ -81,7 +81,7 @@
   
   /**
    * The default appliance manager provides support for {@link Appliance}
  - * creation, registration and retrival.
  + * registration and retrival.
    *
    * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
  @@ -104,11 +104,6 @@
        */
       private final ArrayList m_appliances = new ArrayList();
           
  -   /**
  -    * The default appliance factory.
  -    */
  -    //private ApplianceFactory m_factory;
  -
      /**
       * The engine.
       */
  
  
  
  1.2       +50 -54    avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/MappedServiceManager.java
  
  Index: MappedServiceManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/MappedServiceManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MappedServiceManager.java	7 Dec 2002 09:34:27 -0000	1.1
  +++ MappedServiceManager.java	21 Dec 2002 03:44:08 -0000	1.2
  @@ -1,57 +1,53 @@
  -/* ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1997-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/>.
  - */
  +/*
  +
  + ============================================================================
  +                   The Apache Software License, Version 1.1
  + ============================================================================
  +
  + Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  +
  + Redistribution and use in source and binary forms, with or without modifica-
  + tion, 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", "Apache Avalon", "Avalon Framework" 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 (INCLU-
  + DING, 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.avalon.assembly.appliance;
   
   import java.util.HashMap;
  
  
  

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