diff options
| -rw-r--r-- | fop-core/pom.xml | 6 | ||||
| -rw-r--r-- | fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java | 4 | ||||
| -rw-r--r-- | fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java | 4 | ||||
| -rw-r--r-- | fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java | 2 | ||||
| -rw-r--r-- | fop/lib/xalan-2.7.2.jar | bin | 3154938 -> 0 bytes | |||
| -rw-r--r-- | fop/lib/xalan.BCEL.LICENSE.txt | 52 | ||||
| -rw-r--r-- | fop/lib/xalan.LICENSE.txt | 202 | ||||
| -rw-r--r-- | fop/lib/xalan.NOTICE.txt | 44 | ||||
| -rw-r--r-- | fop/lib/xalan.regexp.LICENSE.txt | 52 | ||||
| -rw-r--r-- | fop/lib/xalan.runtime.LICENSE.txt | 20 |
10 files changed, 11 insertions, 375 deletions
diff --git a/fop-core/pom.xml b/fop-core/pom.xml index ca5904021..b27bbdd2b 100644 --- a/fop-core/pom.xml +++ b/fop-core/pom.xml @@ -23,6 +23,12 @@ <groupId>${project.groupId}</groupId> <artifactId>batik-anim</artifactId> <version>${batik.version}</version> + <exclusions> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java b/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java index ecad6b500..c636d72da 100644 --- a/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java +++ b/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java @@ -272,8 +272,8 @@ public class XMLRenderer extends AbstractXMLRenderer { iter = prefixes.entrySet().iterator(); while (iter.hasNext()) { Map.Entry entry = (Map.Entry)iter.next(); - String qn = "xmlns:" + (String)entry.getKey(); - atts.addAttribute("", (String)entry.getKey(), qn, + String qn = "xmlns:" + entry.getKey(); + atts.addAttribute(org.apache.fop.util.XMLConstants.XMLNS_NAMESPACE_URI, (String)entry.getKey(), qn, CDATA, (String)entry.getValue()); } } diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java index 4b933e98d..c3ae3e740 100644 --- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java @@ -163,7 +163,7 @@ public class FO2StructureTreeConverterTestCase { + " </fo:flow>\n" + " </fo:page-sequence>\n" + "</fo:root>\n", - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" + "<structure-tree-sequence>\n" + "<structure-tree xmlns=\"http://xmlgraphics.apache.org/fop/intermediate\" " + "xmlns:foi=\"http://xmlgraphics.apache.org/fop/internal\" " @@ -184,7 +184,7 @@ public class FO2StructureTreeConverterTestCase { public void testRemoveTableHeader() throws Exception { keepEmptyTags = false; String fo = IOUtils.toString(getResource("table-artifact.fo"), "utf8").replace("role=\"artifact\"", ""); - compare(fo, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + compare(fo, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" + "<structure-tree-sequence>\n" + "<structure-tree xmlns=\"http://xmlgraphics.apache.org/fop/intermediate\" " + "xmlns:foi=\"http://xmlgraphics.apache.org/fop/internal\" " diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java index 97383e9e2..02551c8da 100644 --- a/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java @@ -57,7 +57,7 @@ public class MissingLanguageWarningTestCase { private final String unknownLanguageEventID = PDFEventProducer.class.getName() + ".unknownLanguage"; private final LinkedList<String> expectedLocations = new LinkedList<String>( - Arrays.asList("30:37", "34:40")); + Arrays.asList("32:36", "35:59")); public void processEvent(Event event) { if (event.getEventID().equals(unknownLanguageEventID)) { diff --git a/fop/lib/xalan-2.7.2.jar b/fop/lib/xalan-2.7.2.jar Binary files differdeleted file mode 100644 index abdabe33e..000000000 --- a/fop/lib/xalan-2.7.2.jar +++ /dev/null diff --git a/fop/lib/xalan.BCEL.LICENSE.txt b/fop/lib/xalan.BCEL.LICENSE.txt deleted file mode 100644 index 58940a049..000000000 --- a/fop/lib/xalan.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/fop/lib/xalan.LICENSE.txt b/fop/lib/xalan.LICENSE.txt deleted file mode 100644 index 57bc88a15..000000000 --- a/fop/lib/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/fop/lib/xalan.NOTICE.txt b/fop/lib/xalan.NOTICE.txt deleted file mode 100644 index 81ce7751f..000000000 --- a/fop/lib/xalan.NOTICE.txt +++ /dev/null @@ -1,44 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to section 4(d) of the Apache License, == - == Version 2.0, in this case for the Apache Xalan distribution. == - ========================================================================= - - This product includes software developed by - 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/fop/lib/xalan.regexp.LICENSE.txt b/fop/lib/xalan.regexp.LICENSE.txt deleted file mode 100644 index 58940a049..000000000 --- a/fop/lib/xalan.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/fop/lib/xalan.runtime.LICENSE.txt b/fop/lib/xalan.runtime.LICENSE.txt deleted file mode 100644 index 374d49849..000000000 --- a/fop/lib/xalan.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. |