pbwest      2003/03/30 18:31:45

  Modified:    src/org/apache/fop/configuration Tag: FOP_0-20-0_Alt-Design
                        Configuration.java ConfigurationParser.java
                        ConfigurationReader.java FontInfo.java
                        FontTriplet.java LanguageFileReader.java
  Log:
  Tidied copyright notice
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.4.3   +47 -47    
xml-fop/src/org/apache/fop/configuration/Attic/Configuration.java
  
  Index: Configuration.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/configuration/Attic/Configuration.java,v
  retrieving revision 1.6.4.2
  retrieving revision 1.6.4.3
  diff -u -r1.6.4.2 -r1.6.4.3
  --- Configuration.java        19 Mar 2003 13:37:31 -0000      1.6.4.2
  +++ Configuration.java        31 Mar 2003 02:31:45 -0000      1.6.4.3
  @@ -1,52 +1,52 @@
   /*
    * $Id$
    * 
  - *  ============================================================================
  - *                    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 "FOP" 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
  - *     [EMAIL PROTECTED]
  - *  
  - *  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 and was  originally created by
  - *  James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  - *  Software Foundation, please see <http://www.apache.org/>.
  + * ============================================================================
  + *                   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 "FOP" 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
  + *    [EMAIL PROTECTED]
  + * 
  + * 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 and was  originally created by
  + * James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  + * Software Foundation, please see <http://www.apache.org/>.
    *  
    */
   
  
  
  
  1.9.4.3   +47 -47    
xml-fop/src/org/apache/fop/configuration/Attic/ConfigurationParser.java
  
  Index: ConfigurationParser.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/configuration/Attic/ConfigurationParser.java,v
  retrieving revision 1.9.4.2
  retrieving revision 1.9.4.3
  diff -u -r1.9.4.2 -r1.9.4.3
  --- ConfigurationParser.java  19 Mar 2003 13:37:31 -0000      1.9.4.2
  +++ ConfigurationParser.java  31 Mar 2003 02:31:45 -0000      1.9.4.3
  @@ -1,52 +1,52 @@
   /*
    * $Id$
    * 
  - *  ============================================================================
  - *                    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 "FOP" 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
  - *     [EMAIL PROTECTED]
  - *  
  - *  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 and was  originally created by
  - *  James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  - *  Software Foundation, please see <http://www.apache.org/>.
  + * ============================================================================
  + *                   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 "FOP" 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
  + *    [EMAIL PROTECTED]
  + * 
  + * 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 and was  originally created by
  + * James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  + * Software Foundation, please see <http://www.apache.org/>.
    *  
    */
   
  
  
  
  1.8.4.2   +47 -47    
xml-fop/src/org/apache/fop/configuration/Attic/ConfigurationReader.java
  
  Index: ConfigurationReader.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/configuration/Attic/ConfigurationReader.java,v
  retrieving revision 1.8.4.1
  retrieving revision 1.8.4.2
  diff -u -r1.8.4.1 -r1.8.4.2
  --- ConfigurationReader.java  19 Mar 2003 13:37:31 -0000      1.8.4.1
  +++ ConfigurationReader.java  31 Mar 2003 02:31:45 -0000      1.8.4.2
  @@ -1,52 +1,52 @@
   /*
    * $Id$
    * 
  - *  ============================================================================
  - *                    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 "FOP" 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
  - *     [EMAIL PROTECTED]
  - *  
  - *  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 and was  originally created by
  - *  James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  - *  Software Foundation, please see <http://www.apache.org/>.
  + * ============================================================================
  + *                   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 "FOP" 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
  + *    [EMAIL PROTECTED]
  + * 
  + * 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 and was  originally created by
  + * James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  + * Software Foundation, please see <http://www.apache.org/>.
    *  
    */
   
  
  
  
  1.2.4.3   +47 -47    xml-fop/src/org/apache/fop/configuration/Attic/FontInfo.java
  
  Index: FontInfo.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/configuration/Attic/FontInfo.java,v
  retrieving revision 1.2.4.2
  retrieving revision 1.2.4.3
  diff -u -r1.2.4.2 -r1.2.4.3
  --- FontInfo.java     19 Mar 2003 13:37:31 -0000      1.2.4.2
  +++ FontInfo.java     31 Mar 2003 02:31:45 -0000      1.2.4.3
  @@ -1,52 +1,52 @@
   /*
    * $Id$
    * 
  - *  ============================================================================
  - *                    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 "FOP" 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
  - *     [EMAIL PROTECTED]
  - *  
  - *  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 and was  originally created by
  - *  James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  - *  Software Foundation, please see <http://www.apache.org/>.
  + * ============================================================================
  + *                   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 "FOP" 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
  + *    [EMAIL PROTECTED]
  + * 
  + * 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 and was  originally created by
  + * James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  + * Software Foundation, please see <http://www.apache.org/>.
    *  
    */
   
  
  
  
  1.2.4.2   +47 -47    xml-fop/src/org/apache/fop/configuration/Attic/FontTriplet.java
  
  Index: FontTriplet.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/configuration/Attic/FontTriplet.java,v
  retrieving revision 1.2.4.1
  retrieving revision 1.2.4.2
  diff -u -r1.2.4.1 -r1.2.4.2
  --- FontTriplet.java  19 Mar 2003 13:37:31 -0000      1.2.4.1
  +++ FontTriplet.java  31 Mar 2003 02:31:45 -0000      1.2.4.2
  @@ -1,52 +1,52 @@
   /*
    * $Id$
    * 
  - *  ============================================================================
  - *                    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 "FOP" 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
  - *     [EMAIL PROTECTED]
  - *  
  - *  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 and was  originally created by
  - *  James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  - *  Software Foundation, please see <http://www.apache.org/>.
  + * ============================================================================
  + *                   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 "FOP" 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
  + *    [EMAIL PROTECTED]
  + * 
  + * 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 and was  originally created by
  + * James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  + * Software Foundation, please see <http://www.apache.org/>.
    *  
    */
   
  
  
  
  1.1.2.3   +47 -47    
xml-fop/src/org/apache/fop/configuration/Attic/LanguageFileReader.java
  
  Index: LanguageFileReader.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/configuration/Attic/LanguageFileReader.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- LanguageFileReader.java   19 Mar 2003 13:37:31 -0000      1.1.2.2
  +++ LanguageFileReader.java   31 Mar 2003 02:31:45 -0000      1.1.2.3
  @@ -1,52 +1,52 @@
   /*
    * $Id$
    * 
  - *  ============================================================================
  - *                    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 "FOP" 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
  - *     [EMAIL PROTECTED]
  - *  
  - *  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 and was  originally created by
  - *  James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  - *  Software Foundation, please see <http://www.apache.org/>.
  + * ============================================================================
  + *                   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 "FOP" 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
  + *    [EMAIL PROTECTED]
  + * 
  + * 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 and was  originally created by
  + * James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  + * Software Foundation, please see <http://www.apache.org/>.
    *  
    */
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to