updated licences, removed jimi as per branch

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194647 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 227 insertions, 56 deletions

diff --git a/lib/BSF.license.txt b/lib/BSF.license.txt
new file mode 100644
index 000000000..95c68c68e
--- /dev/null
+++ b/lib/BSF.license.txt
@@ -0,0 +1,171 @@
+IBM Public License Version 1.0 
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS IBM PUBLIC LICENSE
+ ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S
+ ACCEPTANCE OF THIS AGREEMENT. 
+
+ 1. DEFINITIONS 
+
+ "Contribution" means: 
+
+      a) in the case of International Business Machines Corporation ("IBM"), the Original Program, and 
+
+      b) in the case of each Contributor, 
+
+      i) changes to the Program, and
+
+      ii) additions to the Program;
+
+      where such changes and/or additions to the Program originate from and are distributed by that particular
+      Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor
+      itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program
+      which: (i) are separate modules of software distributed in conjunction with the Program under their own license
+      agreement, and (ii) are not derivative works of the Program.
+
+ "Contributor" means IBM and any other entity that distributes the Program. 
+
+ "Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale
+ of its Contribution alone or when combined with the Program. 
+
+ "Original Program" means the original version of the software accompanying this Agreement as released by IBM,
+ including source code, object code and documentation, if any. 
+
+ "Program" means the Original Program and Contributions. 
+
+ "Recipient" means anyone who receives the Program under this Agreement, including all Contributors. 
+
+ 2. GRANT OF RIGHTS 
+
+      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
+      royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform,
+      distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code
+      and object code form.
+
+      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
+      royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer
+      the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply
+      to the combination of the Contribution and the Program if, at the time the Contribution is added by the
+      Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents.
+      The patent license shall not apply to any other combinations which include the Contribution. No hardware per se
+      is licensed hereunder. 
+
+      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein,
+      no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual
+      property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any
+      other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the
+      rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other
+      intellectual property rights needed, if any. For example, if a third party patent license is required to allow
+      Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the
+      Program.
+
+      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
+      grant the copyright license set forth in this Agreement. 
+
+ 3. REQUIREMENTS 
+
+ A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+      a) it complies with the terms and conditions of this Agreement; and
+
+      b) its license agreement:
+
+      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
+      warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability
+      and fitness for a particular purpose; 
+
+      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
+      incidental and consequential damages, such as lost profits; 
+
+      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by
+      any other party; and
+
+      iv) states that source code for the Program is available from such Contributor, and informs licensees how to
+      obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+ When the Program is made available in source code form: 
+
+      a) it must be made available under this Agreement; and 
+
+      b) a copy of this Agreement must be included with each copy of the Program. 
+
+ Each Contributor must include the following in a conspicuous location in the Program: 
+
+      Copyright © {date here}, International Business Machines Corporation and others. All Rights Reserved. 
+
+ In addition, each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably
+ allows subsequent Recipients to identify the originator of the Contribution. 
+
+ 4. COMMERCIAL DISTRIBUTION 
+
+ Commercial distributors of software may accept certain responsibilities with respect to end users, business partners
+ and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
+ the Program in a commercial product offering should do so in a manner which does not create potential liability for
+ other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
+ ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
+ against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
+ brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
+ Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
+ obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property
+ infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in
+ writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial
+ Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any
+ such claim at its own expense. 
+
+ For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
+ then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
+ related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
+ Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
+ those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
+ the Commercial Contributor must pay those damages. 
+
+ 5. NO WARRANTY 
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the appropriateness of using
+ and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement,
+ including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss
+ of data, programs or equipment, and unavailability or interruption of operations. 
+
+ 6. DISCLAIMER OF LIABILITY 
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+ SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF
+ ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+
+ 7. GENERAL 
+
+ If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
+ enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
+ provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. 
+
+ If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a
+ cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under
+ this Agreement shall terminate as of the date such litigation is filed. In addition, If Recipient institutes patent litigation
+ against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding
+ combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such
+ Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. 
+
+ All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
+ conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of
+ such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and
+ distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement
+ and any licenses granted by Recipient relating to the Program shall continue and survive. 
+
+ IBM may publish new versions (including revisions) of this Agreement from time to time. Each new version of the
+ Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
+ distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the
+ Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new
+ version. No one other than IBM has the right to modify this Agreement. Except as expressly stated in Sections 2(a) and
+ 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement,
+ whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this
+ Agreement are reserved. 
+
+ This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
+ of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
+ of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
+
diff --git a/lib/ant.license.txt b/lib/ant.license.txt
new file mode 100644
index 000000000..032be1484
--- /dev/null
+++ b/lib/ant.license.txt
@@ -0,0 +1,48 @@
+/*
+ * ============================================================================
+ *                   The Apache Software License, Version 1.1
+ * ============================================================================
+ * 
+ *    Copyright (C) 1999 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 "Ant" 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/>.
+ *
+ */
diff --git a/lib/jimi-1.0.jar b/lib/jimi-1.0.jar
deleted file mode 100755
index bfbb9f3bc..000000000
--- a/lib/jimi-1.0.jar
+++ /dev/null
diff --git a/lib/jimi-License.txt b/lib/jimi-License.txt
deleted file mode 100755
index 256cf62b1..000000000
--- a/lib/jimi-License.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Sun Microsystems, Inc. 
-Binary Code License Agreement
-
-READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE DOWNLOADING OR USING THE SOFTWARE. BY DOWNLOADING OR USING THE SOFTWARE, YOU AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL THESE TERMS, YOU ARE NOT AUTHORIZED TO DOWNLOAD OR USE THE SOFTWARE IN ANY MANNER.
-
-1. LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only, for the accompanying software and documentation (collectively "Software"). This is a one time code drop and will not be updated or otherwise supported by Sun.
-
-2. RESTRICTIONS Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by Sun and/or its licensors. Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other than a single copy of Software for archival purposes. Unless enforcement is prohibited by applicable law, you may not modify, decompile, reverse engineer Software. 
-
-3. LIMITED WARRANTY. Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use. Except for the foregoing, Software is provided "AS IS". Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's option to replace Software media or refund the fee paid for Software.
-
-4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. YOU ACKNOWLEDGE THAT SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE IN THE DESIGN, CONSTRUCTION, OPERATION, OR MAINTENANCE OF ANY NUCLEAR FACILITY. SUN DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR SUCH USES.
-
-5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount
-paid by you for Software under this Agreement. The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
-
-6. Termination. This Agreement is effective until terminated. You may terminate this Agreement at any time by destroying all copies of Software. This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement. Upon Termination, you must destroy all copies of Software.
-
-7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be subject to export or import regulations in other countries. You agree to comply strictly with all such laws and regulations and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
-
-8. U.S. Government Restricted Rights. Use, duplication, or disclosure by the U.S. Government is subject to restrictions set forth in this Agreement and as provided in DFARS 227.7202-1 (a) and 227.7202-3(a) (1995), DFARS 252.227-7013 (c)(1)(ii)(Oct 1988), FAR 12.212 (a) (1995), FAR 52.227-19 (June 1987), or FAR 52.227-14(ALT III) (June 1987), as applicable.
-
-9. Governing Law. Any action related to this Agreement will be governed by California law and controlling U.S. federal law. No choice of law rules of any jurisdiction will apply.
-
-10. Severability. If any provision of this Agreement is held to be unenforceable, This Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
-
-11. Integration. This Agreement is the entire agreement between you and Sun relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
-
-For inquiries please contact: Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California 94303
-
-
-
-JIMI SDK, Version 2.0
-SUPPLEMENTAL LICENSE TERMS
-
-These supplemental terms ("Supplement") add to the terms of the Binary Code License Agreement ("Agreement"). Capitalized terms not defined herein shall have the same meanings ascribed to them in the Agreement. The Supplement terms shall supersede any inconsistent or conflicting terms in the Agreement.
-
-1. Limited License Grant. 
-
-a. Software Development License. Subject to your obligation to indemnify Sun pursuant to Section 3 below, Sun grants to you a non-exclusive, non-transferable limited license to use the Software without fee for evaluation of the Software and for development of Java(TM) applets and applications provided that you may not re-distribute the Software in whole or in part, except as provided in Section 1.b below. The Software may contain source code which is provided for reference purposes only, and may not be modified (except for the purpose of correcting errors) or redistributed.
-
-b. License to Distribute Runtime. Subject to your obligation to indemnify Sun pursuant to Section 3 below, Sun grants to you a non-exclusive, non-transferable limited, royalty-free license to reproduce, distribute offer to sell and sell the Software provided that you: (i)distribute the Software complete and unmodified (except for error corrections), only as part of, and for the sole purpose of running, your Java applet or application ("Program") into which the Software is incorporated; (ii) do not distribute additional software intended to replace any component(s) of the Software; (iii) do not remove or alter any proprietary legends or notices contained in the Software; (iv) only distribute the Program subject to a license agreement that protects Sun's interests consistent with the terms contained herein; and (v) may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are contained in the "java" or "sun" packages or similar as !
-specified by Sun in any class file naming convention.
-
- 2. Java Platform Interface. In the event that Licensee creates an additional API(s) which: (i) extends the functionality of a Java Environment; and, (ii) is exposed to third party software developers for the purpose of developing additional software which invokes such additional API, Licensee must promptly publish broadly an accurate specification for such API for free use by all developers.
-
-3.Indemnity to Sun. As a condition precedent to each license grant in this Agreement, you agree to indemnify, hold harmless, and defend Sun and its licensors from and against any and all claims, lawsuits, liabilities, demands and expenses (including attorneys' fees), that arise or result from the use or distribution of the Software or the Program, including without limitation, those brought by Unisys Corporation, its successors and assigns, with respect to U.S. Patent Number 4,558,302 and all foreign counterparts thereto which Unisys Corporation may now have or acquire in the future (the "LZW Patents") relating to your making, using, selling, licensing, importing, offering to sell, or otherwise transferring the GIF encoding and/or decoding feature of the Software or the Program. This Agreement does not grant any rights to you with respect to the LZW Patents. 
-
-4. Trademarks and Logos. This Agreement does not authorize you to use any Sun name, trademark or logo. Licensee acknowledges as between it and Sun that Sun owns the Java trademark and all Java-related trademarks, logos and icons including the Coffee Cup and Duke ("Java Marks") and agrees to comply with the Java Trademark Guidelines at http://java.sun.com/trademarks.html.
-
-
-
diff --git a/lib/readme b/lib/readme
index 5dcfafe92..3dea81baf 100644
--- a/lib/readme
+++ b/lib/readme
@@ -19,10 +19,6 @@ build.sh -f buildtools.xml in the top level directory.
 stylebook.jar
 Jar used for creating the FOP website
 
-jimi-1.0.jar
-version 1.0
-Jimi is an image library that is used to load images
-
 xerces-1.4.3.jar
 version 1.4.3
 xerces is the xslt stylesheet processor
@@ -34,3 +30,11 @@ loggin library for logging in fop
 xalan-2.2D11.jar
 xml processor
 
+*** OPTIONAL ***
+
+jimi-1.0.jar
+May be obtained from http://java.sun.com/products/jimi/.
+Place jimi*.jar in lib/; modify batch/shell script classpaths.
+version 1.0
+Jimi is an image library that is used to load images
+