2.7.1 tag starting from August 7, 2007
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..762701c
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,684 @@
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+ 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.
+
+ END OF TERMS AND CONDITIONS
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+The license above applies to this Apache Xalan release of:
+ Xalan-Java 2 - XSLT Processor
+ Xalan-Java 2 - Serializer
+
+The license above also applies to the jar files
+xalan.jar and xsltc.jar - Xalan-Java 2 - XSLT Processor from
+Source: http://xalan.apache.org/
+
+The license above also applies to the jar file
+serializer.jar - Xalan-Java 2 - Serializer
+Source: http://xalan.apache.org/
+Used by: Xalan-Java 2 and Xerces-Java 2
+
+The license above also applies to the jar file
+xercesImpl.jar - Xerces-Java 2 XML Parser.
+Source: http://xerces.apache.org/
+Used by: Xalan-Java 2
+
+The license above also applies to the jar file
+xml-apis.jar - Xerces-Java 2 XML Parser.
+Source: http://xerces.apache.org/
+Used by: Xalan-Java 2 and release copy of Xerces-Java 2
+
+
+
+
+
+
+
+
+The following license applies to the included files:
+ tools/ant.jar
+ tools/antRun
+ tools/antRun.bat
+Source: http://ant.apache.org/
+Used By: Xalan's build process: java/build.xml and test/build.xml
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+/*
+ * ============================================================================
+ * 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/>.
+ *
+ */
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+
+
+
+
+
+The following license, Apache Software License, Version 1.1,
+applies to the included BCEL.jar from Apache Jakarta
+(Byte Code Engineering Library).
+Source: http://jakarta.apache.org/bcel
+Used By: XSLTC component of xml-xalan/java
+
+The following license, Apache Software License, Version 1.1,
+also applies to the included regexp.jar,
+jakarta-regexp-1.2.jar from Apache Jakarta.
+Source: http://jakarta.apache.org/regexp
+Used By: BCEL.jar which is used by XSLTC component of xml-xalan/java
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+/*
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following 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 "Apache" and "Apache Software Foundation" and
+ * "Apache BCEL" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Apache BCEL", 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 (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+
+
+
+
+
+The following license applies to the DOM documentation
+for the org.w3c.dom.* packages:
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+W3C® DOCUMENT LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
+Public documents on the W3C site are provided by the copyright holders
+under the following license. By using and/or copying this document,
+or the W3C document from which this statement is linked, you (the licensee)
+agree that you have read, understood, and will comply with the following
+terms and conditions:
+
+Permission to copy, and distribute the contents of this document, or the
+W3C document from which this statement is linked, in any medium for any
+purpose and without fee or royalty is hereby granted, provided that you include
+the following on ALL copies of the document, or portions thereof, that you use:
+
+1. A link or URL to the original W3C document.
+2. The pre-existing copyright notice of the original author, or if it
+ doesn't exist, a notice (hypertext is preferred, but a textual representation
+ is permitted) of the form: "Copyright © [$date-of-document] World Wide Web
+ Consortium, (Massachusetts Institute of Technology, European Research
+ Consortium for Informatics and Mathematics, Keio University). All Rights
+ Reserved. http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231"
+3. If it exists, the STATUS of the W3C document.
+
+When space permits, inclusion of the full text of this NOTICE should be provided.
+We request that authorship attribution be provided in any software, documents,
+or other items or products that you create pursuant to the implementation of the
+contents of this document, or any portion thereof.
+
+No right to create modifications or derivatives of W3C documents is granted pursuant
+to this license. However, if additional requirements (documented in the Copyright FAQ)
+are satisfied, the right to create modifications or derivatives is sometimes granted
+by the W3C to individuals complying with those requirements.
+
+THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE;
+THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE
+OR IMPLEMENTATION OF THE CONTENTS THEREOF.
+
+The name and trademarks of copyright holders may NOT be used in advertising
+or publicity pertaining to this document or its contents without specific,
+written prior permission. Title to copyright in this document will at all
+times remain with copyright holders.
+
+
+----------------------------------------------------------------------------
+
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license
+can be used with materials other than those owned by the W3C, moves information
+on style sheets, DTDs, and schemas to the Copyright FAQ, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version
+of the license, and removes the ambiguous grant of "use". See the older
+formulation for the policy prior to this date. Please see our Copyright FAQ for
+common questions about using materials from our site, such as the translating
+or annotating specifications. Other questions about this notice can be directed
+to site-policy@w3.org.
+
+
+Joseph Reagle <mailto:site-policy@w3.org
+Last revised by Reagle $Date: 2005-07-19 12:33:09 -0400 (Tue, 19 Jul 2005) $
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+
+
+
+
+
+
+The following license applies to the DOM software,
+for the org.w3c.dom.* packages in jar file xml-apis.jar:
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+W3C® SOFTWARE NOTICE AND LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+This work (and included software, documentation such as READMEs,
+or other related items) is being provided by the copyright holders
+under the following license. By obtaining, using and/or copying this
+work, you (the licensee) agree that you have read, understood, and will
+comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and
+without fee or royalty is hereby granted, provided that you include
+the following on ALL copies of the software and documentation or
+portions thereof, including modifications:
+
+1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+2. Any pre-existing intellectual property disclaimers, notices,
+ or terms and conditions. If none exist, the W3C Software Short Notice
+ should be included (hypertext is preferred, text is permitted) within
+ the body of any redistributed or derivative code.
+3. Notice of any changes or modifications to the files, including the
+ date changes were made. (We recommend you provide URIs to the location
+ from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT
+NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising
+or publicity pertaining to the software without specific, written prior
+permission. Title to copyright in this software and any associated documentation
+will at all times remain with copyright holders.
+
+
+____________________________________
+
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version
+of the license, and removes the ambiguous grant of "use". Otherwise, this
+version is the same as the previous version and is written so as to preserve
+the Free Software Foundation's assessment of GPL compatibility and OSI's
+certification under the Open Source Definition. Please see our Copyright FAQ
+for common questions about using materials from our site, including specific
+terms and conditions for packages like libwww, Amaya, and Jigsaw. Other
+questions about this notice can be directed to site-policy@w3.org.
+
+
+Joseph Reagle <mailto:site-policy@w3.org
+Last revised by Reagle $Date: 2005-07-19 12:33:09 -0400 (Tue, 19 Jul 2005) $
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+
+
+
+
+
+The following license applies to the SAX software,
+for the org.xml.sax.* packages in jar file xml-apis.jar:
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+This module, both source code and documentation, is in the Public Domain,
+and comes with NO WARRANTY. See http://www.saxproject.org for further information.
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+
+
+
+
+
+The following license applies to the jar file
+java_cup.jar - LALR Parser Generator for Java(TM).
+Source: http://www.cs.princeton.edu/~appel/modern/java/CUP
+Used By: XSLTC component of xml-xalan/java
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+CUP Parser Generator Copyright Notice, License, and Disclaimer
+
+Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both
+the copyright notice and this permission notice and warranty disclaimer
+appear in supporting documentation, and that the names of the authors
+or their employers not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior permission.
+
+The authors and their employers disclaim all warranties with regard to
+this software, including all implied warranties of merchantability
+and fitness. In no event shall the authors or their employers be liable
+for any special, indirect or consequential damages or any damages
+whatsoever resulting from loss of use, data or profits, whether in an action
+of contract, negligence or other tortious action, arising out of or
+in connection with the use or performance of this software.
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+
+
+
+
+
+The following license applies to the jar file runtime.jar - Component
+of JavaCup: LALR Parser Generator for Java(TM).
+Source: http://www.cs.princeton.edu/~appel/modern/java/CUP
+Used By: XSLTC component of xml-xalan/java
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+CUP Parser Generator Copyright Notice, License, and Disclaimer
+(runtime.jar component)
+
+Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both
+the copyright notice and this permission notice and warranty disclaimer
+appear in supporting documentation, and that the names of the authors
+or their employers not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior permission.
+
+The authors and their employers disclaim all warranties with regard to
+this software, including all implied warranties of merchantability
+and fitness. In no event shall the authors or their employers be liable
+for any special, indirect or consequential damages or any damages
+whatsoever resulting from loss of use, data or profits, whether in an action
+of contract, negligence or other tortious action, arising out of or
+in connection with the use or performance of this software.
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+
+
+
+
+
+The following license applies to the JLEX jar file
+JLex.jar - A Lexical Analyzer Generator for Java(TM).
+Source: http://www.cs.princeton.edu/~appel/modern/java/JLex
+Used By: XSLTC component of xml-xalan/java
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+JLEX COPYRIGHT NOTICE, LICENSE AND DISCLAIMER.
+
+Copyright 1996-2000 by Elliot Joel Berk and C. Scott Ananian
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and
+that both the copyright notice and this permission notice and
+warranty disclaimer appear in supporting documentation, and that the
+name of the authors or their employers not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.
+
+The authors and their employers disclaim all warranties with regard
+to this software, including all implied warranties of merchantability and
+fitness. In no event shall the authors or their employers be liable for any
+special, indirect or consequential damages or any damages whatsoever resulting
+from loss of use, data or profits, whether in an action of contract,
+negligence or other tortious action, arising out of or in connection
+with the use or performance of this software.
+
+Java is a trademark of Sun Microsystems, Inc. References to the Java
+programming language in relation to JLex are not meant to imply that
+Sun endorses this product.
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+
+
+
+
+
+
+The following license applies to the jar file
+stylebook-1.0-b3_xalan-2.jar - Tool for generating Xalan documentation.
+Integrated with Xalan-Java 2 and Xerces 2.
+Source: http://svn.apache.org/viewvc/xml/stylebook/
+Used by: Xalan-Java 2, Xalan-C++
+
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+/*
+ * 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
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following 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 "Xalan", "Xerces", 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 (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.apache.org. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 0000000..758cb80
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,80 @@
+ =========================================================================
+ == NOTICE file corresponding to section 4(d) of the Apache License, ==
+ == Version 2.0, in this case for the Apache Xalan Java distribution. ==
+ =========================================================================
+
+ Apache Xalan (Xalan XSLT processor)
+ Copyright 1999-2006 The Apache Software Foundation
+
+ Apache Xalan (Xalan serializer)
+ Copyright 1999-2006 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ =========================================================================
+ Portions of this software was originally based on the following:
+ - software copyright (c) 1999-2002, Lotus Development Corporation.,
+ http://www.lotus.com.
+ - software copyright (c) 2001-2002, Sun Microsystems.,
+ http://www.sun.com.
+ - software copyright (c) 2003, IBM Corporation.,
+ http://www.ibm.com.
+
+ =========================================================================
+ The binary distribution package (ie. jars, samples and documentation) of
+ this product includes software developed by the following:
+
+ - The Apache Software Foundation
+ - Xerces Java - see LICENSE.txt
+ - JAXP 1.3 APIs - see LICENSE.txt
+ - Bytecode Engineering Library - see LICENSE.txt
+ - Regular Expression - see LICENSE.txt
+
+ - Scott Hudson, Frank Flannery, C. Scott Ananian
+ - CUP Parser Generator runtime (javacup\runtime) - see LICENSE.txt
+
+ =========================================================================
+ The source distribution package (ie. all source and tools required to build
+ Xalan Java) of this product includes software developed by the following:
+
+ - The Apache Software Foundation
+ - Xerces Java - see LICENSE.txt
+ - JAXP 1.3 APIs - see LICENSE.txt
+ - Bytecode Engineering Library - see LICENSE.txt
+ - Regular Expression - see LICENSE.txt
+ - Ant - see LICENSE.txt
+ - Stylebook doc tool - see LICENSE.txt
+
+ - Elliot Joel Berk and C. Scott Ananian
+ - Lexical Analyzer Generator (JLex) - see LICENSE.txt
+
+ =========================================================================
+ Apache Xerces Java
+ Copyright 1999-2006 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of Apache Xerces Java in xercesImpl.jar and xml-apis.jar
+ were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
+
+ =========================================================================
+ Apache xml-commons xml-apis (redistribution of xml-apis.jar)
+
+ Apache XML Commons
+ Copyright 2001-2003,2006 The Apache Software Foundation.
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+
diff --git a/build.xml b/build.xml
index 39f94e3..55a7c8c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2007 The 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.
@@ -81,7 +81,6 @@
<!-- <property name="bin.dir" value="./bin"/> -->
<property name="build.dir" value="./build"/>
<property name="lib.dir" value="./lib"/>
- <property name="licenses.dir" value="./licenses"/>
<property name="samples.dir" value="./samples"/>
<property name="src.dir" value="./src"/>
<property name="tools.dir" value="./tools"/>
@@ -118,10 +117,7 @@
<property name="taglet.jar.name" value="xalan2jtaglet.jar"/>
<property name="taglet.jar" value="${tools.dir}/${taglet.jar.name}"/>
- <!-- We don't need to package JLex in the xalan.jar, therefore the
- JLex license and readme files are not part of xsltc.deps.license -->
- <property name="xsltc.deps.license" value="BCEL.LICENSE.txt,BCEL.README.txt,runtime.LICENSE.txt,runtime.README.txt,regexp.LICENSE.txt,regexp.README.txt"/>
-
+
<!-- Relative locations of source directories -->
<property name="manifest.mf" value="./src/MANIFEST.MF"/>
<property name="manifest.xsltc.mf" value="./src/manifest.xsltc"/>
@@ -189,9 +185,6 @@
<property name="serializer.build.classes" value="${serializer.build.dir}/serializer"/>
<!-- PROPERTIES TO MAKE THE SERIALIZER JAR ======================================= -->
- <property name="serializer.notice" value="serializer.NOTICE.txt"/>
- <property name="serializer.license" value="serializer.LICENSE.txt"/>
- <property name="serializer.readme" value="serializer.README.txt"/>
<property name="serializer.manifest.basename" value="MANIFEST.SERIALIZER"/>
<property name="serializer.manifest" value="${serializer.src.dir}/${serializer.manifest.basename}"/>
<property name="serializer.impl.version" value="${impl.version}"/>
@@ -249,28 +242,9 @@
<!-- patternsets for source and binary distribution packages -->
<patternset id="bin-distro" >
+ <include name="${dist.file}/LICENSE.txt"/>
+ <include name="${dist.file}/NOTICE.txt"/>
<include name="${dist.file}/readme.html"/>
- <include name="${dist.file}/licenses/LICENSE.DOM-documentation.html"/>
- <include name="${dist.file}/licenses/LICENSE.DOM-software.html"/>
- <include name="${dist.file}/licenses/LICENSE-SAX.html"/>
- <include name="${dist.file}/licenses/xalan.LICENSE.txt"/>
- <include name="${dist.file}/licenses/xalan.NOTICE.txt"/>
- <include name="${dist.file}/xalan.README.txt"/>
- <include name="${dist.file}/licenses/serializer.LICENSE.txt"/>
- <include name="${dist.file}/licenses/serializer.NOTICE.txt"/>
- <include name="${dist.file}/serializer.README.txt"/>
- <include name="${dist.file}/licenses/xercesImpl.LICENSE.txt"/>
- <include name="${dist.file}/licenses/xercesImpl.NOTICE.txt"/>
- <include name="${dist.file}/xercesImpl.README.txt"/>
- <include name="${dist.file}/licenses/xml-apis.LICENSE.txt"/>
- <include name="${dist.file}/licenses/xml-apis.NOTICE.txt"/>
- <include name="${dist.file}/xml-apis.README.txt"/>
- <include name="${dist.file}/licenses/BCEL.LICENSE.txt"/>
- <include name="${dist.file}/BCEL.README.txt"/>
- <include name="${dist.file}/licenses/regexp.LICENSE.txt"/>
- <include name="${dist.file}/regexp.README.txt"/>
- <include name="${dist.file}/licenses/runtime.LICENSE.txt"/>
- <include name="${dist.file}/runtime.README.txt"/>
<include name="${dist.file}/xalan.jar"/>
<!-- xsltc.jar will only be picked up if it has been built -->
<include name="${dist.file}/xsltc.jar"/>
@@ -287,28 +261,9 @@
<include name="${dist.file}/docs/"/>
</patternset>
<patternset id="bin-distro-nodocs" >
+ <include name="${dist.file}/LICENSE.txt"/>
+ <include name="${dist.file}/NOTICE.txt"/>
<include name="${dist.file}/readme.html"/>
- <include name="${dist.file}/licenses/LICENSE.DOM-documentation.html"/>
- <include name="${dist.file}/licenses/LICENSE.DOM-software.html"/>
- <include name="${dist.file}/licenses/LICENSE-SAX.html"/>
- <include name="${dist.file}/licenses/xalan.LICENSE.txt"/>
- <include name="${dist.file}/licenses/xalan.NOTICE.txt"/>
- <include name="${dist.file}/xalan.README.txt"/>
- <include name="${dist.file}/licenses/serializer.LICENSE.txt"/>
- <include name="${dist.file}/licenses/serializer.NOTICE.txt"/>
- <include name="${dist.file}/serializer.README.txt"/>
- <include name="${dist.file}/licenses/xercesImpl.LICENSE.txt"/>
- <include name="${dist.file}/licenses/xercesImpl.NOTICE.txt"/>
- <include name="${dist.file}/xercesImpl.README.txt"/>
- <include name="${dist.file}/licenses/xml-apis.LICENSE.txt"/>
- <include name="${dist.file}/licenses/xml-apis.NOTICE.txt"/>
- <include name="${dist.file}/xml-apis.README.txt"/>
- <include name="${dist.file}/licenses/BCEL.LICENSE.txt"/>
- <include name="${dist.file}/BCEL.README.txt"/>
- <include name="${dist.file}/licenses/regexp.LICENSE.txt"/>
- <include name="${dist.file}/regexp.README.txt"/>
- <include name="${dist.file}/licenses/runtime.LICENSE.txt"/>
- <include name="${dist.file}/runtime.README.txt"/>
<include name="${dist.file}/xalan.jar"/>
<!-- xsltc.jar will only be picked up if it has been built -->
<include name="${dist.file}/xsltc.jar"/>
@@ -324,15 +279,14 @@
<include name="${dist.file}/samples/xsltcservlet.jar"/>
</patternset>
<patternset id="src-distro" >
+ <include name="${dist.file}/LICENSE.txt"/>
+ <include name="${dist.file}/NOTICE.txt"/>
<include name="${dist.file}/build.*"/>
<include name="${dist.file}/commits.xml"/>
<include name="${dist.file}/KEYS"/>
- <include name="${dist.file}/readme.html"/>
- <include name="${dist.file}/xalan.README.txt"/>
- <include name="${dist.file}/serializer.README.txt"/>
+ <include name="${dist.file}/readme.html"/>
<include name="${dist.file}/lib/"/>
<include name="${dist.file}/tools/"/>
- <include name="${dist.file}/licenses/"/>
<include name="${dist.file}/samples/"/>
<exclude name="${dist.file}/samples/xalansamples.jar"/>
<exclude name="${dist.file}/samples/xalanservlet.war"/>
@@ -592,11 +546,6 @@
<!-- Copy license and readme files for XSLTC support jars -->
<target name="xsltc.copy-licenses" depends="xsltc.prepare">
-<!--
- <echo message="Copying license files for XSLTC support jars"/>
- <copy todir="${build.classes}">
- <fileset dir="${lib.dir}" casesensitive="no" includes="${xsltc.deps.license}"/>
- </copy> -->
</target>
<!-- A parametrized target which is used to copy and expand a XSLTC support jar -->
@@ -682,7 +631,6 @@
<fileset dir="${build.classes}" includes="JLex/**" />
<fileset dir="${build.classes}" includes="java_cup/**" />
<fileset dir="${build.classes}" includes="org/apache/regexp/**" />
- <fileset dir="${build.classes}" includes="${xsltc.deps.license}" />
</jar>
</target>
@@ -1286,8 +1234,7 @@
<!-- =================================================================== -->
<target name="autodist-mkdirs">
<mkdir dir="${dist.dir}"/>
- <mkdir dir="${dist.dir}/lib"/>
- <mkdir dir="${dist.dir}/licenses"/>
+ <mkdir dir="${dist.dir}/lib"/>
<mkdir dir="${dist.dir}/samples"/>
<mkdir dir="${dist.dir}/src"/>
<mkdir dir="${dist.dir}/tools"/>
@@ -1301,10 +1248,10 @@
<target name="autodist-copy-files">
- <!-- Copy license files from license to distribution root -->
- <copy todir="${dist.dir}/licenses">
- <fileset dir="${licenses.dir}">
- <include name="*.*"/>
+ <!-- Copy license files to distribution root -->
+ <copy todir="${dist.dir}">
+ <fileset dir=".">
+ <include name="LICENSE.txt,NOTICE.txt"/>
</fileset>
</copy>
@@ -1352,14 +1299,12 @@
</copy>
<copy file="${build.serializer.jar}" todir="${dist.dir}" />
- <copy file="${xmlapis.jar}" todir="${dist.dir}" />
- <copy file="${lib.dir}/xml-apis.README.txt" todir="${dist.dir}" />
+ <copy file="${xmlapis.jar}" todir="${dist.dir}" />
<copy file="${parser.jar}" todir="${dist.dir}" />
- <copy file="${lib.dir}/xercesImpl.README.txt" todir="${dist.dir}" />
<copy todir="${dist.dir}">
<fileset dir="." includes="readme.html,KEYS,build.xml,build.sh,build.bat,commits.xml,
- xalan.README.txt,serializer.README.txt"/>
+ LICENSE.txt,NOTICE.txt"/>
</copy>
</target>
@@ -1626,9 +1571,8 @@
<!-- patternset for source distribution packages -->
<patternset id="serializer-src-distro" >
<!-- some license and legal stuff -->
- <include name="${serializer.dist.file}/licenses/${serializer.license}"/>
- <include name="${serializer.dist.file}/licenses/${serializer.notice}"/>
- <include name="${serializer.dist.file}/${serializer.readme}"/>
+ <include name="${serializer.dist.file}/LICENSE.txt"/>
+ <include name="${serializer.dist.file}/NOTICE.txt"/>
<include name="${serializer.dist.file}/KEYS"/>
<!-- The build stuff that uses Ant and this file itself, build.xml
@@ -1645,34 +1589,21 @@
<!-- We need Ant in order to run build.xml in the source distribution -->
<include name="${serializer.dist.file}/tools/ant.jar"/>
- <include name="${serializer.dist.file}/tools/ant.LICENSE.txt"/>
- <include name="${serializer.dist.file}/tools/ant.README.txt"/>
<include name="${serializer.dist.file}/tools/antRun"/>
<include name="${serializer.dist.file}/tools/antRun.bat"/>
<!-- The serializer needs this jar in order to build -->
<include name="${serializer.dist.file}/xml-apis.jar"/>
- <include name="${serializer.dist.file}/licenses/xml-apis.LICENSE.txt"/>
- <include name="${serializer.dist.file}/licenses/xml-apis.NOTICE.txt"/>
- <include name="${serializer.dist.file}/licenses/LICENSE.DOM-documentation.html"/>
- <include name="${serializer.dist.file}/licenses/LICENSE.DOM-software.html"/>
- <include name="${serializer.dist.file}/licenses/LICENSE-SAX.html"/>
- <include name="${serializer.dist.file}/licenses/LICENSE.DOM-software.html"/>
-
- <include name="${serializer.dist.file}/xml-apis.README.txt"/>
<!-- Ant needs an XML parser in order to read in the build.xml, so it
can even do the build ... this is a strange loop ... -->
<include name="${serializer.dist.file}/xercesImpl.jar"/>
- <include name="${serializer.dist.file}/licenses/xercesImpl.LICENSE.txt"/>
- <include name="${serializer.dist.file}/licenses/xercesImpl.NOTICE.txt"/>
- <include name="${serializer.dist.file}/xercesImpl.README.txt"/>
</patternset>
<!-- patternset for binary distribution packages ... if needed
<patternset id="serializer-bin-distro" >
- <include name="${serializer.dist.file}/licenses/serializer.LICENSE.txt"/>
- <include name="${serializer.dist.file}/licenses/serializer.NOTICE.txt"/>
+ <include name="${serializer.dist.file}/LICENSE.txt"/>
+ <include name="${serializer.dist.file}/NOTICE.txt"/>
<include name="${serializer.dist.file}/KEYS"/>
<include name="${serializer.dist.file}/${serializer.name}.jar"/>
<include name="${serializer.dist.file}/${xmlapis.jar.name}"/>
@@ -1720,11 +1651,6 @@
<fileset dir="${serializer.src.dir}" includes="${serializer.reldir}/**/*.properties"/>
</copy>
-<!-- Not sure why we want to include this in the jar when we
- don't have this in xml-apis.jar, xercesImpl.jar, or xalan.jar
- <copy todir="${serializer.build.classes}" file="${serializer.license}" />
- <copy todir="${serializer.build.classes}" file="${serializer.notice}" />
- <copy todir="${serializer.build.classes}" file="${serializer.readme}" /> -->
</target>
@@ -1811,8 +1737,7 @@
<target name="serializer-autodist-mkdirs">
<echo message="Serializer: making distribution directories" />
- <mkdir dir="${serializer.dist.dir}"/>
- <mkdir dir="${serializer.dist.dir}/licenses"/>
+ <mkdir dir="${serializer.dist.dir}"/>
<mkdir dir="${serializer.dist.dir}/src"/>
<mkdir dir="${serializer.dist.dir}/tools"/>
</target>
@@ -1839,13 +1764,11 @@
<!-- Copy runtime jars -->
<copy file="${lib.dir}/${xmlapis.jar.name}" todir="${serializer.dist.dir}" />
<copy file="${lib.dir}/${parser.jar.name}" todir="${serializer.dist.dir}" />
- <copy file="${lib.dir}/xml-apis.README.txt" todir="${serializer.dist.dir}" />
- <copy file="${lib.dir}/xercesImpl.README.txt" todir="${serializer.dist.dir}" />
<!-- Copy licenses -->
- <copy todir="${serializer.dist.dir}/licenses">
- <fileset dir="./licenses"
- includes="serializer.*.txt,xml-apis.*.txt,xercesImpl.*.txt,LICENSE.DOM*,LICENSE-SAX*"/>
+ <copy todir="${serializer.dist.dir}">
+ <fileset dir="."
+ includes="LICENSE.txt,NOTICE.txt"/>
</copy>
<!-- Copy tools -->
@@ -1854,7 +1777,7 @@
</copy>
<copy todir="${serializer.dist.dir}">
- <fileset dir="." includes="KEYS,serializer.README.txt,build.xml,build.sh,build.bat"/>
+ <fileset dir="." includes="KEYS,build.xml,build.sh,build.bat"/>
</copy>
</target>
diff --git a/lib/BCEL.README.txt b/lib/BCEL.README.txt
deleted file mode 100644
index b22c119..0000000
--- a/lib/BCEL.README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-BCEL Jar - Byte Code Engineering library
-
-Sourced From: http://jakarta.apache.org/bcel
-Used By: XSLTC component of xml-xalan/java
-
-See licenses/BCEL.LICENSE.txt and web site for further information.
diff --git a/lib/regexp.README.txt b/lib/regexp.README.txt
deleted file mode 100644
index 72d8dab..0000000
--- a/lib/regexp.README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-jakarta-regexp-1.2.jar -
-
-Sourced From: http://jakarta.apache.org/regexp
-Used By: BCEL.jar which is used by XSLTC component of xml-xalan/java
-
-See licenses/BCEL.LICENSE.txt and web site for further information.
-See licenses/regexp.LICENSE.txt and web site for further information.
diff --git a/lib/runtime.README.txt b/lib/runtime.README.txt
deleted file mode 100644
index a7ec2ca..0000000
--- a/lib/runtime.README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Runtime Jar - Component of JavaCup: LALR Parser Generator for Java(TM)
-
-Sourced From: http://www.cs.princeton.edu/~appel/modern/java/CUP
-Used By: XSLTC component of xml-xalan/java
-
-See licenses/runtime.LICENSE.txt and web site for further information.
diff --git a/lib/xercesImpl.README.txt b/lib/xercesImpl.README.txt
deleted file mode 100644
index 9e6a062..0000000
--- a/lib/xercesImpl.README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-xercesImpl.jar - Xerces-Java 2 XML Parser.
-
-Source: http://xml.apache.org
-Used by: Xalan-Java 2
-
-See licenses/xercesImpl.LICENSE.txt and licenses/xercesImpl.NOTICE.txt
-for the licenses and attribution notices that apply to xercesImpl.jar.
diff --git a/lib/xml-apis.README.txt b/lib/xml-apis.README.txt
deleted file mode 100644
index b634075..0000000
--- a/lib/xml-apis.README.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-xml-apis.jar - Xerces-Java 2 XML Parser.
-
-Source: http://xml.apache.org
-Used by: Xalan-Java 2 and release copy of Xerces-Java 2
-
-See licenses/xml-apis.LICENSE.txt and licenses/xml-apis.NOTICE.txt for the license
-and attribution notices that applies to the javax.xml.* packages in xml-apis.jar.
-
-See licenses/LICENSE.DOM-documentation.html and licenses/LICENSE.DOM-software.html
-and licenses/LICENSE-SAX.html for the licenses that apply to the org.w3c.dom.* and
-org.xml.sax packages in xml-apis.jar.
diff --git a/licenses/BCEL.LICENSE.txt b/licenses/BCEL.LICENSE.txt
deleted file mode 100644
index 58940a0..0000000
--- a/licenses/BCEL.LICENSE.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Apache Software License, Version 1.1
-*
-* Copyright (c) 2001 The Apache Software Foundation. All rights
-* reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* 1. Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in
-* the documentation and/or other materials provided with the
-* distribution.
-*
-* 3. The end-user documentation included with the redistribution,
-* if any, must include the following 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 "Apache" and "Apache Software Foundation" and
-* "Apache BCEL" must not be used to endorse or promote products
-* derived from this software without prior written permission. For
-* written permission, please contact apache@apache.org.
-*
-* 5. Products derived from this software may not be called "Apache",
-* "Apache BCEL", 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 (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-* ====================================================================
-*
-* This software consists of voluntary contributions made by many
-* individuals on behalf of the Apache Software Foundation. For more
-* information on the Apache Software Foundation, please see
-* <http://www.apache.org/>.
-*/
diff --git a/licenses/LICENSE-SAX.html b/licenses/LICENSE-SAX.html
deleted file mode 100644
index f71352b..0000000
--- a/licenses/LICENSE-SAX.html
+++ /dev/null
@@ -1,17 +0,0 @@
- <html>
- <head>SAX LICENSE</head>
- <body>
- <p>This license applies to all interfaces and classes in the
- org/xml/sax hierarchy.
- </p>
- <p>
- <blockquote>
- <em>This module, both source code and documentation, is in the
- Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- See <a href='http://www.saxproject.org'>http://www.saxproject.org</a>
- for further information.
- </blockquote>
- </p>
-</body>
-</html>
-
diff --git a/licenses/LICENSE.DOM-documentation.html b/licenses/LICENSE.DOM-documentation.html
deleted file mode 100644
index dd95e31..0000000
--- a/licenses/LICENSE.DOM-documentation.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<?xml version="1.0" encoding="iso-8859-1"?><HTML
-xmlns="http://www.w3.org/1999/xhtml"><HEAD><TITLE>W3C Document License</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-
-<META content="MSHTML 6.00.2800.1400" name=GENERATOR></HEAD>
-<BODY text=#000000 bgColor=#ffffff>
-<H1>W3C<SUP>®</SUP> DOCUMENT LICENSE</H1>
-<H3 id=version><A
-href="http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231">http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</A></H3>
-<P>Public documents on the W3C site are provided by the copyright holders under
-the following license. By using and/or copying this document, or the W3C
-document from which this statement is linked, you (the licensee) agree that you
-have read, understood, and will comply with the following terms and
-conditions:</P>
-<P>Permission to copy, and distribute the contents of this document, or the W3C
-document from which this statement is linked, in any medium for any purpose and
-without fee or royalty is hereby granted, provided that you include the
-following on <I>ALL</I> copies of the document, or portions thereof, that you
-use:</P>
-<OL>
- <LI>A link or URL to the original W3C document.
- <LI>The pre-existing copyright notice of the original author, or if it doesn't
- exist, a notice (hypertext is preferred, but a textual representation is
- permitted) of the form: "Copyright © [$date-of-document] <A
- href="http://www.w3.org/">World Wide Web Consortium</A>, (<A
- href="http://www.lcs.mit.edu/">Massachusetts Institute of Technology</A>, <A
- href="http://www.ercim.org/">European Research Consortium for Informatics and
- Mathematics</A>, <A href="http://www.keio.ac.jp/">Keio University</A>). All
- Rights Reserved. <A
- href="http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231">http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231</A>"
-
- <LI><EM>If it exists</EM>, the STATUS of the W3C document. </LI></OL>
-<P>When space permits, inclusion of the full text of this <B>NOTICE</B> should
-be provided. We request that authorship attribution be provided in any software,
-documents, or other items or products that you create pursuant to the
-implementation of the contents of this document, or any portion thereof.</P>
-<P>No right to create modifications or derivatives of W3C documents is granted
-pursuant to this license. However, if additional requirements (documented in the
-<A href="http://www.w3.org/Consortium/Legal/IPR-FAQ">Copyright FAQ</A>) are
-satisfied, the right to create modifications or derivatives is sometimes
-granted by the W3C to individuals complying with those requirements.</P>
-<P>THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED
-TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR
-ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</P>
-<P>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE
-OR IMPLEMENTATION OF THE CONTENTS THEREOF.</P>
-<P>The name and trademarks of copyright holders may NOT be used in advertising
-or publicity pertaining to this document or its contents without specific,
-written prior permission. Title to copyright in this document will at all times
-remain with copyright holders.</P>
-<P></P>
-<P>----------------------------------------------------------------------------</P>
-<P>This formulation of W3C's notice and license became active on December 31
-2002. This version removes the copyright ownership notice such that this license
-can be used with materials other than those owned by the W3C, moves information
-on style sheets, DTDs, and schemas to the <A
-href="http://www.w3.org/Consortium/Legal/IPR-FAQ">Copyright FAQ</A>, reflects
-that ERCIM is now a host of the W3C, includes references to this specific dated
-version of the license, and removes the ambiguous grant of "use". See the <A
-href="http://www.w3.org/Consortium/Legal/copyright-documents-19990405">older
-formulation</A> for the policy prior to this date. Please see our <A
-href="http://www.w3.org/Consortium/Legal/IPR-FAQ">Copyright FAQ</A> for common
-questions about using materials from our site, such as the translating or
-annotating specifications. Other questions about this notice can be directed to
-<A href="mailto:site-policy@w3.org">site-policy@w3.org</A>.</P>
-<P></P>
-<ADDRESS>Joseph Reagle <<A
-href="mailto:site-policy@w3.org">mailto:site-policy@w3.org</A> </ADDRESS>
-<P>Last revised by Reagle $Date$</P></BODY></HTML>
diff --git a/licenses/LICENSE.DOM-software.html b/licenses/LICENSE.DOM-software.html
deleted file mode 100644
index c4fa8f5..0000000
--- a/licenses/LICENSE.DOM-software.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<?xml version="1.0" encoding="iso-8859-1"?><HTML
-xmlns="http://www.w3.org/1999/xhtml"><HEAD><TITLE>W3C Software License</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-
-<META content="MSHTML 6.00.2800.1400" name=GENERATOR></HEAD>
-<BODY text=#000000 bgColor=#ffffff>
-<H1>W3C<SUP>®</SUP> SOFTWARE NOTICE AND LICENSE</H1>
-<H3 id=version><A
-href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231">http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</A></H3>
-<P>This work (and included software, documentation such as READMEs, or other
-related items) is being provided by the copyright holders under the following
-license. By obtaining, using and/or copying this work, you (the licensee) agree
-that you have read, understood, and will comply with the following terms and
-conditions.</P>
-<P>Permission to copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose and without
-fee or royalty is hereby granted, provided that you include the following on ALL
-copies of the software and documentation or portions thereof, including
-modifications:</P>
-<OL>
- <LI>The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
- <LI>Any pre-existing intellectual property disclaimers, notices, or terms and
- conditions. If none exist, the <A
- href="http://www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html">W3C
- Software Short Notice</A> should be included (hypertext is preferred, text is
- permitted) within the body of any redistributed or derivative code.
- <LI>Notice of any changes or modifications to the files, including the date
- changes were made. (We recommend you provide URIs to the location from which
- the code is derived.) </LI></OL>
-<P>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE
-OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</P>
-<P>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-DOCUMENTATION.</P>
-<P>The name and trademarks of copyright holders may NOT be used in advertising
-or publicity pertaining to the software without specific, written prior
-permission. Title to copyright in this software and any associated documentation
-will at all times remain with copyright holders.</P>
-<P></P>
-<P>____________________________________</P>
-<P>This formulation of W3C's notice and license became active on December 31
-2002. This version removes the copyright ownership notice such that this license
-can be used with materials other than those owned by the W3C, reflects that
-ERCIM is now a host of the W3C, includes references to this specific dated
-version of the license, and removes the ambiguous grant of "use". Otherwise,
-this version is the same as the <A
-href="http://www.w3.org/Consortium/Legal/copyright-software-19980720">previous
-version</A> and is written so as to preserve the <A
-href="http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses">Free
-Software Foundation's assessment of GPL compatibility</A> and <A
-href="http://www.opensource.org/licenses/W3C.php">OSI's certification</A> under
-the <A href="http://www.opensource.org/docs/definition.php">Open Source
-Definition</A>. Please see our <A
-href="http://www.w3.org/Consortium/Legal/IPR-FAQ">Copyright FAQ</A> for common
-questions about using materials from our site, including specific terms and
-conditions for packages like libwww, Amaya, and Jigsaw. Other questions about
-this notice can be directed to <A
-href="mailto:site-policy@w3.org">site-policy@w3.org</A>.<BR> </P>
-<ADDRESS>Joseph Reagle <<A
-href="mailto:site-policy@w3.org">mailto:site-policy@w3.org</A> </ADDRESS>
-<P>Last revised by Reagle $Date$</P></BODY></HTML>
diff --git a/licenses/regexp.LICENSE.txt b/licenses/regexp.LICENSE.txt
deleted file mode 100644
index 58940a0..0000000
--- a/licenses/regexp.LICENSE.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Apache Software License, Version 1.1
-*
-* Copyright (c) 2001 The Apache Software Foundation. All rights
-* reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* 1. Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in
-* the documentation and/or other materials provided with the
-* distribution.
-*
-* 3. The end-user documentation included with the redistribution,
-* if any, must include the following 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 "Apache" and "Apache Software Foundation" and
-* "Apache BCEL" must not be used to endorse or promote products
-* derived from this software without prior written permission. For
-* written permission, please contact apache@apache.org.
-*
-* 5. Products derived from this software may not be called "Apache",
-* "Apache BCEL", 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 (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-* ====================================================================
-*
-* This software consists of voluntary contributions made by many
-* individuals on behalf of the Apache Software Foundation. For more
-* information on the Apache Software Foundation, please see
-* <http://www.apache.org/>.
-*/
diff --git a/licenses/runtime.LICENSE.txt b/licenses/runtime.LICENSE.txt
deleted file mode 100644
index 374d498..0000000
--- a/licenses/runtime.LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-CUP Parser Generator Copyright Notice, License, and Disclaimer
-(runtime.jar component)
-
-Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both
-the copyright notice and this permission notice and warranty disclaimer
-appear in supporting documentation, and that the names of the authors
-or their employers not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior permission.
-
-The authors and their employers disclaim all warranties with regard to
-this software, including all implied warranties of merchantability
-and fitness. In no event shall the authors or their employers be liable
-for any special, indirect or consequential damages or any damages
-whatsoever resulting from loss of use, data or profits, whether in an action
-of contract, negligence or other tortious action, arising out of or
-in connection with the use or performance of this software.
diff --git a/licenses/serializer.LICENSE.txt b/licenses/serializer.LICENSE.txt
deleted file mode 100644
index 261eeb9..0000000
--- a/licenses/serializer.LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- 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.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
diff --git a/licenses/serializer.NOTICE.txt b/licenses/serializer.NOTICE.txt
deleted file mode 100644
index c445858..0000000
--- a/licenses/serializer.NOTICE.txt
+++ /dev/null
@@ -1,18 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to section 4(d) of the Apache License, ==
- == Version 2.0, in this case for the Apache Xalan Java distribution. ==
- =========================================================================
-
- Apache Xalan (Xalan serializer)
- Copyright 1999-2006 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Portions of this software was originally based on the following:
- - software copyright (c) 1999-2002, Lotus Development Corporation.,
- http://www.lotus.com.
- - software copyright (c) 2001-2002, Sun Microsystems.,
- http://www.sun.com.
- - software copyright (c) 2003, IBM Corporation.,
- http://www.ibm.com.
diff --git a/licenses/xalan.LICENSE.txt b/licenses/xalan.LICENSE.txt
deleted file mode 100644
index 57bc88a..0000000
--- a/licenses/xalan.LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
- 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.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
-
diff --git a/licenses/xalan.NOTICE.txt b/licenses/xalan.NOTICE.txt
deleted file mode 100644
index 5bd5c5b..0000000
--- a/licenses/xalan.NOTICE.txt
+++ /dev/null
@@ -1,47 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to section 4(d) of the Apache License, ==
- == Version 2.0, in this case for the Apache Xalan distribution. ==
- =========================================================================
-
- Apache Xalan (Xalan serializer)
- Copyright 1999-2006 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Portions of this software was originally based on the following:
- - software copyright (c) 1999-2002, Lotus Development Corporation.,
- http://www.lotus.com.
- - software copyright (c) 2001-2002, Sun Microsystems.,
- http://www.sun.com.
- - software copyright (c) 2003, IBM Corporation., http://www.ibm.com.
- - voluntary contributions made by Ovidiu Predescu <ovidiu@cup.hp.com> on
- behalf of the Apache Software Foundation that was originally developed
- at Hewlett Packard Company.
-
- The binary distribution package (ie. jars, samples and documentation) of
- this product includes software developed by the following:
-
- - The Apache Software Foundation
- - Xerces Java - see xercesImpl.README.txt
- - JAXP 1.3 APIs - see xml-apis.README.txt
- - Bytecode Engineering Library - see BCEL.README.txt
- - Regular Expression - see regexp.README.txt
-
- - Scott Hudson, Frank Flannery, C. Scott Ananian
- - CUP Parser Generator runtime (javacup\runtime) - see runtime.README.txt
-
-
- The source distribution package (ie. all source and tools required to build
- Xalan Java) of this product includes software developed by the following:
-
- - The Apache Software Foundation
- - Xerces Java - see xercesImpl.README.txt
- - JAXP 1.3 APIs - see xml-apis.README.txt
- - Bytecode Engineering Library - see BCEL.README.txt
- - Regular Expression - see regexp.README.txt
- - Ant - see ant.README.txt
- - Stylebook doc tool - see stylebook-1.0-b3_xalan-2.README.txt
-
- - Elliot Joel Berk and C. Scott Ananian
- - Lexical Analyzer Generator (JLex) - see JLex.README.txt
diff --git a/licenses/xercesImpl.LICENSE.txt b/licenses/xercesImpl.LICENSE.txt
deleted file mode 100644
index 261eeb9..0000000
--- a/licenses/xercesImpl.LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- 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.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
diff --git a/licenses/xercesImpl.NOTICE.txt b/licenses/xercesImpl.NOTICE.txt
deleted file mode 100644
index 602c753..0000000
--- a/licenses/xercesImpl.NOTICE.txt
+++ /dev/null
@@ -1,17 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to section 4(d) of the Apache License, ==
- == Version 2.0, in this case for the Apache Xerces Java distribution. ==
- =========================================================================
-
- Apache Xerces Java
- Copyright 1999-2006 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at iClick, Inc.,
- software copyright (c) 1999.
\ No newline at end of file
diff --git a/serializer.README.txt b/serializer.README.txt
deleted file mode 100644
index d86fb59..0000000
--- a/serializer.README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-serializer.jar - Xalan-Java 2 - Serializer
-
-Source: http://xml.apache.org
-Used by: Xalan-Java 2 and Xerces-Java 2
-
-See licenses/serializer.LICENSE.txt and licenses/serializer.NOTICE.txt
-for the license and attribution notice file that applies to serializer.jar.
diff --git a/src/org/apache/xalan/xsltc/compiler/ParameterRef.java b/src/org/apache/xalan/xsltc/compiler/ParameterRef.java
index 041ba3c..9644ad9 100644
--- a/src/org/apache/xalan/xsltc/compiler/ParameterRef.java
+++ b/src/org/apache/xalan/xsltc/compiler/ParameterRef.java
@@ -82,12 +82,10 @@
}
else {
il.append(_variable.loadInstruction());
- _variable.removeReference(this);
}
}
else {
il.append(_variable.loadInstruction());
- _variable.removeReference(this);
}
}
else {
diff --git a/src/org/apache/xalan/xsltc/compiler/Stylesheet.java b/src/org/apache/xalan/xsltc/compiler/Stylesheet.java
index e753fb5..c07981a 100644
--- a/src/org/apache/xalan/xsltc/compiler/Stylesheet.java
+++ b/src/org/apache/xalan/xsltc/compiler/Stylesheet.java
@@ -1162,7 +1162,12 @@
"setFilter",
"(Lorg/apache/xalan/xsltc/StripFilter;)V");
- il.append(new PUSH(cpg, DTM.ROOT_NODE));
+ final int gitr = cpg.addInterfaceMethodref(DOM_INTF,
+ "getIterator",
+ "()"+NODE_ITERATOR_SIG);
+ il.append(toplevel.loadDOM());
+ il.append(new INVOKEINTERFACE(gitr, 1));
+ il.append(toplevel.nextNode());
current.setStart(il.append(new ISTORE(current.getIndex())));
// Create a new list containing variables/params + keys
@@ -1406,7 +1411,12 @@
il.append(new PUTFIELD(domField));
// continue with globals initialization
- il.append(new PUSH(cpg, DTM.ROOT_NODE));
+ final int gitr = cpg.addInterfaceMethodref(DOM_INTF,
+ "getIterator",
+ "()"+NODE_ITERATOR_SIG);
+ il.append(transf.loadDOM());
+ il.append(new INVOKEINTERFACE(gitr, 1));
+ il.append(transf.nextNode());
current.setStart(il.append(new ISTORE(current.getIndex())));
// Transfer the output settings to the output post-processor
diff --git a/src/org/apache/xalan/xsltc/compiler/VariableBase.java b/src/org/apache/xalan/xsltc/compiler/VariableBase.java
index 1d6b478..c3f8391 100644
--- a/src/org/apache/xalan/xsltc/compiler/VariableBase.java
+++ b/src/org/apache/xalan/xsltc/compiler/VariableBase.java
@@ -82,14 +82,6 @@
}
/**
- * Remove a reference to this variable. Called by VariableRef when this
- * variable goes out of scope.
- */
- public void removeReference(VariableRefBase vref) {
- _refs.remove(vref);
- }
-
- /**
* Map this variable to a register
*/
public void mapRegister(MethodGenerator methodGen) {
@@ -105,7 +97,7 @@
* Called when we leave the AST scope of the variable's declaration
*/
public void unmapRegister(MethodGenerator methodGen) {
- if (_refs.isEmpty() && (_local != null)) {
+ if (_local != null) {
_local.setEnd(methodGen.getInstructionList().getEnd());
methodGen.removeLocalVariable(_local);
_refs = null;
diff --git a/src/org/apache/xalan/xsltc/compiler/VariableRef.java b/src/org/apache/xalan/xsltc/compiler/VariableRef.java
index d71ef37..442cdad 100644
--- a/src/org/apache/xalan/xsltc/compiler/VariableRef.java
+++ b/src/org/apache/xalan/xsltc/compiler/VariableRef.java
@@ -68,12 +68,10 @@
}
else {
il.append(_variable.loadInstruction());
- _variable.removeReference(this);
}
}
else {
il.append(_variable.loadInstruction());
- _variable.removeReference(this);
}
}
else {
diff --git a/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java b/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
index b2fe834..e365ae1 100644
--- a/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
+++ b/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
@@ -957,7 +957,7 @@
}
// Convert var/param -> node-set
else if (obj instanceof DTMAxisIterator) {
- return(((DTMAxisIterator)obj).cloneIterator());
+ return(((DTMAxisIterator)obj).cloneIterator().reset());
}
else {
final String className = obj.getClass().getName();
diff --git a/src/org/apache/xml/utils/DefaultErrorHandler.java b/src/org/apache/xml/utils/DefaultErrorHandler.java
index c52c53f..819f8e1 100644
--- a/src/org/apache/xml/utils/DefaultErrorHandler.java
+++ b/src/org/apache/xml/utils/DefaultErrorHandler.java
@@ -79,10 +79,24 @@
*/
public DefaultErrorHandler(boolean throwExceptionOnError)
{
- m_pw = new PrintWriter(System.err, true);
+ // Defer creation of a PrintWriter until it's actually needed
m_throwExceptionOnError = throwExceptionOnError;
}
+ /**
+ * Retrieve <code>java.io.PrintWriter</code> to which errors are being
+ * directed.
+ * @return The <code>PrintWriter</code> installed via the constructor
+ * or the default <code>PrintWriter</code>
+ */
+ public PrintWriter getErrorWriter() {
+ // Defer creating the java.io.PrintWriter until an error needs to be
+ // reported.
+ if (m_pw == null) {
+ m_pw = new PrintWriter(System.err, true);
+ }
+ return m_pw;
+ }
/**
* Receive notification of a warning.
@@ -102,8 +116,10 @@
*/
public void warning(SAXParseException exception) throws SAXException
{
- printLocation(m_pw, exception);
- m_pw.println("Parser warning: " + exception.getMessage());
+ PrintWriter pw = getErrorWriter();
+
+ printLocation(pw, exception);
+ pw.println("Parser warning: " + exception.getMessage());
}
/**
@@ -130,7 +146,7 @@
public void error(SAXParseException exception) throws SAXException
{
//printLocation(exception);
- // m_pw.println(exception.getMessage());
+ // getErrorWriter().println(exception.getMessage());
throw exception;
}
@@ -157,7 +173,7 @@
public void fatalError(SAXParseException exception) throws SAXException
{
// printLocation(exception);
- // m_pw.println(exception.getMessage());
+ // getErrorWriter().println(exception.getMessage());
throw exception;
}
@@ -181,9 +197,10 @@
*/
public void warning(TransformerException exception) throws TransformerException
{
- printLocation(m_pw, exception);
+ PrintWriter pw = getErrorWriter();
- m_pw.println(exception.getMessage());
+ printLocation(pw, exception);
+ pw.println(exception.getMessage());
}
/**
@@ -216,8 +233,10 @@
throw exception;
else
{
- printLocation(m_pw, exception);
- m_pw.println(exception.getMessage());
+ PrintWriter pw = getErrorWriter();
+
+ printLocation(pw, exception);
+ pw.println(exception.getMessage());
}
}
@@ -249,8 +268,10 @@
throw exception;
else
{
- printLocation(m_pw, exception);
- m_pw.println(exception.getMessage());
+ PrintWriter pw = getErrorWriter();
+
+ printLocation(pw, exception);
+ pw.println(exception.getMessage());
}
}
@@ -327,7 +348,7 @@
if(null != locator)
{
- // m_pw.println("Parser fatal error: "+exception.getMessage());
+ // getErrorWriter().println("Parser fatal error: "+exception.getMessage());
String id = (null != locator.getPublicId() )
? locator.getPublicId()
: (null != locator.getSystemId())
diff --git a/src/org/apache/xpath/CachedXPathAPI.java b/src/org/apache/xpath/CachedXPathAPI.java
index d411f3e..ebc6c79 100644
--- a/src/org/apache/xpath/CachedXPathAPI.java
+++ b/src/org/apache/xpath/CachedXPathAPI.java
@@ -72,7 +72,9 @@
*/
public CachedXPathAPI()
{
- xpathSupport = new XPathContext();
+ // Create an XPathContext that doesn't support pushing and popping of
+ // variable resolution scopes. Sufficient for simple XPath 1.0 expressions.
+ xpathSupport = new XPathContext(false);
}
/**
@@ -326,8 +328,11 @@
// Create the XPath object.
XPath xpath = new XPath(str, null, prefixResolver, XPath.SELECT, null);
+ // Create an XPathContext that doesn't support pushing and popping of
+ // variable resolution scopes. Sufficient for simple XPath 1.0 expressions.
+ XPathContext xpathSupport = new XPathContext(false);
+
// Execute the XPath, and have it return the result
- XPathContext xpathSupport = new XPathContext();
int ctxtNode = xpathSupport.getDTMHandleFromNode(contextNode);
return xpath.execute(xpathSupport, ctxtNode, prefixResolver);
diff --git a/src/org/apache/xpath/VariableStack.java b/src/org/apache/xpath/VariableStack.java
index bda7822..fcdab8b 100644
--- a/src/org/apache/xpath/VariableStack.java
+++ b/src/org/apache/xpath/VariableStack.java
@@ -50,6 +50,17 @@
}
/**
+ * Constructor for a variable stack.
+ * @param initStackSize The initial stack size. Must be at least one. The
+ * stack can grow if needed.
+ */
+ public VariableStack(int initStackSize)
+ {
+ // Allow for twice as many variables as stack link entries
+ reset(initStackSize, initStackSize*2);
+ }
+
+ /**
* Returns a clone of this variable stack.
*
* @return a clone of this variable stack.
@@ -72,7 +83,7 @@
* The stack frame where all variables and params will be kept.
* @serial
*/
- XObject[] _stackFrames = new XObject[XPathContext.RECURSIONLIMIT * 2];
+ XObject[] _stackFrames;
/**
* The top of the stack frame (<code>_stackFrames</code>).
@@ -92,7 +103,7 @@
* Motorola 68000 assembler</a> memories. :-)
* @serial
*/
- int[] _links = new int[XPathContext.RECURSIONLIMIT];
+ int[] _links;
/**
* The top of the links stack.
@@ -123,20 +134,40 @@
/**
* Reset the stack to a start position.
- *
- * @return the total size of the execution stack.
*/
public void reset()
{
+ // If the stack was previously allocated, assume that about the same
+ // amount of stack space will be needed again; otherwise, use a very
+ // large stack size.
+ int linksSize = (_links == null) ? XPathContext.RECURSIONLIMIT
+ : _links.length;
+ int varArraySize = (_stackFrames == null) ? XPathContext.RECURSIONLIMIT * 2
+ : _stackFrames.length;
+ reset(linksSize, varArraySize);
+ }
+ /**
+ * Reset the stack to a start position.
+ * @param linksSize Initial stack size to use
+ * @param varArraySize Initial variable array size to use
+ */
+ protected void reset(int linksSize, int varArraySize) {
_frameTop = 0;
_linksTop = 0;
+ // Don't bother reallocating _links array if it exists already
+ if (_links == null) {
+ _links = new int[linksSize];
+ }
+
// Adding one here to the stack of frame positions will allow us always
// to look one under without having to check if we're at zero.
// (As long as the caller doesn't screw up link/unlink.)
_links[_linksTop++] = 0;
- _stackFrames = new XObject[_stackFrames.length];
+
+ // Get a clean _stackFrames array and discard the old one.
+ _stackFrames = new XObject[varArraySize];
}
/**
diff --git a/src/org/apache/xpath/XPathAPI.java b/src/org/apache/xpath/XPathAPI.java
index 21b356a..24dae63 100644
--- a/src/org/apache/xpath/XPathAPI.java
+++ b/src/org/apache/xpath/XPathAPI.java
@@ -220,7 +220,9 @@
// (Changed from: XPathContext xpathSupport = new XPathContext();
// because XPathContext is weak in a number of areas... perhaps
// XPathContext should be done away with.)
- XPathContext xpathSupport = new XPathContext();
+ // Create an XPathContext that doesn't support pushing and popping of
+ // variable resolution scopes. Sufficient for simple XPath 1.0 expressions.
+ XPathContext xpathSupport = new XPathContext(false);
// Create an object to resolve namespace prefixes.
// XPath namespaces are resolved from the input context node's document element
@@ -274,8 +276,11 @@
// Create the XPath object.
XPath xpath = new XPath(str, null, prefixResolver, XPath.SELECT, null);
+ // Create an XPathContext that doesn't support pushing and popping of
+ // variable resolution scopes. Sufficient for simple XPath 1.0 expressions.
+ XPathContext xpathSupport = new XPathContext(false);
+
// Execute the XPath, and have it return the result
- XPathContext xpathSupport = new XPathContext();
int ctxtNode = xpathSupport.getDTMHandleFromNode(contextNode);
return xpath.execute(xpathSupport, ctxtNode, prefixResolver);
diff --git a/src/org/apache/xpath/XPathContext.java b/src/org/apache/xpath/XPathContext.java
index 2336da7..73f0d14 100644
--- a/src/org/apache/xpath/XPathContext.java
+++ b/src/org/apache/xpath/XPathContext.java
@@ -302,32 +302,56 @@
}
/**
- * Create an XPathContext instance.
+ * Create an XPathContext instance. This is equivalent to calling
+ * the {@link #XPathContext(boolean)} constructor with the value
+ * <code>true</code>.
*/
- public XPathContext()
- {
+ public XPathContext() {
+ this(true);
+ }
+
+ /**
+ * Create an XPathContext instance.
+ * @param recursiveVarContext A <code>boolean</code> value indicating whether
+ * the XPath context needs to support pushing of scopes for
+ * variable resolution
+ */
+ public XPathContext(boolean recursiveVarContext) {
m_prefixResolvers.push(null);
m_currentNodes.push(DTM.NULL);
m_currentExpressionNodes.push(DTM.NULL);
m_saxLocations.push(null);
+ m_variableStacks = recursiveVarContext ? new VariableStack()
+ : new VariableStack(1);
+ }
+
+ /**
+ * Create an XPathContext instance. This is equivalent to calling the
+ * constructor {@link #XPathContext(java.lang.Object,boolean)} with the
+ * value of the second parameter set to <code>true</code>.
+ * @param owner Value that can be retrieved via the getOwnerObject() method.
+ * @see #getOwnerObject
+ */
+ public XPathContext(Object owner)
+ {
+ this(owner, true);
}
/**
* Create an XPathContext instance.
* @param owner Value that can be retrieved via the getOwnerObject() method.
* @see #getOwnerObject
+ * @param recursiveVarContext A <code>boolean</code> value indicating whether
+ * the XPath context needs to support pushing of scopes for
+ * variable resolution
*/
- public XPathContext(Object owner)
- {
+ public XPathContext(Object owner, boolean recursiveVarContext) {
+ this(recursiveVarContext);
m_owner = owner;
try {
m_ownerGetErrorListener = m_owner.getClass().getMethod("getErrorListener", new Class[] {});
}
catch (NoSuchMethodException nsme) {}
- m_prefixResolvers.push(null);
- m_currentNodes.push(DTM.NULL);
- m_currentExpressionNodes.push(DTM.NULL);
- m_saxLocations.push(null);
}
/**
@@ -447,7 +471,7 @@
* The stack of Variable stacks. A VariableStack will be
* pushed onto this stack for each template invocation.
*/
- private VariableStack m_variableStacks = new VariableStack();
+ private VariableStack m_variableStacks;
/**
* Get the variable stack, which is in charge of variables and
diff --git a/src/org/apache/xpath/axes/AxesWalker.java b/src/org/apache/xpath/axes/AxesWalker.java
index 280e606..0d84548 100644
--- a/src/org/apache/xpath/axes/AxesWalker.java
+++ b/src/org/apache/xpath/axes/AxesWalker.java
@@ -425,7 +425,7 @@
return -1;
}
- walker.setPredicateCount(walker.getPredicateCount() - 1);
+ walker.setPredicateCount(m_predicateIndex);
walker.setNextWalker(null);
walker.setPrevWalker(null);
diff --git a/src/org/apache/xpath/axes/ReverseAxesWalker.java b/src/org/apache/xpath/axes/ReverseAxesWalker.java
index d23105d..aab2bf1 100644
--- a/src/org/apache/xpath/axes/ReverseAxesWalker.java
+++ b/src/org/apache/xpath/axes/ReverseAxesWalker.java
@@ -202,7 +202,7 @@
clone.setRoot(this.getRoot());
- clone.setPredicateCount(this.getPredicateCount() - 1);
+ clone.setPredicateCount(m_predicateIndex);
clone.setPrevWalker(null);
clone.setNextWalker(null);
diff --git a/src/org/apache/xpath/compiler/Lexer.java b/src/org/apache/xpath/compiler/Lexer.java
index 55a492c..f185868 100644
--- a/src/org/apache/xpath/compiler/Lexer.java
+++ b/src/org/apache/xpath/compiler/Lexer.java
@@ -113,8 +113,15 @@
m_compiler.m_currentPattern = pat;
m_patternMapSize = 0;
- // This needs to grow too.
- m_compiler.m_opMap = new OpMapVector(OpMap.MAXTOKENQUEUESIZE * 5, OpMap.BLOCKTOKENQUEUESIZE * 5, OpMap.MAPINDEX_LENGTH);
+ // This needs to grow too. Use a conservative estimate that the OpMapVector
+ // needs about five time the length of the input path expression - to a
+ // maximum of MAXTOKENQUEUESIZE*5. If the OpMapVector needs to grow, grow
+ // it freely (second argument to constructor).
+ int initTokQueueSize = ((pat.length() < OpMap.MAXTOKENQUEUESIZE)
+ ? pat.length() : OpMap.MAXTOKENQUEUESIZE) * 5;
+ m_compiler.m_opMap = new OpMapVector(initTokQueueSize,
+ OpMap.BLOCKTOKENQUEUESIZE * 5,
+ OpMap.MAPINDEX_LENGTH);
int nChars = pat.length();
int startSubstring = -1;
diff --git a/src/org/apache/xpath/domapi/XPathExpressionImpl.java b/src/org/apache/xpath/domapi/XPathExpressionImpl.java
index 85b49d8..5d06165 100644
--- a/src/org/apache/xpath/domapi/XPathExpressionImpl.java
+++ b/src/org/apache/xpath/domapi/XPathExpressionImpl.java
@@ -157,8 +157,11 @@
throw new XPathException(XPathException.TYPE_ERR,fmsg); // Invalid XPath type argument: {0}
}
- // Cache xpath context?
- XPathContext xpathSupport = new XPathContext();
+ // Create an XPathContext that doesn't support pushing and popping of
+ // variable resolution scopes. Sufficient for simple XPath 1.0
+ // expressions.
+ // Cache xpath context?
+ XPathContext xpathSupport = new XPathContext(false);
// if m_document is not null, build the DTM from the document
if (null != m_doc) {
diff --git a/src/org/apache/xpath/jaxp/JAXPVariableStack.java b/src/org/apache/xpath/jaxp/JAXPVariableStack.java
index 4af13bf..d98638d 100644
--- a/src/org/apache/xpath/jaxp/JAXPVariableStack.java
+++ b/src/org/apache/xpath/jaxp/JAXPVariableStack.java
@@ -42,6 +42,7 @@
private final XPathVariableResolver resolver;
public JAXPVariableStack(XPathVariableResolver resolver) {
+ super(2);
this.resolver = resolver;
}
diff --git a/src/org/apache/xpath/jaxp/XPathExpressionImpl.java b/src/org/apache/xpath/jaxp/XPathExpressionImpl.java
index 2a581dd..bd9f245 100644
--- a/src/org/apache/xpath/jaxp/XPathExpressionImpl.java
+++ b/src/org/apache/xpath/jaxp/XPathExpressionImpl.java
@@ -103,12 +103,16 @@
private XObject eval ( Object contextItem )
throws javax.xml.transform.TransformerException {
org.apache.xpath.XPathContext xpathSupport = null;
+
+ // Create an XPathContext that doesn't support pushing and popping of
+ // variable resolution scopes. Sufficient for simple XPath 1.0
+ // expressions.
if ( functionResolver != null ) {
JAXPExtensionsProvider jep = new JAXPExtensionsProvider(
functionResolver, featureSecureProcessing );
- xpathSupport = new org.apache.xpath.XPathContext( jep );
+ xpathSupport = new org.apache.xpath.XPathContext(jep, false);
} else {
- xpathSupport = new org.apache.xpath.XPathContext();
+ xpathSupport = new org.apache.xpath.XPathContext(false);
}
xpathSupport.setVarStack(new JAXPVariableStack(variableResolver));
diff --git a/src/org/apache/xpath/jaxp/XPathImpl.java b/src/org/apache/xpath/jaxp/XPathImpl.java
index 662967a..53d6036 100644
--- a/src/org/apache/xpath/jaxp/XPathImpl.java
+++ b/src/org/apache/xpath/jaxp/XPathImpl.java
@@ -195,12 +195,16 @@
org.apache.xpath.XPath xpath = new org.apache.xpath.XPath( expression,
null, prefixResolver, org.apache.xpath.XPath.SELECT );
org.apache.xpath.XPathContext xpathSupport = null;
+
+ // Create an XPathContext that doesn't support pushing and popping of
+ // variable resolution scopes. Sufficient for simple XPath 1.0
+ // expressions.
if ( functionResolver != null ) {
JAXPExtensionsProvider jep = new JAXPExtensionsProvider(
functionResolver, featureSecureProcessing );
- xpathSupport = new org.apache.xpath.XPathContext( jep );
+ xpathSupport = new org.apache.xpath.XPathContext(jep, false);
} else {
- xpathSupport = new org.apache.xpath.XPathContext();
+ xpathSupport = new org.apache.xpath.XPathContext(false);
}
XObject xobj = null;
diff --git a/tools/JLex.LICENSE.txt b/tools/JLex.LICENSE.txt
deleted file mode 100644
index 1d7dcb6..0000000
--- a/tools/JLex.LICENSE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-JLEX COPYRIGHT NOTICE, LICENSE AND DISCLAIMER.
-
-Copyright 1996-2000 by Elliot Joel Berk and C. Scott Ananian
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and
-that both the copyright notice and this permission notice and
-warranty disclaimer appear in supporting documentation, and that the
-name of the authors or their employers not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.
-
-The authors and their employers disclaim all warranties with regard
-to this software, including all implied warranties of merchantability and
-fitness. In no event shall the authors or their employers be liable for any
-special, indirect or consequential damages or any damages whatsoever resulting
-from loss of use, data or profits, whether in an action of contract,
-negligence or other tortious action, arising out of or in connection
-with the use or performance of this software.
-
-Java is a trademark of Sun Microsystems, Inc. References to the Java
-programming language in relation to JLex are not meant to imply that
-Sun endorses this product.
diff --git a/tools/JLex.README.txt b/tools/JLex.README.txt
deleted file mode 100644
index 886e0b1..0000000
--- a/tools/JLex.README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-JLex Jar - A Lexical Analyzer Generator for Java(TM)
-
-Sourced From: http://www.cs.princeton.edu/~appel/modern/java/JLex
-Used By: XSLTC component of xml-xalan/java
-
-See JLex.LICENSE.txt and web site for further information.
diff --git a/tools/ant.LICENSE.txt b/tools/ant.LICENSE.txt
deleted file mode 100644
index 032be14..0000000
--- a/tools/ant.LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ============================================================================
- * 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/tools/ant.README.txt b/tools/ant.README.txt
deleted file mode 100644
index 7f96143..0000000
--- a/tools/ant.README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-ant.jar - a Java based build tool. In theory it is kind of like make without make's wrinkles.
-
-Source: http://jakarta.apache.org/ant
-Used By: Xalan's build process: xml-xalan/java/build.xml and xml-xalan/test/build.xml
-
-See ant.LICENSE.txt for the Apache Software License that applies
-to the following files: ant.jar, antRun, antRun.bat
diff --git a/tools/java_cup.LICENSE.txt b/tools/java_cup.LICENSE.txt
deleted file mode 100644
index a21c9ca..0000000
--- a/tools/java_cup.LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-CUP Parser Generator Copyright Notice, License, and Disclaimer
-
-Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both
-the copyright notice and this permission notice and warranty disclaimer
-appear in supporting documentation, and that the names of the authors
-or their employers not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior permission.
-
-The authors and their employers disclaim all warranties with regard to
-this software, including all implied warranties of merchantability
-and fitness. In no event shall the authors or their employers be liable
-for any special, indirect or consequential damages or any damages
-whatsoever resulting from loss of use, data or profits, whether in an action
-of contract, negligence or other tortious action, arising out of or
-in connection with the use or performance of this software.
diff --git a/tools/java_cup.README.txt b/tools/java_cup.README.txt
deleted file mode 100644
index fdd0193..0000000
--- a/tools/java_cup.README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-JavaCup Jar - LALR Parser Generator for Java(TM)
-
-Sourced From: http://www.cs.princeton.edu/~appel/modern/java/CUP
-Used By: XSLTC component of xml-xalan/java
-
-See java_cup.LICENSE.txt and web site for further information.
diff --git a/tools/stylebook-1.0-b3_xalan-2.LICENSE.txt b/tools/stylebook-1.0-b3_xalan-2.LICENSE.txt
deleted file mode 100644
index 9ef5f61..0000000
--- a/tools/stylebook-1.0-b3_xalan-2.LICENSE.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following 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 "Xalan", "Xerces", 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 (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.apache.org. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
diff --git a/tools/stylebook-1.0-b3_xalan-2.README.txt b/tools/stylebook-1.0-b3_xalan-2.README.txt
deleted file mode 100644
index ac676b7..0000000
--- a/tools/stylebook-1.0-b3_xalan-2.README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-stylebook-1.0-b3_xalan-2.jar - Tool for generating Xalan documentation. Integrated with Xalan-Java 2 and Xerces 2.
-
-Source: http://cvs.apache.org/viewcvs.cgi/xml-stylebook/
-Used by: Xalan-Java 2, Xalan-C++
-
-See bsf.stylebook-1.0-b3_xalan-2.LICENSE.txt for the Apache Software license that applies to stylebook-1.0-b3_xalan-2.jar.
diff --git a/xalan.README.txt b/xalan.README.txt
deleted file mode 100644
index 87a3f89..0000000
--- a/xalan.README.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-xalan.jar - Xalan-Java 2 - XSLT Processor.
-
-Source: http://xml.apache.org
-
-See the following files for licenses and attribution notices that apply to xalan.jar:
- licenses/xalan.LICENSE.txt
- licenses/xalan.NOTICE.txt
- licenses/BCEL.LICENSE.txt
- licenses/regexp.LICENSE.txt
- licenses/runtime.LICENSE.txt
diff --git a/xdocs/sources/xalan/readme.xml b/xdocs/sources/xalan/readme.xml
index df9c185..c8f556d 100644
--- a/xdocs/sources/xalan/readme.xml
+++ b/xdocs/sources/xalan/readme.xml
@@ -34,7 +34,7 @@
<anchor name="notes_latest"/>
<s2 title="Release notes for &xslt4j; 2.7.1">
- <p>&xslt4j; 2.7.1 was released in December 2006.
+ <p>&xslt4j; 2.7.1 was released in August 2007.
</p>
<p>
The serializer now has support for DOM Level 3 serialization
@@ -74,12 +74,14 @@
<li>XALANJ Jira bug fixes:
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-611">611</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1324">1324</jump>,
+ <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1434">1434</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1497">1497</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1706">1706</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1753">1753</jump>,
+ <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1774">1774</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2061">2061</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2091">2091</jump>,
- <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2133">2133</jump>,
+ <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2108">2108</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2159">2159</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2184">2184</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2196">2196</jump>,
@@ -134,9 +136,13 @@
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2329">2329</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2336">2336</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2337">2337</jump>,
+ <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2339">2339</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2341">2341</jump>,
<jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2342">2342</jump>,
- <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2343">2343</jump>
+ <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2343">2343</jump>,
+ <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2375">2375</jump>,
+ <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2377">2377</jump>,
+ <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2384">2384</jump>
</li>
</ul>
</s2>
