diff options
| author | Simon Steiner <ssteiner@apache.org> | 2022-07-26 07:25:13 +0000 |
|---|---|---|
| committer | Simon Steiner <ssteiner@apache.org> | 2022-07-26 07:25:13 +0000 |
| commit | 5818e16bd18384d5f8fe5e3fb82795b1fb96948e (patch) | |
| tree | 3b0b227ecaf6a620ebc93afa396040aa8375868b /fop-core | |
| parent | d7b29ae0a5f2b89fdbcf6eac131a94fc10896aea (diff) | |
| download | xmlgraphics-fop-5818e16bd18384d5f8fe5e3fb82795b1fb96948e.tar.gz xmlgraphics-fop-5818e16bd18384d5f8fe5e3fb82795b1fb96948e.zip | |
FOP-3085: Remove Xalan
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1903024 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'fop-core')
4 files changed, 11 insertions, 5 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)) { |