commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgra...@apache.org
Subject cvs commit: jakarta-commons-sandbox/resources LICENSE.txt
Date Sun, 05 Oct 2003 17:20:42 GMT
dgraham     2003/10/05 10:20:42

  Modified:    resources/src/test/org/apache/commons/resources/impl
                        TestResourcesFactory.java
                        ResourceBundleResourcesTestCase.java
                        XMLResourcesTestCase.java
                        ResourcesFactoryBaseTestCase.java
                        PropertyResourcesTestCase.java
                        BasicMessageListTestCase.java
                        CollectionResourcesBaseTestCase.java
                        CollResources.java ResourcesBaseTestCase.java
                        TestResources.java CollResourcesFactory.java
                        BasicMessageTestCase.java
                        ResourceBundleResourcesFactoryTestCase.java
               resources/src/java/org/apache/commons/resources/impl
                        WebappPropertyResourcesFactory.java
                        PropertyResources.java WebappPropertyResources.java
                        ResourcesFactoryBase.java
                        WebappXMLResourcesFactory.java XMLResources.java
                        WebappXMLResources.java
                        ResourceBundleResources.java ResourcesBase.java
                        CollectionResourcesBase.java BasicMessageList.java
                        ResourceBundleResourcesFactory.java
                        BasicMessage.java PropertyResourcesFactory.java
                        XMLResourcesFactory.java
               resources/src/test/org/apache/commons/resources
                        MessagesTestCase.java
               resources/src/java/org/apache/commons/resources
                        MessageList.java Messages.java
                        ResourcesFactoryFinder.java ResourcesFactory.java
                        Resources.java ResourcesException.java Message.java
                        ResourcesKeyException.java
               resources LICENSE.txt
  Log:
  Fixed Apache license.
  
  Revision  Changes    Path
  1.4       +9 -12     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/TestResourcesFactory.java
  
  Index: TestResourcesFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/TestResourcesFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestResourcesFactory.java	28 Feb 2003 02:54:49 -0000	1.3
  +++ TestResourcesFactory.java	5 Oct 2003 17:20:41 -0000	1.4
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,13 +59,10 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import org.apache.commons.resources.Resources;
   import org.apache.commons.resources.ResourcesException;
  -
   
   /**
    * <p>Concrete implementation of {@link ResourcesFactory} for unit tests.</p>
  
  
  
  1.6       +9 -12     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourceBundleResourcesTestCase.java
  
  Index: ResourceBundleResourcesTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourceBundleResourcesTestCase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ResourceBundleResourcesTestCase.java	22 Sep 2003 00:44:00 -0000	1.5
  +++ ResourceBundleResourcesTestCase.java	5 Oct 2003 17:20:41 -0000	1.6
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,10 +59,8 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.util.Locale;
   
   import junit.framework.Test;
  @@ -71,7 +69,6 @@
   import org.apache.commons.resources.Resources;
   import org.apache.commons.resources.ResourcesException;
   import org.apache.commons.resources.ResourcesKeyException;
  -
   
   /**
    * <p>Unit tests for
  
  
  
  1.4       +10 -15    jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/XMLResourcesTestCase.java
  
  Index: XMLResourcesTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/XMLResourcesTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLResourcesTestCase.java	8 Sep 2003 18:14:56 -0000	1.3
  +++ XMLResourcesTestCase.java	5 Oct 2003 17:20:41 -0000	1.4
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,17 +59,13 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.net.URL;
   
   import junit.framework.Test;
   import junit.framework.TestSuite;
   
  -
  -
   /**
    * <p>Unit tests for
    * <code>org.apache.commons.resources.impl.XMLResources</code>.
  @@ -79,8 +75,7 @@
    * @version $Revision$ $Date$
    */
   
  -public class XMLResourcesTestCase
  -    extends CollectionResourcesBaseTestCase {
  +public class XMLResourcesTestCase extends CollectionResourcesBaseTestCase {
   
   
       // ----------------------------------------------------- Instance Variables
  
  
  
  1.3       +9 -12     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourcesFactoryBaseTestCase.java
  
  Index: ResourcesFactoryBaseTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourcesFactoryBaseTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourcesFactoryBaseTestCase.java	28 Feb 2003 02:54:50 -0000	1.2
  +++ ResourcesFactoryBaseTestCase.java	5 Oct 2003 17:20:41 -0000	1.3
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,16 +59,13 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import junit.framework.Test;
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   
   import org.apache.commons.resources.ResourcesFactory;
  -
   
   /**
    * <p>Unit tests for
  
  
  
  1.4       +9 -13     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/PropertyResourcesTestCase.java
  
  Index: PropertyResourcesTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/PropertyResourcesTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PropertyResourcesTestCase.java	8 Sep 2003 18:14:56 -0000	1.3
  +++ PropertyResourcesTestCase.java	5 Oct 2003 17:20:41 -0000	1.4
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,16 +59,12 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.net.URL;
   
   import junit.framework.Test;
   import junit.framework.TestSuite;
  -
  -
   
   /**
    * <p>Unit tests for
  
  
  
  1.4       +11 -5     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/BasicMessageListTestCase.java
  
  Index: BasicMessageListTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/BasicMessageListTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BasicMessageListTestCase.java	22 Sep 2003 00:58:25 -0000	1.3
  +++ BasicMessageListTestCase.java	5 Oct 2003 17:20:41 -0000	1.4
  @@ -1,4 +1,10 @@
   /*
  + * $Header$
  + * $Revision$
  + * $Date$
  + *
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
    * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  @@ -17,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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" and "Apache Software
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.7       +9 -13     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/CollectionResourcesBaseTestCase.java
  
  Index: CollectionResourcesBaseTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/CollectionResourcesBaseTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CollectionResourcesBaseTestCase.java	22 Sep 2003 00:44:00 -0000	1.6
  +++ CollectionResourcesBaseTestCase.java	5 Oct 2003 17:20:41 -0000	1.7
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,10 +59,8 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.util.ArrayList;
   import java.util.List;
   import java.util.Locale;
  @@ -72,8 +70,6 @@
   
   import org.apache.commons.resources.ResourcesException;
   import org.apache.commons.resources.ResourcesKeyException;
  -
  -
   
   /**
    * <p>Unit tests for
  
  
  
  1.3       +9 -12     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/CollResources.java
  
  Index: CollResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/CollResources.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CollResources.java	28 Feb 2003 02:54:50 -0000	1.2
  +++ CollResources.java	5 Oct 2003 17:20:41 -0000	1.3
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,14 +59,11 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.util.HashMap;
   import java.util.Locale;
   import java.util.Map;
  -
   
   /**
    * <p>Concrete implementation of {@link Resources} for unit tests.</p>
  
  
  
  1.8       +9 -12     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourcesBaseTestCase.java
  
  Index: ResourcesBaseTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourcesBaseTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ResourcesBaseTestCase.java	22 Sep 2003 00:44:00 -0000	1.7
  +++ ResourcesBaseTestCase.java	5 Oct 2003 17:20:41 -0000	1.8
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,10 +59,8 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.util.ArrayList;
   import java.util.Iterator;
   import java.util.List;
  @@ -74,7 +72,6 @@
   import org.apache.commons.resources.Resources;
   import org.apache.commons.resources.ResourcesException;
   import org.apache.commons.resources.ResourcesKeyException;
  -
   
   /**
    * <p>Unit tests for
  
  
  
  1.6       +9 -12     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/TestResources.java
  
  Index: TestResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/TestResources.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestResources.java	17 Aug 2003 03:34:14 -0000	1.5
  +++ TestResources.java	5 Oct 2003 17:20:41 -0000	1.6
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,10 +59,8 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Iterator;
  @@ -73,7 +71,6 @@
   
   import org.apache.commons.resources.ResourcesException;
   import org.apache.commons.resources.ResourcesKeyException;
  -
   
   /**
    * <p>Concrete implementation of {@link Resources} for unit tests.</p>
  
  
  
  1.3       +9 -12     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/CollResourcesFactory.java
  
  Index: CollResourcesFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/CollResourcesFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CollResourcesFactory.java	28 Feb 2003 02:54:50 -0000	1.2
  +++ CollResourcesFactory.java	5 Oct 2003 17:20:41 -0000	1.3
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,13 +59,10 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import org.apache.commons.resources.Resources;
   import org.apache.commons.resources.ResourcesException;
  -
   
   /**
    * <p>Concrete implementation of {@link ResourcesFactory} for unit tests.</p>
  
  
  
  1.3       +59 -48    jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/BasicMessageTestCase.java
  
  Index: BasicMessageTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/BasicMessageTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BasicMessageTestCase.java	28 Feb 2003 02:54:50 -0000	1.2
  +++ BasicMessageTestCase.java	5 Oct 2003 17:20:41 -0000	1.3
  @@ -1,7 +1,13 @@
   /*
  + * $Header$
  + * $Revision$
  + * $Date$
  + *
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -17,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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", "Struts", and "Apache Software
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -67,67 +73,72 @@
    * @author Dominique Plante
    * @version $Revision$ $Date$
    */
  -
  -public class BasicMessageTestCase extends TestCase
  -{
  -	protected BasicMessage amWithNoValue = null;
  -	protected BasicMessage amWithOneValue = null;
  +public class BasicMessageTestCase extends TestCase {
  +    
  +    protected BasicMessage amWithNoValue = null;
  +    
  +    protected BasicMessage amWithOneValue = null;
  +    
       /**
        * Defines the testcase name for JUnit.
        *
        * @param theName the testcase's name.
        */
  -	public BasicMessageTestCase(String theName)
  -	{
  -		super(theName);
  -	}
  +    public BasicMessageTestCase(String theName) {
  +        super(theName);
  +    }
   
       /**
        * Start the tests.
        *
        * @param theArgs the arguments. Not used
        */
  -    public static void main(String[] theArgs)
  -    {
  -        junit.awtui.TestRunner.main(new String[] {BasicMessageTestCase.class.getName()});
  +    public static void main(String[] theArgs) {
  +        junit.awtui.TestRunner.main(
  +            new String[] { BasicMessageTestCase.class.getName()});
       }
   
       /**
        * @return a test suite (<code>TestSuite</code>) that includes all methods
        *         starting with "test"
        */
  -    public static Test suite()
  -    {
  +    public static Test suite() {
           // All methods starting with "test" will be executed in the test suite.
           return new TestSuite(BasicMessageTestCase.class);
       }
   
  -	public void setUp()
  -	{
  -		amWithNoValue = new BasicMessage("amWithNoValue");
  -		amWithOneValue = new BasicMessage("amWithOneValue", new String("stringValue"));
  -	}
  -
  -	public void tearDown()
  -	{
  -		amWithNoValue = null;
  -	}
  -	public void testBasicMessageWithNoValue()
  -	{
  -		assertTrue("testBasicMessageWithNoValue value is not null",
  -                   amWithNoValue.getValues() == null);
  -		assertTrue("testBasicMessageWithNoValue key is not amWithNoValue",
  -					amWithNoValue.getKey() == "amWithNoValue");
  -	}
  -
  -	public void testBasicMessageWithAStringValue()
  -	{
  -		Object [] values = amWithOneValue.getValues();
  -		assertTrue("testBasicMessageWithAStringValue value is not null",
  -                   values != null);
  -		assertTrue("testBasicMessageWithAStringValue value[0] is not the string stringValue",
  -                   values[0].equals("stringValue"));
  -		assertTrue("testBasicMessageWithAStringValue key is not amWithOneValue",
  -					amWithOneValue.getKey() == "amWithOneValue");
  -	}
  +    public void setUp() {
  +        amWithNoValue = new BasicMessage("amWithNoValue");
  +        amWithOneValue =
  +            new BasicMessage("amWithOneValue", new String("stringValue"));
  +    }
  +
  +    public void tearDown() {
  +        amWithNoValue = null;
  +    }
  +    
  +    public void testBasicMessageWithNoValue() {
  +        assertTrue(
  +            "testBasicMessageWithNoValue value is not null",
  +            amWithNoValue.getValues() == null);
  +            
  +        assertTrue(
  +            "testBasicMessageWithNoValue key is not amWithNoValue",
  +            amWithNoValue.getKey() == "amWithNoValue");
  +    }
  +
  +    public void testBasicMessageWithAStringValue() {
  +        Object[] values = amWithOneValue.getValues();
  +        assertTrue(
  +            "testBasicMessageWithAStringValue value is not null",
  +            values != null);
  +            
  +        assertTrue(
  +            "testBasicMessageWithAStringValue value[0] is not the string stringValue",
  +            values[0].equals("stringValue"));
  +            
  +        assertTrue(
  +            "testBasicMessageWithAStringValue key is not amWithOneValue",
  +            amWithOneValue.getKey() == "amWithOneValue");
  +    }
   }
  
  
  
  1.3       +9 -12     jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourceBundleResourcesFactoryTestCase.java
  
  Index: ResourceBundleResourcesFactoryTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourceBundleResourcesFactoryTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourceBundleResourcesFactoryTestCase.java	28 Feb 2003 02:54:50 -0000	1.2
  +++ ResourceBundleResourcesFactoryTestCase.java	5 Oct 2003 17:20:41 -0000	1.3
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,16 +59,13 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import junit.framework.Test;
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   
   import org.apache.commons.resources.ResourcesFactory;
  -
   
   /**
    * <p>Unit tests for
  
  
  
  1.6       +8 -11     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java
  
  Index: WebappPropertyResourcesFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WebappPropertyResourcesFactory.java	22 Sep 2003 00:41:35 -0000	1.5
  +++ WebappPropertyResourcesFactory.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,15 +59,12 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import javax.servlet.ServletContext;
   
   import org.apache.commons.resources.Resources;
   import org.apache.commons.resources.ResourcesException;
  -
   
   /**
    * <p>Concrete implementation of {@link ResourcesFactory} that creates
  
  
  
  1.7       +8 -8      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/PropertyResources.java
  
  Index: PropertyResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/PropertyResources.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PropertyResources.java	22 Sep 2003 00:30:01 -0000	1.6
  +++ PropertyResources.java	5 Oct 2003 17:20:42 -0000	1.7
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.6       +8 -8      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappPropertyResources.java
  
  Index: WebappPropertyResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappPropertyResources.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WebappPropertyResources.java	22 Sep 2003 00:41:35 -0000	1.5
  +++ WebappPropertyResources.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.6       +8 -11     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java
  
  Index: ResourcesFactoryBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ResourcesFactoryBase.java	8 Sep 2003 18:40:00 -0000	1.5
  +++ ResourcesFactoryBase.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,10 +59,8 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  @@ -70,7 +68,6 @@
   import org.apache.commons.resources.Resources;
   import org.apache.commons.resources.ResourcesException;
   import org.apache.commons.resources.ResourcesFactory;
  -
   
   /**
    * <p>Convenience base class for {@link ResourcesFactory} implementations.
  
  
  
  1.6       +8 -11     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java
  
  Index: WebappXMLResourcesFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WebappXMLResourcesFactory.java	22 Sep 2003 00:41:35 -0000	1.5
  +++ WebappXMLResourcesFactory.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,15 +59,12 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import javax.servlet.ServletContext;
   
   import org.apache.commons.resources.Resources;
   import org.apache.commons.resources.ResourcesException;
  -
   
   /**
    * <p>Concrete implementation of {@link ResourcesFactory} that creates
  
  
  
  1.6       +8 -8      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/XMLResources.java
  
  Index: XMLResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/XMLResources.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLResources.java	22 Sep 2003 00:41:35 -0000	1.5
  +++ XMLResources.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.6       +8 -11     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappXMLResources.java
  
  Index: WebappXMLResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/WebappXMLResources.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WebappXMLResources.java	22 Sep 2003 00:41:35 -0000	1.5
  +++ WebappXMLResources.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,10 +59,8 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.io.FileNotFoundException;
   import java.io.IOException;
   import java.io.InputStream;
  @@ -76,7 +74,6 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.xml.sax.SAXException;
  -
   
   /**
    * <p>Concrete implementation of {@link Resources} that wraps a family
  
  
  
  1.11      +8 -8      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourceBundleResources.java
  
  Index: ResourceBundleResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourceBundleResources.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ResourceBundleResources.java	22 Sep 2003 00:41:35 -0000	1.10
  +++ ResourceBundleResources.java	5 Oct 2003 17:20:42 -0000	1.11
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.7       +8 -11     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourcesBase.java
  
  Index: ResourcesBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourcesBase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResourcesBase.java	17 Aug 2003 03:34:14 -0000	1.6
  +++ ResourcesBase.java	5 Oct 2003 17:20:42 -0000	1.7
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,10 +59,8 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import java.io.ByteArrayInputStream;
   import java.io.InputStream;
   import java.io.Reader;
  @@ -73,7 +71,6 @@
   
   import org.apache.commons.resources.Resources;
   import org.apache.commons.resources.ResourcesException;
  -
   
   /**
    * <p>Convenience base class for {@link Resources} implementations.</p>
  
  
  
  1.8       +8 -10     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/CollectionResourcesBase.java
  
  Index: CollectionResourcesBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/CollectionResourcesBase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CollectionResourcesBase.java	22 Sep 2003 00:41:35 -0000	1.7
  +++ CollectionResourcesBase.java	5 Oct 2003 17:20:42 -0000	1.8
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,9 +59,7 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
  -
   
   import java.util.ArrayList;
   import java.util.HashMap;
  
  
  
  1.9       +8 -8      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/BasicMessageList.java
  
  Index: BasicMessageList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/BasicMessageList.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BasicMessageList.java	30 Sep 2003 01:25:30 -0000	1.8
  +++ BasicMessageList.java	5 Oct 2003 17:20:42 -0000	1.9
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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" and "Apache Software
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.9       +8 -11     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactory.java
  
  Index: ResourceBundleResourcesFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/ResourceBundleResourcesFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ResourceBundleResourcesFactory.java	22 Sep 2003 00:41:35 -0000	1.8
  +++ ResourceBundleResourcesFactory.java	5 Oct 2003 17:20:42 -0000	1.9
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,13 +59,10 @@
    *
    */
   
  -
   package org.apache.commons.resources.impl;
   
  -
   import org.apache.commons.resources.Resources;
   import org.apache.commons.resources.ResourcesException;
  -
   
   /**
    * <p>Concrete implementation of {@link ResourcesFactory} that creates
  
  
  
  1.5       +8 -8      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/BasicMessage.java
  
  Index: BasicMessage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/BasicMessage.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BasicMessage.java	30 Sep 2003 01:25:30 -0000	1.4
  +++ BasicMessage.java	5 Oct 2003 17:20:42 -0000	1.5
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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" and "Apache Software
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.6       +8 -8      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/PropertyResourcesFactory.java
  
  Index: PropertyResourcesFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/PropertyResourcesFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PropertyResourcesFactory.java	22 Sep 2003 00:41:35 -0000	1.5
  +++ PropertyResourcesFactory.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.6       +8 -8      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/XMLResourcesFactory.java
  
  Index: XMLResourcesFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/impl/XMLResourcesFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLResourcesFactory.java	22 Sep 2003 00:41:35 -0000	1.5
  +++ XMLResourcesFactory.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.6       +8 -8      jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/MessagesTestCase.java
  
  Index: MessagesTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/MessagesTestCase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MessagesTestCase.java	2 Oct 2003 00:24:13 -0000	1.5
  +++ MessagesTestCase.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.6       +10 -10    jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/MessageList.java
  
  Index: MessageList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/MessageList.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MessageList.java	22 Sep 2003 00:25:12 -0000	1.5
  +++ MessageList.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -2,12 +2,12 @@
    * $Header$
    * $Revision$
    * $Date$
  - * 
  + *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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", "Scaffold", and "Apache Software
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.7       +8 -8      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/Messages.java
  
  Index: Messages.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/Messages.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Messages.java	2 Oct 2003 00:24:13 -0000	1.6
  +++ Messages.java	5 Oct 2003 17:20:42 -0000	1.7
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.3       +8 -9      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/ResourcesFactoryFinder.java
  
  Index: ResourcesFactoryFinder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/ResourcesFactoryFinder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourcesFactoryFinder.java	28 Feb 2003 02:50:34 -0000	1.2
  +++ ResourcesFactoryFinder.java	5 Oct 2003 17:20:42 -0000	1.3
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -58,7 +58,6 @@
    * <http://www.apache.org/>.
    *
    */
  -
   
   package org.apache.commons.resources;
   
  
  
  
  1.7       +8 -11     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/ResourcesFactory.java
  
  Index: ResourcesFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/ResourcesFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResourcesFactory.java	8 Sep 2003 18:41:32 -0000	1.6
  +++ ResourcesFactory.java	5 Oct 2003 17:20:42 -0000	1.7
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,12 +59,9 @@
    *
    */
   
  -
   package org.apache.commons.resources;
   
  -
   import java.io.Serializable;
  -
   
   /**
    * <a>A {@link ResourcesFactory} is a factory pattern interface for a
  
  
  
  1.11      +8 -10     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/Resources.java
  
  Index: Resources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/Resources.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Resources.java	17 Aug 2003 03:34:14 -0000	1.10
  +++ Resources.java	5 Oct 2003 17:20:42 -0000	1.11
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -61,14 +61,12 @@
   
   package org.apache.commons.resources;
   
  -
   import java.io.InputStream;
   import java.io.Reader;
   import java.io.Serializable;
   import java.util.Iterator;
   import java.util.Locale;
   import java.util.TimeZone;
  -
   
   /**
    * <p>An abstract representation of a set of internationalized resources,
  
  
  
  1.6       +9 -12     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/ResourcesException.java
  
  Index: ResourcesException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/ResourcesException.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ResourcesException.java	8 Sep 2003 18:40:00 -0000	1.5
  +++ ResourcesException.java	5 Oct 2003 17:20:42 -0000	1.6
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,12 +59,10 @@
    *
    */
   
  -
   package org.apache.commons.resources;
   
   import java.io.Serializable;
   
  -
   /**
    * <p>This class is a general purpose wrapper exception for problems
    * pertaining to Resources.</p>
  @@ -72,8 +70,7 @@
    * @author Mike Schachter (mschachter@hp.com)
    * @version $Revision$ $Date$
    */
  -public class ResourcesException
  -    extends RuntimeException implements Serializable {
  +public class ResourcesException extends RuntimeException implements Serializable {
   
       protected String message = "";
   
  
  
  
  1.3       +7 -7      jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/Message.java
  
  Index: Message.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/Message.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Message.java	6 Mar 2003 03:24:25 -0000	1.2
  +++ Message.java	5 Oct 2003 17:20:42 -0000	1.3
  @@ -2,12 +2,12 @@
    * $Header$
    * $Revision$
    * $Date$
  - * 
  + *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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", "Scaffold", and "Apache Software
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  
  1.3       +8 -11     jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/ResourcesKeyException.java
  
  Index: ResourcesKeyException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources/ResourcesKeyException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourcesKeyException.java	8 Sep 2003 18:41:01 -0000	1.2
  +++ ResourcesKeyException.java	5 Oct 2003 17:20:42 -0000	1.3
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  @@ -59,10 +59,8 @@
    *
    */
   
  -
   package org.apache.commons.resources;
   
  -
   /**
    * <p>Specialized subclass of {@link ResourcesException} that is thrown
    * by a resource getter method of a {@link Resources} instance, if an
  @@ -73,7 +71,6 @@
    * @version $Revision$ $Date$
    */
   public class ResourcesKeyException extends ResourcesException {
  -
   
       /**
        * <p>Construct an exception instance documenting that the specified
  
  
  
  1.2       +8 -8      jakarta-commons-sandbox/resources/LICENSE.txt
  
  Index: LICENSE.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/resources/LICENSE.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LICENSE.txt	17 Jul 2002 07:54:45 -0000	1.1
  +++ LICENSE.txt	5 Oct 2003 17:20:42 -0000	1.2
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,20 +23,20 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "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
  + * 4. The names, "Apache", "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.
  + *    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
  
  
  

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


Mime
View raw message