This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch AOO50X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 10bc5b97eb43d979d37f88515b1823e0b667972a Author: Pedro Giffuni <[email protected]> AuthorDate: Thu Sep 3 23:42:00 2026 -0500 Remove XMerge metadata Clean some of metadata for xml-apis and Xerces that are not required anymore. ant itself has not required this in a while. (cherry picked from commit fb7182b86f881fa02b7745861a81e757692a3f2d) --- main/filter/source/xsltvalidate/makefile.mk | 14 +--- .../pentaho/output/OfficeDocumentReportTarget.java | 7 +- .../framework/container/XMLParserFactory.java | 79 ++-------------------- main/solenv/inc/antsettings.mk | 2 +- main/toolkit/test/accessibility/jawb.mf | 2 +- 5 files changed, 12 insertions(+), 92 deletions(-) diff --git a/main/filter/source/xsltvalidate/makefile.mk b/main/filter/source/xsltvalidate/makefile.mk index 3aafd2ca8d..a47c581114 100644 --- a/main/filter/source/xsltvalidate/makefile.mk +++ b/main/filter/source/xsltvalidate/makefile.mk @@ -32,19 +32,7 @@ XCLASSPATH+=":$(XML_CLASSPATH)" CLASSDIR!:=$(CLASSDIR)$/$(TARGET) #USE_UDK_EXTENDED_MANIFESTFILE=TRUE #USE_EXTENDED_MANIFESTFILE=TRUE -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar crimson.jar - -.IF "$(SYSTEM_XALAN)" == "YES" -EXTRAJARFILES += $(XALAN_JAR) -.ELSE -JARFILES += xalan.jar -.ENDIF - -.IF "$(SYSTEM_XML_APIS)" == "YES" -EXTRAJARFILES += $(XML_APIS_JAR) -.ELSE -JARFILES += xml-apis.jar -.ENDIF +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) CUSTOMMANIFESTFILE = Manifest diff --git a/main/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/main/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java index f042b63162..f1241e7dba 100644 --- a/main/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/main/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java @@ -37,7 +37,6 @@ import com.sun.star.report.pentaho.model.OfficeStyles; import com.sun.star.report.pentaho.model.OfficeStylesCollection; import com.sun.star.report.pentaho.styles.LengthCalculator; import com.sun.star.report.pentaho.styles.StyleMapper; -import com.sun.org.apache.xerces.internal.parsers.DOMParser; import java.util.logging.Level; import java.util.logging.Logger; import javax.xml.transform.OutputKeys; @@ -45,6 +44,7 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import javax.xml.parsers.DocumentBuilderFactory; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -1054,9 +1054,8 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget try { inputStream = getInputRepository().createInputStream("meta.xml"); - DOMParser dOMParser = new DOMParser(); - dOMParser.parse(new InputSource(inputStream)); - Document document = dOMParser.getDocument(); + Document document = DocumentBuilderFactory.newInstance() + .newDocumentBuilder().parse(new InputSource(inputStream)); NodeList nl = document.getElementsByTagName("document-meta/meta/generator"); Node node = document.getFirstChild().getFirstChild().getFirstChild().getFirstChild(); String creator = node.getNodeValue(); diff --git a/main/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java b/main/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java index a7f27c6bc6..d9b0cc3821 100644 --- a/main/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java +++ b/main/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java @@ -26,9 +26,12 @@ package com.sun.star.script.framework.container; import java.io.InputStream; import java.io.OutputStream; import java.io.IOException; -import java.lang.reflect.Method; import javax.xml.parsers.*; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -95,79 +98,9 @@ public class XMLParserFactory { } public void write(Document doc, OutputStream out) throws IOException { - Class clazz = doc.getClass(); - String name = clazz.getName(); - - // depending on the class of the Document object use introspection - // to invoke the appropriate methods for writing the XML - // this code is based on the code used by the NetBeans - // class XMLUtilImpl in the openide module try { - if (name.equals("com.sun.xml.tree.XmlDocument") || - name.equals("org.apache.crimson.tree.XmlDocument")) { - - // these DOM implementations are self writing - Method write; - write = clazz.getDeclaredMethod("write", - new Class[] {OutputStream.class}); - write.invoke(doc, new Object[] {out}); - } - else { - // try xerces serialize package using introspection - ClassLoader cl = this.getClass().getClassLoader(); - - Class serializerClass = null; - Class formatterClass = null; - - try { - serializerClass = Class.forName( - "org.apache.xml.serialize.XMLSerializer", true, cl); - formatterClass = Class.forName( - "org.apache.xml.serialize.OutputFormat", true, cl); - } catch (ClassNotFoundException cnfe) { - String prefix = "com.sun.org.apache.xml.internal."; - - serializerClass = Class.forName( - prefix + "serialize.XMLSerializer" , true, cl); - formatterClass = Class.forName( - prefix + "serialize.OutputFormat", true, cl); - } - - Object serializerObject = serializerClass.newInstance(); - Object formatterObject = formatterClass.newInstance(); - - // improve output readability using the OutputFormat class - Method method = null; - method = formatterClass.getMethod("setMethod", - new Class[] {String.class}); - method.invoke(formatterObject, new Object[] {"xml"}); - method = formatterClass.getMethod("setIndenting", - new Class[] {Boolean.TYPE}); - method.invoke(formatterObject, new Object[] {Boolean.TRUE}); - - // now set up an instance of XMLSerializer with our - // OutputStream and serialize our Document - method = serializerClass.getMethod("setOutputByteStream", - new Class[] {OutputStream.class}); - method.invoke(serializerObject, new Object[] {out}); - method = serializerClass.getMethod("setOutputFormat", - new Class[] {formatterClass}); - method.invoke(serializerObject, - new Object[] {formatterObject}); - - method = serializerClass.getMethod("asDOMSerializer", - new Class[0]); - Object impl = method.invoke(serializerObject, - new Object[0]); - - method = impl.getClass().getMethod("serialize", - new Class[] {Document.class}); - method.invoke(impl, new Object[] {doc}); - } - } catch (NoSuchMethodException ex) { - throw new IOException(ex.getMessage()); - } catch (ClassNotFoundException ex) { - throw new IOException(ex.getMessage()); + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + transformer.transform(new DOMSource(doc), new StreamResult(out)); } catch (Exception ex) { throw new IOException(ex.getMessage()); } diff --git a/main/solenv/inc/antsettings.mk b/main/solenv/inc/antsettings.mk index 4f7a661c7a..e71d52676d 100644 --- a/main/solenv/inc/antsettings.mk +++ b/main/solenv/inc/antsettings.mk @@ -26,7 +26,7 @@ ANT_LIB*:=$(ANT_HOME)/lib -ANT_CLASSPATH:=$(ANT_LIB)/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar +ANT_CLASSPATH:=$(ANT_LIB)/ant.jar # PATH_SEPERATOR won't work here as it is defined # as ; for windows (all shells) diff --git a/main/toolkit/test/accessibility/jawb.mf b/main/toolkit/test/accessibility/jawb.mf index 939cbdad22..19dfeb4aaa 100644 --- a/main/toolkit/test/accessibility/jawb.mf +++ b/main/toolkit/test/accessibility/jawb.mf @@ -1,3 +1,3 @@ Manifest-Version: 1.0 Main-Class: AccessibilityWorkBench -Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar xml-apis.jar +Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar
