commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpoes...@apache.org
Subject cvs commit: jakarta-commons-sandbox/configuration/xdocs index.xml
Date Wed, 28 Aug 2002 18:16:02 GMT
mpoeschl    2002/08/28 11:16:02

  Modified:    configuration project.properties project.xml
               configuration/src/java/org/apache/commons/configuration
                        BaseConfiguration.java Configuration.java
                        ConfigurationConverter.java
                        PropertiesConfiguration.java XmlConfiguration.java
               configuration/src/test/org/apache/commons/configuration
                        TestBaseConfiguration.java
                        TestConfigurationConverter.java
               configuration/xdocs index.xml
  Log:
  cleanup configuration package
  - code formatting
  - javadocs
  no functional changes
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-commons-sandbox/configuration/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	8 May 2002 15:57:53 -0000	1.2
  +++ project.properties	28 Aug 2002 18:16:02 -0000	1.3
  @@ -6,4 +6,4 @@
   compile.optimize = off
   compile.deprecation = off
   
  -maven.checkstyle.header.file=/dev/null
  +maven.checkstyle.format = turbine
  
  
  
  1.8       +8 -4      jakarta-commons-sandbox/configuration/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	4 Jul 2002 08:43:24 -0000	1.7
  +++ project.xml	28 Aug 2002 18:16:02 -0000	1.8
  @@ -78,17 +78,21 @@
     </developers>
   
     <dependencies>
  -
       <dependency>
         <id>commons-collections</id>
         <version>2.0</version>
       </dependency>
  -
  +<!--
       <dependency>
         <id>commons-logging</id>
  -      <version>1.0</version>
  +      <version>1.0.1</version>
  +    </dependency>
  +-->
  +    <dependency>
  +      <id>junit</id>
  +      <version>3.7</version>
  +      <url>http://www.junit.org</url>
       </dependency>
  -
     </dependencies>
   
     <build>
  
  
  
  1.3       +22 -24    jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/BaseConfiguration.java
  
  Index: BaseConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/BaseConfiguration.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BaseConfiguration.java	17 Jul 2002 17:36:43 -0000	1.2
  +++ BaseConfiguration.java	28 Aug 2002 18:16:02 -0000	1.3
  @@ -3,7 +3,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -18,21 +18,21 @@
    *    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:
  + * 3. The end-user documentation included with the redistribution, if
  + *    any, must include the following acknowlegement:
    *       "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.
  + *    Alternately, this acknowlegement may appear in the software itself,
  + *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - *    "Apache Turbine" 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.
  + * 4. The names "The Jakarta Project", "Commons", 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without
  - *    prior written permission of the Apache Software Foundation.
  + * 5. Products derived from this software may not be called "Apache"
  + *    nor may "Apache" appear in their names without prior written
  + *    permission of the Apache Group.
    *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  @@ -98,8 +98,8 @@
        */
       protected ArrayList keysAsListed = new ArrayList();
   
  -    protected final static String START_TOKEN = "${";
  -    protected final static String END_TOKEN = "}";
  +    protected static final String START_TOKEN = "${";
  +    protected static final String END_TOKEN = "}";
   
       /**
        * Add a property to the configuration. If it already exists then the value
  @@ -619,7 +619,7 @@
           }
           else if (value instanceof String)
           {
  -            String s = testBoolean((String)value);
  +            String s = testBoolean((String) value);
               Boolean b = new Boolean(s);
               store.put(key, b);
               return b;
  @@ -1117,8 +1117,7 @@
        * @exception NumberFormatException is thrown if the value mapped
        * by the key has not a valid number format.
        */
  -    public short getShort(String key,
  -                          short defaultValue)
  +    public short getShort(String key, short defaultValue)
       {
           return getShort(key, new Short(defaultValue)).shortValue();
       }
  @@ -1135,8 +1134,7 @@
        * @exception NumberFormatException is thrown if the value mapped
        * by the key has not a valid number format.
        */
  -    public Short getShort(String key,
  -                          Short defaultValue)
  +    public Short getShort(String key, Short defaultValue)
       {
           Object value = store.get(key);
   
  @@ -1196,7 +1194,7 @@
   
           if (value instanceof String)
           {
  -            return (String) interpolate((String)value);
  +            return (String) interpolate((String) value);
           }
           else if (value == null)
           {
  @@ -1238,11 +1236,11 @@
           if (value instanceof String)
           {
               vector = new Vector(1);
  -            vector.addElement(interpolate((String)value));
  +            vector.addElement(interpolate((String) value));
           }
           else if (value instanceof Vector)
           {
  -            vector = (Vector)value;
  +            vector = (Vector) value;
           }
           else if (value == null)
           {
  @@ -1264,7 +1262,7 @@
           String[] tokens = new String[vector.size()];
           for (int i = 0; i < tokens.length; i++)
           {
  -            tokens[i] = (String)vector.elementAt(i);
  +            tokens[i] = (String) vector.elementAt(i);
           }
   
           return tokens;
  
  
  
  1.2       +14 -14    jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/Configuration.java
  
  Index: Configuration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/Configuration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Configuration.java	16 Apr 2002 19:05:25 -0000	1.1
  +++ Configuration.java	28 Aug 2002 18:16:02 -0000	1.2
  @@ -3,7 +3,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -18,21 +18,21 @@
    *    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:
  + * 3. The end-user documentation included with the redistribution, if
  + *    any, must include the following acknowlegement:
    *       "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.
  + *    Alternately, this acknowlegement may appear in the software itself,
  + *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without
  - *    prior written permission of the Apache Software Foundation.
  + * 4. The names "The Jakarta Project", "Commons", 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 names without prior written
  + *    permission of the Apache Group.
    *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  
  
  
  1.3       +17 -17    jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/ConfigurationConverter.java
  
  Index: ConfigurationConverter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/ConfigurationConverter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfigurationConverter.java	17 Jul 2002 17:36:43 -0000	1.2
  +++ ConfigurationConverter.java	28 Aug 2002 18:16:02 -0000	1.3
  @@ -3,7 +3,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -18,21 +18,21 @@
    *    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:
  + * 3. The end-user documentation included with the redistribution, if
  + *    any, must include the following acknowlegement:
    *       "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.
  + *    Alternately, this acknowlegement may appear in the software itself,
  + *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without
  - *    prior written permission of the Apache Software Foundation.
  + * 4. The names "The Jakarta Project", "Commons", 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 names without prior written
  + *    permission of the Apache Group.
    *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  @@ -79,7 +79,7 @@
       public static Configuration getConfiguration(ExtendedProperties ep)
       {
           Configuration config = (Configuration) new BaseConfiguration();
  -        for (Iterator i = ep.getKeys() ; i.hasNext() ;)
  +        for (Iterator i = ep.getKeys(); i.hasNext();)
           {
               String key = (String) i.next();
               config.setProperty(key, ep.getProperty(key));
  @@ -96,7 +96,7 @@
       public static Configuration getConfiguration(Properties p)
       {
           Configuration config = (Configuration) new BaseConfiguration();
  -        for (Enumeration e = p.keys(); e.hasMoreElements() ; )
  +        for (Enumeration e = p.keys(); e.hasMoreElements();)
           {
               String key = (String) e.nextElement();
               config.setProperty(key, p.getProperty(key));
  @@ -113,7 +113,7 @@
       public static ExtendedProperties getExtendedProperties(Configuration c)
       {
           ExtendedProperties props = new ExtendedProperties();
  -        for (Iterator i = c.getKeys() ; i.hasNext() ; )
  +        for (Iterator i = c.getKeys(); i.hasNext();)
           {
               String key = (String) i.next();
               props.setProperty(key, c.getProperty(key));
  
  
  
  1.3       +26 -26    jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/PropertiesConfiguration.java
  
  Index: PropertiesConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/PropertiesConfiguration.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PropertiesConfiguration.java	17 Jul 2002 17:36:43 -0000	1.2
  +++ PropertiesConfiguration.java	28 Aug 2002 18:16:02 -0000	1.3
  @@ -3,7 +3,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -18,21 +18,21 @@
    *    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:
  + * 3. The end-user documentation included with the redistribution, if
  + *    any, must include the following acknowlegement:
    *       "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.
  + *    Alternately, this acknowlegement may appear in the software itself,
  + *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without
  - *    prior written permission of the Apache Software Foundation.
  + * 4. The names "The Jakarta Project", "Commons", 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 names without prior written
  + *    permission of the Apache Group.
    *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  @@ -177,7 +177,7 @@
        * Creates and loads the extended properties from the specified file.
        *
        * @param file A String.
  -     * @exception IOException.
  +     * @throws IOException
        */
       public PropertiesConfiguration(String file) throws IOException
       {
  @@ -191,8 +191,8 @@
        * Creates and loads the extended properties from the specified file.
        *
        * @param file A String.
  -     * @param Configuration defaults to use if key not in file
  -     * @exception IOException.
  +     * @param defaultConfig Configuration defaults to use if key not in file
  +     * @throws IOException
        */
       public PropertiesConfiguration(String file, Configuration defaultConfig)
           throws IOException
  @@ -204,9 +204,8 @@
       /**
        * Creates the extended properties with the specified defaults
        *
  -     * @param file A String.
  -     * @param Configuration defaults to use if key not in file
  -     * @exception IOException.
  +     * @param defaultConfig Configuration defaults to use if key not in file
  +     * @throws IOException
        */
       public PropertiesConfiguration(Configuration defaultConfig)
           throws IOException
  @@ -218,7 +217,8 @@
        * Creates and loads the extended properties from the specified file.
        *
        * @param file A String.
  -     * @exception IOException.
  +     * @param defaultFile A String.
  +     * @throws IOException
        */
       public PropertiesConfiguration(String file, String defaultFile)
           throws IOException
  @@ -234,7 +234,7 @@
        * Load the properties from the given input stream.
        *
        * @param input An InputStream.
  -     * @exception IOException.
  +     * @throws IOException
        */
       public void load(InputStream input) throws IOException
       {
  @@ -247,7 +247,7 @@
        *
        * @param input An InputStream.
        * @param enc An encoding.
  -     * @exception IOException.
  +     * @exception IOException
        */
       public synchronized void load(InputStream input, String enc)
               throws IOException
  @@ -327,12 +327,12 @@
   
                           if (file != null && file.exists() && file.canRead())
                           {
  -                            load ( new FileInputStream(file));
  +                            load(new FileInputStream(file));
                           }
                       }
                       else
                       {
  -                        addProperty(key,value);
  +                        addProperty(key, value);
                       }
                   }
               }
  @@ -391,7 +391,7 @@
            * Read a property.
            *
            * @return A String.
  -         * @exception IOException.
  +         * @exception IOException
            */
           public String readProperty() throws IOException
           {
  
  
  
  1.2       +56 -1     jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/XmlConfiguration.java
  
  Index: XmlConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/XmlConfiguration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XmlConfiguration.java	16 Apr 2002 19:05:25 -0000	1.1
  +++ XmlConfiguration.java	28 Aug 2002 18:16:02 -0000	1.2
  @@ -1,5 +1,60 @@
   package org.apache.commons.configuration;
   
  +/* ====================================================================
  + * 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
  + * 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 acknowlegement:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowlegement may appear in the software itself,
  + *    if and wherever such third-party acknowlegements normally appear.
  + *
  + * 4. The names "The Jakarta Project", "Commons", 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 names without prior written
  + *    permission of the Apache Group.
  + *
  + * 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/>.
  + */
  +
  +
   /**
    * <configuration>
    *   <entries>
  @@ -11,7 +66,7 @@
    * </configuration>
    *
    */
  -public class XmlConfiguration 
  +public class XmlConfiguration
       extends BaseConfiguration
   {
   }
  
  
  
  1.2       +14 -14    jakarta-commons-sandbox/configuration/src/test/org/apache/commons/configuration/TestBaseConfiguration.java
  
  Index: TestBaseConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/src/test/org/apache/commons/configuration/TestBaseConfiguration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestBaseConfiguration.java	16 Apr 2002 19:05:25 -0000	1.1
  +++ TestBaseConfiguration.java	28 Aug 2002 18:16:02 -0000	1.2
  @@ -3,7 +3,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -18,21 +18,21 @@
    *    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:
  + * 3. The end-user documentation included with the redistribution, if
  + *    any, must include the following acknowlegement:
    *       "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.
  + *    Alternately, this acknowlegement may appear in the software itself,
  + *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without
  - *    prior written permission of the Apache Software Foundation.
  + * 4. The names "The Jakarta Project", "Commons", 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 names without prior written
  + *    permission of the Apache Group.
    *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  
  
  
  1.2       +14 -14    jakarta-commons-sandbox/configuration/src/test/org/apache/commons/configuration/TestConfigurationConverter.java
  
  Index: TestConfigurationConverter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/src/test/org/apache/commons/configuration/TestConfigurationConverter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestConfigurationConverter.java	16 Apr 2002 19:05:25 -0000	1.1
  +++ TestConfigurationConverter.java	28 Aug 2002 18:16:02 -0000	1.2
  @@ -3,7 +3,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -18,21 +18,21 @@
    *    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:
  + * 3. The end-user documentation included with the redistribution, if
  + *    any, must include the following acknowlegement:
    *       "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.
  + *    Alternately, this acknowlegement may appear in the software itself,
  + *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without
  - *    prior written permission of the Apache Software Foundation.
  + * 4. The names "The Jakarta Project", "Commons", 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 names without prior written
  + *    permission of the Apache Group.
    *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/configuration/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/configuration/xdocs/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	8 May 2002 16:19:55 -0000	1.1
  +++ index.xml	28 Aug 2002 18:16:02 -0000	1.2
  @@ -5,10 +5,10 @@
       <author email="pete@kazmier.com">Pete Kazmier</author>
       <author email="mpoeschl@marmot.at">Martin Poeschl</author>
       <author email="jason@zenplex.com">Jason van Zyl</author>
  -    <title>Stratum</title>
  +    <title>Configuration</title>
     </properties>
   
  -  <body> 
  +  <body>
       <section name="Configuration">
         <table>
           <tr><th>Component</th><th>Description</th></tr>
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message