Skip to content

java: replace obsolete dependencies on xml-apis and Xerces. #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pgiffuni merged 2 commits into from
Sep 4, 2026
Merged

java: replace obsolete dependencies on xml-apis and Xerces. #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b7814
XMerge: use standard JAXP XML serialization
pgiffuni Sep 4, 2026
fb7182b
Remove XMerge metadata
pgiffuni Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions main/filter/source/xsltvalidate/makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions main/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
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;
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;
Expand Down Expand Up @@ -1054,9 +1054,8 @@ public void copyMeta()
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();
Expand Down
79 changes: 6 additions & 73 deletions main/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@
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;
Expand Down Expand Up @@ -95,79 +98,9 @@ public Document parse(InputStream inputStream) throws IOException {
}

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());
}
Expand Down
2 changes: 1 addition & 1 deletion main/solenv/inc/antsettings.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion main/toolkit/test/accessibility/jawb.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions main/xmerge/java/xmerge/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,9 @@
<import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>

<target name="init-project">
<property name="jar.classpath" value="xml-apis.jar xercesImpl.jar serializer.jar"/>
<property name="jar.manifest" value="manifest.mf"/>

<path id="main.classpath">
<!-- <pathelement location="${OUTDIR}/bin/xml-apis.jar"/> -->
<!-- <pathelement location="${OUTDIR}/bin/xercesImpl.jar"/> -->
<pathelement location="${OUTDIR}/bin/unoil.jar"/>
<pathelement location="${OUTDIR}/bin/ridl.jar"/>
<pathelement location="${OUTDIR}/bin/juh.jar"/>
Expand Down
117 changes: 8 additions & 109 deletions main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import java.io.InputStream;
import java.io.OutputStream;
import java.io.StringWriter;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

Expand Down Expand Up @@ -232,9 +231,6 @@ public void write(OutputStream os) throws IOException {
* <p>Write out a <code>org.w3c.dom.Document</code> object into a
* <code>byte</code> array.</p>
*
* <p>TODO: remove dependency on com.sun.xml.tree.XmlDocument
* package!</p>
*
* @param doc DOM <code>Document</code> object.
*
* @return <code>byte</code> array of DOM <code>Document</code>
Expand All @@ -244,115 +240,18 @@ public void write(OutputStream os) throws IOException {
*/
private byte[] docToBytes(Document doc)
throws IOException {

ByteArrayOutputStream baos = new ByteArrayOutputStream();

java.lang.reflect.Constructor con;
java.lang.reflect.Method meth;

String domImpl = doc.getClass().getName();

System.err.println("type b " + domImpl);

/*
* We may have multiple XML parsers in the Classpath.
* Depending on which one is first, the actual type of
* doc may vary. Need a way to find out which API is being
* used and use an appropriate serialization method.
*/
try {
// First of all try for JAXP 1.0
if (domImpl.equals("com.sun.xml.tree.XmlDocument")) {
System.out.println("Using JAXP");
Class jaxpDoc = Class.forName("com.sun.xml.tree.XmlDocument");

// The method is in the XMLDocument class itself, not a helper
meth = jaxpDoc.getMethod("write",
new Class[] { Class.forName("java.io.OutputStream") } );

meth.invoke(doc, new Object [] { baos } );
}
else if (domImpl.equals("org.apache.crimson.tree.XmlDocument"))
{
System.out.println("Using Crimson");
Class crimsonDoc = Class.forName("org.apache.crimson.tree.XmlDocument");
// The method is in the XMLDocument class itself, not a helper
meth = crimsonDoc.getMethod("write",
new Class[] { Class.forName("java.io.OutputStream") } );

meth.invoke(doc, new Object [] { baos } );
}
else if (domImpl.equals("org.apache.xerces.dom.DocumentImpl")
|| domImpl.equals("org.apache.xerces.dom.DeferredDocumentImpl")) {
System.out.println("Using Xerces");
// Try for Xerces
Class xercesSer =
Class.forName("org.apache.xml.serialize.XMLSerializer");

// Get the OutputStream constructor
// May want to use the OutputFormat parameter at some stage too
con = xercesSer.getConstructor(new Class []
{ Class.forName("java.io.OutputStream"),
Class.forName("org.apache.xml.serialize.OutputFormat") } );


// Get the serialize method
meth = xercesSer.getMethod("serialize",
new Class [] { Class.forName("org.w3c.dom.Document") } );


// Get an instance
Object serializer = con.newInstance(new Object [] { baos, null } );


// Now call serialize to write the document
meth.invoke(serializer, new Object [] { doc } );
}
else if (domImpl.equals("gnu.xml.dom.DomDocument")) {
System.out.println("Using GNU");

Class gnuSer = Class.forName("gnu.xml.dom.ls.DomLSSerializer");

// Get the serialize method
meth = gnuSer.getMethod("serialize",
new Class [] { Class.forName("org.w3c.dom.Node"),
Class.forName("java.io.OutputStream") } );

// Get an instance
Object serializer = gnuSer.newInstance();

// Now call serialize to write the document
meth.invoke(serializer, new Object [] { doc, baos } );
}
else {
// We dont have another parser
try {
DOMSource domSource = new DOMSource(doc);
StringWriter writer = new StringWriter();
StreamResult result = new StreamResult(writer);
TransformerFactory tf = TransformerFactory.newInstance();
Transformer transformer = tf.newTransformer();
transformer.transform(domSource, result);
return writer.toString().getBytes();
}
catch (Exception e) {
// We don't have another parser
throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl);
}
}
}
catch (ClassNotFoundException cnfe) {
throw new IOException(cnfe.toString());
DOMSource domSource = new DOMSource(doc);
ByteArrayOutputStream output = new ByteArrayOutputStream();
StreamResult result = new StreamResult(output);
TransformerFactory tf = TransformerFactory.newInstance();
Transformer transformer = tf.newTransformer();
transformer.transform(domSource, result);
return output.toByteArray();
}
catch (Exception e) {
// We may get some other errors, but the bottom line is that
// the steps being executed no longer work
throw new IOException(e.toString());
throw new IOException("Unable to serialize XML document: " + e);
}

byte bytes[] = baos.toByteArray();

return bytes;
}


Expand Down
Loading