svn commit: r1903024 - in /xmlgraphics/fop/trunk: fop-core/ fop-core/src/main/java/org/apache/fop/render/xml/ fop-core/src/test/java/org/apache/fop/accessibility/fo/ fop-core/src/test/java/org/apache/fop/accessibility/pdf/ fop/lib/

Author: ssteiner
Date: Tue Jul 26 07:25:13 2022
New Revision: 1903024

URL: http://svn.apache.org/viewvc?rev=1903024&view=rev
Log:
FOP-3085: Remove Xalan

Removed:
    xmlgraphics/fop/trunk/fop/lib/xalan-2.7.2.jar
    xmlgraphics/fop/trunk/fop/lib/xalan.BCEL.LICENSE.txt
    xmlgraphics/fop/trunk/fop/lib/xalan.LICENSE.txt
    xmlgraphics/fop/trunk/fop/lib/xalan.NOTICE.txt
    xmlgraphics/fop/trunk/fop/lib/xalan.regexp.LICENSE.txt
    xmlgraphics/fop/trunk/fop/lib/xalan.runtime.LICENSE.txt
Modified:
    xmlgraphics/fop/trunk/fop-core/pom.xml
    xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java
    xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
    xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java

Modified: xmlgraphics/fop/trunk/fop-core/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/pom.xml?rev=1903024&r1=1903023&r2=1903024&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/pom.xml (original)
+++ xmlgraphics/fop/trunk/fop-core/pom.xml Tue Jul 26 07:25:13 2022
@@ -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>

Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java?rev=1903024&r1=1903023&r2=1903024&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java Tue Jul 26 07:25:13 2022
@@ -272,8 +272,8 @@ public class XMLRenderer extends Abstrac
         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());
         }
     }

Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java?rev=1903024&r1=1903023&r2=1903024&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java Tue Jul 26 07:25:13 2022
@@ -163,7 +163,7 @@ public class FO2StructureTreeConverterTe
                         + "    </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 FO2StructureTreeConverterTe
     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\" "

Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java?rev=1903024&r1=1903023&r2=1903024&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java Tue Jul 26 07:25:13 2022
@@ -57,7 +57,7 @@ public class MissingLanguageWarningTestC
         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)) {