avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: avalon-excalibur/i18n/src/java/org/apache/avalon/excalibur/i18n ResourceManager.java Resources.java
Date Tue, 24 Feb 2004 14:24:28 GMT
cziegeler    2004/02/24 06:24:28

  Modified:    i18n/xdocs navigation.xml download.xml index.xml usage.xml
               i18n     build.xml project.properties maven.xml project.xml
               i18n/src/test/org/apache/avalon/excalibur/i18n/test
                        ResourceManagerTestCase.java
               i18n/src/java/org/apache/avalon/excalibur/i18n
                        ResourceManager.java Resources.java
  Added:       i18n     LICENSE.txt
  Log:
  Moving to license 2.0
  
  Revision  Changes    Path
  1.4       +16 -0     avalon-excalibur/i18n/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/xdocs/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml	28 Oct 2003 11:43:58 -0000	1.3
  +++ navigation.xml	24 Feb 2004 14:24:27 -0000	1.4
  @@ -1,4 +1,20 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <project>
   
    <title>Avalon Sandbox</title>
  
  
  
  1.2       +16 -1     avalon-excalibur/i18n/xdocs/download.xml
  
  Index: download.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/xdocs/download.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- download.xml	9 Sep 2003 21:57:43 -0000	1.1
  +++ download.xml	24 Feb 2004 14:24:27 -0000	1.2
  @@ -1,5 +1,20 @@
   <?xml version="1.0"?>
  -
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <document>
   
     <properties>
  
  
  
  1.2       +16 -1     avalon-excalibur/i18n/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/xdocs/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	9 Sep 2003 21:57:43 -0000	1.1
  +++ index.xml	24 Feb 2004 14:24:27 -0000	1.2
  @@ -1,5 +1,20 @@
   <?xml version="1.0"?>
  -
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <document>
   
       <properties>
  
  
  
  1.3       +16 -1     avalon-excalibur/i18n/xdocs/usage.xml
  
  Index: usage.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/xdocs/usage.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- usage.xml	12 Sep 2003 17:18:32 -0000	1.2
  +++ usage.xml	24 Feb 2004 14:24:27 -0000	1.3
  @@ -1,5 +1,20 @@
   <?xml version="1.0"?>
  -
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <document>
   
       <properties>
  
  
  
  1.64      +16 -2     avalon-excalibur/i18n/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/build.xml,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- build.xml	20 Aug 2003 13:31:25 -0000	1.63
  +++ build.xml	24 Feb 2004 14:24:28 -0000	1.64
  @@ -1,6 +1,20 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -
  -
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <project default="warning" name="Gump Build Support - DO NOT HAND-EDIT!!!" basedir=".">
   
       <property file="${basedir}/project.properties"></property>
  
  
  
  1.8       +17 -0     avalon-excalibur/i18n/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/project.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.properties	14 Nov 2003 14:49:02 -0000	1.7
  +++ project.properties	24 Feb 2004 14:24:28 -0000	1.8
  @@ -1,3 +1,20 @@
  +# 
  +# Copyright 2004 Apache Software Foundation
  +# Licensed  under the  Apache License,  Version 2.0  (the "License");
  +# you may not use  this file  except in  compliance with the License.
  +# You may obtain a copy of the License at 
  +# 
  +#   http://www.apache.org/licenses/LICENSE-2.0
  +# 
  +# Unless required by applicable law or agreed to in writing, software
  +# distributed  under the  License is distributed on an "AS IS" BASIS,
  +# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  +# implied.
  +#  
  +# See the License for the specific language governing permissions and
  +# limitations under the License.
  +#
  +#
   # gump integration
   project.name = excalibur-i18n
   
  
  
  
  1.3       +16 -0     avalon-excalibur/i18n/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	12 Sep 2003 17:18:32 -0000	1.2
  +++ maven.xml	24 Feb 2004 14:24:28 -0000	1.3
  @@ -1,3 +1,19 @@
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <project default="site" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
   
     <property file="${basedir}/build.properties"/>
  
  
  
  1.3       +16 -1     avalon-excalibur/i18n/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	12 Sep 2003 17:18:32 -0000	1.2
  +++ project.xml	24 Feb 2004 14:24:28 -0000	1.3
  @@ -1,5 +1,20 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  -
  +<!-- 
  + Copyright 2004 Apache Software Foundation
  + Licensed  under the  Apache License,  Version 2.0  (the "License");
  + you may not use  this file  except in  compliance with the License.
  + You may obtain a copy of the License at 
  + 
  +   http://www.apache.org/licenses/LICENSE-2.0
  + 
  + Unless required by applicable law or agreed to in writing, software
  + distributed  under the  License is distributed on an "AS IS" BASIS,
  + WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + implied.
  +  
  + See the License for the specific language governing permissions and
  + limitations under the License.
  +-->
   <project>
   
     <extend>${basedir}/../project.xml</extend>
  
  
  
  1.1                  avalon-excalibur/i18n/LICENSE.txt
  
  Index: LICENSE.txt
  ===================================================================
  
                                   Apache License
                             Version 2.0, January 2004
                          http://www.apache.org/licenses/
  
     TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
  
     1. Definitions.
  
        "License" shall mean the terms and conditions for use, reproduction,
        and distribution as defined by Sections 1 through 9 of this document.
  
        "Licensor" shall mean the copyright owner or entity authorized by
        the copyright owner that is granting the License.
  
        "Legal Entity" shall mean the union of the acting entity and all
        other entities that control, are controlled by, or are under common
        control with that entity. For the purposes of this definition,
        "control" means (i) the power, direct or indirect, to cause the
        direction or management of such entity, whether by contract or
        otherwise, or (ii) ownership of fifty percent (50%) or more of the
        outstanding shares, or (iii) beneficial ownership of such entity.
  
        "You" (or "Your") shall mean an individual or Legal Entity
        exercising permissions granted by this License.
  
        "Source" form shall mean the preferred form for making modifications,
        including but not limited to software source code, documentation
        source, and configuration files.
  
        "Object" form shall mean any form resulting from mechanical
        transformation or translation of a Source form, including but
        not limited to compiled object code, generated documentation,
        and conversions to other media types.
  
        "Work" shall mean the work of authorship, whether in Source or
        Object form, made available under the License, as indicated by a
        copyright notice that is included in or attached to the work
        (an example is provided in the Appendix below).
  
        "Derivative Works" shall mean any work, whether in Source or Object
        form, that is based on (or derived from) the Work and for which the
        editorial revisions, annotations, elaborations, or other modifications
        represent, as a whole, an original work of authorship. For the purposes
        of this License, Derivative Works shall not include works that remain
        separable from, or merely link (or bind by name) to the interfaces of,
        the Work and Derivative Works thereof.
  
        "Contribution" shall mean any work of authorship, including
        the original version of the Work and any modifications or additions
        to that Work or Derivative Works thereof, that is intentionally
        submitted to Licensor for inclusion in the Work by the copyright owner
        or by an individual or Legal Entity authorized to submit on behalf of
        the copyright owner. For the purposes of this definition, "submitted"
        means any form of electronic, verbal, or written communication sent
        to the Licensor or its representatives, including but not limited to
        communication on electronic mailing lists, source code control systems,
        and issue tracking systems that are managed by, or on behalf of, the
        Licensor for the purpose of discussing and improving the Work, but
        excluding communication that is conspicuously marked or otherwise
        designated in writing by the copyright owner as "Not a Contribution."
  
        "Contributor" shall mean Licensor and any individual or Legal Entity
        on behalf of whom a Contribution has been received by Licensor and
        subsequently incorporated within the Work.
  
     2. Grant of Copyright License. Subject to the terms and conditions of
        this License, each Contributor hereby grants to You a perpetual,
        worldwide, non-exclusive, no-charge, royalty-free, irrevocable
        copyright license to reproduce, prepare Derivative Works of,
        publicly display, publicly perform, sublicense, and distribute the
        Work and such Derivative Works in Source or Object form.
  
     3. Grant of Patent License. Subject to the terms and conditions of
        this License, each Contributor hereby grants to You a perpetual,
        worldwide, non-exclusive, no-charge, royalty-free, irrevocable
        (except as stated in this section) patent license to make, have made,
        use, offer to sell, sell, import, and otherwise transfer the Work,
        where such license applies only to those patent claims licensable
        by such Contributor that are necessarily infringed by their
        Contribution(s) alone or by combination of their Contribution(s)
        with the Work to which such Contribution(s) was submitted. If You
        institute patent litigation against any entity (including a
        cross-claim or counterclaim in a lawsuit) alleging that the Work
        or a Contribution incorporated within the Work constitutes direct
        or contributory patent infringement, then any patent licenses
        granted to You under this License for that Work shall terminate
        as of the date such litigation is filed.
  
     4. Redistribution. You may reproduce and distribute copies of the
        Work or Derivative Works thereof in any medium, with or without
        modifications, and in Source or Object form, provided that You
        meet the following conditions:
  
        (a) You must give any other recipients of the Work or
            Derivative Works a copy of this License; and
  
        (b) You must cause any modified files to carry prominent notices
            stating that You changed the files; and
  
        (c) You must retain, in the Source form of any Derivative Works
            that You distribute, all copyright, patent, trademark, and
            attribution notices from the Source form of the Work,
            excluding those notices that do not pertain to any part of
            the Derivative Works; and
  
        (d) If the Work includes a "NOTICE" text file as part of its
            distribution, then any Derivative Works that You distribute must
            include a readable copy of the attribution notices contained
            within such NOTICE file, excluding those notices that do not
            pertain to any part of the Derivative Works, in at least one
            of the following places: within a NOTICE text file distributed
            as part of the Derivative Works; within the Source form or
            documentation, if provided along with the Derivative Works; or,
            within a display generated by the Derivative Works, if and
            wherever such third-party notices normally appear. The contents
            of the NOTICE file are for informational purposes only and
            do not modify the License. You may add Your own attribution
            notices within Derivative Works that You distribute, alongside
            or as an addendum to the NOTICE text from the Work, provided
            that such additional attribution notices cannot be construed
            as modifying the License.
  
        You may add Your own copyright statement to Your modifications and
        may provide additional or different license terms and conditions
        for use, reproduction, or distribution of Your modifications, or
        for any such Derivative Works as a whole, provided Your use,
        reproduction, and distribution of the Work otherwise complies with
        the conditions stated in this License.
  
     5. Submission of Contributions. Unless You explicitly state otherwise,
        any Contribution intentionally submitted for inclusion in the Work
        by You to the Licensor shall be under the terms and conditions of
        this License, without any additional terms or conditions.
        Notwithstanding the above, nothing herein shall supersede or modify
        the terms of any separate license agreement you may have executed
        with Licensor regarding such Contributions.
  
     6. Trademarks. This License does not grant permission to use the trade
        names, trademarks, service marks, or product names of the Licensor,
        except as required for reasonable and customary use in describing the
        origin of the Work and reproducing the content of the NOTICE file.
  
     7. Disclaimer of Warranty. Unless required by applicable law or
        agreed to in writing, Licensor provides the Work (and each
        Contributor provides its Contributions) on an "AS IS" BASIS,
        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
        implied, including, without limitation, any warranties or conditions
        of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
        PARTICULAR PURPOSE. You are solely responsible for determining the
        appropriateness of using or redistributing the Work and assume any
        risks associated with Your exercise of permissions under this License.
  
     8. Limitation of Liability. In no event and under no legal theory,
        whether in tort (including negligence), contract, or otherwise,
        unless required by applicable law (such as deliberate and grossly
        negligent acts) or agreed to in writing, shall any Contributor be
        liable to You for damages, including any direct, indirect, special,
        incidental, or consequential damages of any character arising as a
        result of this License or out of the use or inability to use the
        Work (including but not limited to damages for loss of goodwill,
        work stoppage, computer failure or malfunction, or any and all
        other commercial damages or losses), even if such Contributor
        has been advised of the possibility of such damages.
  
     9. Accepting Warranty or Additional Liability. While redistributing
        the Work or Derivative Works thereof, You may choose to offer,
        and charge a fee for, acceptance of support, warranty, indemnity,
        or other liability obligations and/or rights consistent with this
        License. However, in accepting such obligations, You may act only
        on Your own behalf and on Your sole responsibility, not on behalf
        of any other Contributor, and only if You agree to indemnify,
        defend, and hold each Contributor harmless for any liability
        incurred by, or claims asserted against, such Contributor by reason
        of your accepting any such warranty or additional liability.
  
  
  
  
  1.10      +16 -49    avalon-excalibur/i18n/src/test/org/apache/avalon/excalibur/i18n/test/ResourceManagerTestCase.java
  
  Index: ResourceManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/src/test/org/apache/avalon/excalibur/i18n/test/ResourceManagerTestCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ResourceManagerTestCase.java	22 Mar 2003 12:46:36 -0000	1.9
  +++ ResourceManagerTestCase.java	24 Feb 2004 14:24:28 -0000	1.10
  @@ -1,52 +1,19 @@
  -/*
  -
  - ============================================================================
  -                   The Apache Software License, Version 1.1
  - ============================================================================
  -
  - Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  -
  - Redistribution and use in source and binary forms, with or without modifica-
  - tion, are permitted provided that the following conditions are met:
  -
  - 1. Redistributions of  source code must  retain the above copyright  notice,
  -    this list of conditions and the following disclaimer.
  -
  - 2. Redistributions in binary form must reproduce the above copyright notice,
  -    this list of conditions and the following disclaimer in the documentation
  -    and/or other materials provided with the distribution.
  -
  - 3. The end-user documentation included with the redistribution, if any, must
  -    include  the following  acknowledgment:  "This product includes  software
  -    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  -    Alternately, this  acknowledgment may  appear in the software itself,  if
  -    and wherever such third-party acknowledgments normally appear.
  -
  - 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
  -    must not be used to endorse or promote products derived from this  software
  -    without  prior written permission. For written permission, please contact
  -    apache@apache.org.
  -
  - 5. Products  derived from this software may not  be called "Apache", nor may
  -    "Apache" appear  in their name,  without prior written permission  of the
  -    Apache Software Foundation.
  -
  - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  - APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  - INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  - DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  - ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  - (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  -
  - This software  consists of voluntary contributions made  by many individuals
  - on  behalf of the Apache Software  Foundation. For more  information on the
  - Apache Software Foundation, please see <http://www.apache.org/>.
  -
  -*/
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
   package org.apache.avalon.excalibur.i18n.test;
   
   import java.util.MissingResourceException;
  
  
  
  1.23      +16 -48    avalon-excalibur/i18n/src/java/org/apache/avalon/excalibur/i18n/ResourceManager.java
  
  Index: ResourceManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/src/java/org/apache/avalon/excalibur/i18n/ResourceManager.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ResourceManager.java	5 Dec 2003 15:13:53 -0000	1.22
  +++ ResourceManager.java	24 Feb 2004 14:24:28 -0000	1.23
  @@ -1,51 +1,19 @@
  -/*
  - ============================================================================
  -                   The Apache Software License, Version 1.1
  - ============================================================================
  -
  - Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  -
  - Redistribution and use in source and binary forms, with or without modifica-
  - tion, are permitted provided that the following conditions are met:
  -
  - 1. Redistributions of  source code must  retain the above copyright  notice,
  -    this list of conditions and the following disclaimer.
  -
  - 2. Redistributions in binary form must reproduce the above copyright notice,
  -    this list of conditions and the following disclaimer in the documentation
  -    and/or other materials provided with the distribution.
  -
  - 3. The end-user documentation included with the redistribution, if any, must
  -    include  the following  acknowledgment:  "This product includes  software
  -    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  -    Alternately, this  acknowledgment may  appear in the software itself,  if
  -    and wherever such third-party acknowledgments normally appear.
  -
  - 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
  -    must not be used to endorse or promote products derived from this  software
  -    without  prior written permission. For written permission, please contact
  -    apache@apache.org.
  -
  - 5. Products  derived from this software may not  be called "Apache", nor may
  -    "Apache" appear  in their name,  without prior written permission  of the
  -    Apache Software Foundation.
  -
  - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  - APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  - INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  - DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  - ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  - (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  -
  - This software  consists of voluntary contributions made  by many individuals
  - on  behalf of the Apache Software  Foundation. For more  information on the
  - Apache Software Foundation, please see <http://www.apache.org/>.
  -
  -*/
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
   package org.apache.avalon.excalibur.i18n;
   
   import java.lang.ref.WeakReference;
  
  
  
  1.22      +16 -49    avalon-excalibur/i18n/src/java/org/apache/avalon/excalibur/i18n/Resources.java
  
  Index: Resources.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/i18n/src/java/org/apache/avalon/excalibur/i18n/Resources.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Resources.java	5 Dec 2003 15:13:53 -0000	1.21
  +++ Resources.java	24 Feb 2004 14:24:28 -0000	1.22
  @@ -1,52 +1,19 @@
  -/*
  -
  - ============================================================================
  -                   The Apache Software License, Version 1.1
  - ============================================================================
  -
  - Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  -
  - Redistribution and use in source and binary forms, with or without modifica-
  - tion, are permitted provided that the following conditions are met:
  -
  - 1. Redistributions of  source code must  retain the above copyright  notice,
  -    this list of conditions and the following disclaimer.
  -
  - 2. Redistributions in binary form must reproduce the above copyright notice,
  -    this list of conditions and the following disclaimer in the documentation
  -    and/or other materials provided with the distribution.
  -
  - 3. The end-user documentation included with the redistribution, if any, must
  -    include  the following  acknowledgment:  "This product includes  software
  -    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  -    Alternately, this  acknowledgment may  appear in the software itself,  if
  -    and wherever such third-party acknowledgments normally appear.
  -
  - 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
  -    must not be used to endorse or promote products derived from this  software
  -    without  prior written permission. For written permission, please contact
  -    apache@apache.org.
  -
  - 5. Products  derived from this software may not  be called "Apache", nor may
  -    "Apache" appear  in their name,  without prior written permission  of the
  -    Apache Software Foundation.
  -
  - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  - APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  - INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  - DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  - ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  - (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  -
  - This software  consists of voluntary contributions made  by many individuals
  - on  behalf of the Apache Software  Foundation. For more  information on the
  - Apache Software Foundation, please see <http://www.apache.org/>.
  -
  -*/
  +/* 
  + * Copyright 1999-2004 Apache Software Foundation
  + * Licensed  under the  Apache License,  Version 2.0  (the "License");
  + * you may not use  this file  except in  compliance with the License.
  + * You may obtain a copy of the License at 
  + * 
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + * 
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed  under the  License is distributed on an "AS IS" BASIS,
  + * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
  + * implied.
  + * 
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + */
   package org.apache.avalon.excalibur.i18n;
   
   import java.text.DateFormat;
  
  
  

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


Mime
View raw message