rpms/xerces-j2/devel xerces-j2-bz152255.patch, NONE, 1.1.2.1 xerces-j2.spec, 1.12, 1.12.2.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Apr 27 17:40:29 UTC 2005 

Author: gbenson

Update of /cvs/dist/rpms/xerces-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6730

Modified Files:
      Tag: xerces-j2-bz155693-branch
	xerces-j2.spec 
Added Files:
      Tag: xerces-j2-bz155693-branch
	xerces-j2-bz152255.patch 
Log Message:
Patch away Xerces's bundled org.w3c.dom stuff (#152255)

xerces-j2-bz152255.patch:
 samples/dom/ASBuilder.java                              |    2 +-
 samples/xs/QueryXS.java                                 |    2 +-
 src/org/apache/xerces/dom/AttrImpl.java                 |    2 +-
 src/org/apache/xerces/dom/CoreDocumentImpl.java         |    4 ++--
 src/org/apache/xerces/dom/DOMConfigurationImpl.java     |    4 ++--
 src/org/apache/xerces/dom/DOMStringListImpl.java        |    2 +-
 src/org/apache/xerces/dom/ElementImpl.java              |    2 +-
 src/org/apache/xerces/dom/NodeImpl.java                 |    2 +-
 src/org/apache/xerces/dom/PSVIDocumentImpl.java         |    1 -
 src/org/apache/xerces/impl/xs/XMLSchemaLoader.java      |    4 ++--
 src/org/apache/xerces/impl/xs/opti/AttrImpl.java        |    2 +-
 src/org/apache/xerces/impl/xs/opti/DefaultDocument.java |    2 +-
 src/org/apache/xerces/impl/xs/opti/DefaultElement.java  |    2 +-
 src/org/apache/xerces/impl/xs/opti/DefaultNode.java     |    2 +-
 src/org/apache/xerces/parsers/DOMParserImpl.java        |    4 ++--
 src/org/apache/xerces/xs/XSLoader.java                  |    2 +-
 src/org/apache/xml/serialize/DOMSerializerImpl.java     |    4 ++--
 src/org/w3c/dom/ls/LSParser.java                        |    2 +-
 src/org/w3c/dom/ls/LSSerializer.java                    |    2 +-
 19 files changed, 23 insertions(+), 24 deletions(-)

--- NEW FILE xerces-j2-bz152255.patch ---
Don't use Xerces's bundled versions of classes provided by libgcj.

Fixes http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=152255 without having to put xml-commons in gcj's endorsed directory, 

This allows compilation against libgcj instead of xml-commons-apis,
which fixes http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=152255
without having to put xml-commons in gcj's endorsed directory, which
is required so as not to break Eclipse under libgcj (for details see
http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155693).

Note that this means that applications using Xerces will be using
libgcj's javax.xml, org.xml.sax and org.w3c.dom classes, and that
xml-commons-apis will not be used at all.

--- xerces-2_6_2/src/org/apache/xerces/dom/NodeImpl.java~	2004-02-20 18:58:07.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/dom/NodeImpl.java	2005-04-27 10:15:36.000000000 +0100
@@ -61,7 +61,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import org.apache.xerces.dom3.UserDataHandler;
+import org.w3c.dom.UserDataHandler;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
--- xerces-2_6_2/src/org/apache/xerces/dom/AttrImpl.java~	2004-02-20 18:58:09.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/dom/AttrImpl.java	2005-04-27 11:02:29.000000000 +0100
@@ -61,7 +61,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.apache.xerces.dom3.TypeInfo;
+import org.w3c.dom.TypeInfo;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Element;
--- xerces-2_6_2/src/org/apache/xerces/dom/ElementImpl.java~	2004-02-20 18:58:12.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/dom/ElementImpl.java	2005-04-27 11:02:56.000000000 +0100
@@ -65,7 +65,7 @@
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
-import org.apache.xerces.dom3.TypeInfo;
+import org.w3c.dom.TypeInfo;
 import org.apache.xerces.util.URI;
 
 /**
--- xerces-2_6_2/src/org/apache/xerces/impl/xs/opti/AttrImpl.java~	2004-02-20 18:58:09.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/impl/xs/opti/AttrImpl.java	2005-04-27 11:04:06.000000000 +0100
@@ -57,7 +57,7 @@
 
 package org.apache.xerces.impl.xs.opti;
 
-import org.apache.xerces.dom3.TypeInfo;
+import org.w3c.dom.TypeInfo;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Node;
 import org.w3c.dom.Element;
--- xerces-2_6_2/src/org/apache/xerces/impl/xs/opti/DefaultElement.java~	2004-02-20 18:58:09.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/impl/xs/opti/DefaultElement.java	2005-04-27 11:04:22.000000000 +0100
@@ -57,7 +57,7 @@
 
 package org.apache.xerces.impl.xs.opti;
 
-import org.apache.xerces.dom3.TypeInfo;
+import org.w3c.dom.TypeInfo;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
--- xerces-2_6_2/src/org/apache/xerces/dom/CoreDocumentImpl.java~	2004-02-20 18:58:09.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/dom/CoreDocumentImpl.java	2005-04-27 11:07:57.000000000 +0100
@@ -61,8 +61,8 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import org.apache.xerces.dom3.DOMConfiguration;
-import org.apache.xerces.dom3.UserDataHandler;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.UserDataHandler;
 import org.apache.xerces.util.XMLChar;
 import org.apache.xerces.util.XML11Char;
 import org.apache.xerces.xni.NamespaceContext;
--- xerces-2_6_2/src/org/apache/xerces/impl/xs/opti/DefaultDocument.java~	2004-02-20 18:58:07.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/impl/xs/opti/DefaultDocument.java	2005-04-27 11:09:00.000000000 +0100
@@ -57,7 +57,7 @@
 
 package org.apache.xerces.impl.xs.opti;
 
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Node;
 import org.w3c.dom.Text;
--- xerces-2_6_2/src/org/apache/xerces/dom/DOMConfigurationImpl.java~	2004-02-20 18:58:12.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/dom/DOMConfigurationImpl.java	2005-04-27 11:34:58.000000000 +0100
@@ -63,9 +63,9 @@
 import java.util.Locale;
 import java.util.Vector;
 
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.apache.xerces.dom3.DOMErrorHandler;
-import org.apache.xerces.dom3.DOMStringList;
+import org.w3c.dom.DOMStringList;
 
 import org.apache.xerces.impl.Constants;
 import org.apache.xerces.impl.XMLEntityManager;
--- xerces-2_6_2/src/org/apache/xerces/dom/DOMStringListImpl.java~	2004-02-20 18:58:12.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/dom/DOMStringListImpl.java	2005-04-27 11:59:38.000000000 +0100
@@ -59,7 +59,7 @@
 
 import java.util.Vector;
 
-import org.apache.xerces.dom3.DOMStringList;
+import org.w3c.dom.DOMStringList;
 
 /**
  * DOM Level 3 Experimental
--- xerces-2_6_2/src/org/apache/xerces/dom/PSVIDocumentImpl.java~	2004-02-20 18:58:08.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/dom/PSVIDocumentImpl.java	2005-04-27 12:05:02.000000000 +0100
@@ -64,7 +64,6 @@
 
 // REVISIT: This is a HACK! DO NOT MODIFY THIS import.
 //          It allows us to expose DOM L3 implemenation via org.w3c.dom packages
-import org.apache.xerces.dom3.DOMConfiguration;
 import org.w3c.dom.*;
 
 /**
--- xerces-2_6_2/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java~	2004-02-20 18:58:09.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java	2005-04-27 12:11:51.000000000 +0100
@@ -73,10 +73,10 @@
 import org.apache.xerces.dom.DOMErrorImpl;
 import org.apache.xerces.dom.DOMMessageFormatter;
 import org.apache.xerces.dom.DOMStringListImpl;
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.apache.xerces.dom3.DOMError;
 import org.apache.xerces.dom3.DOMErrorHandler;
-import org.apache.xerces.dom3.DOMStringList;
+import org.w3c.dom.DOMStringList;
 import org.apache.xerces.impl.Constants;
 import org.apache.xerces.impl.XMLEntityManager;
 import org.apache.xerces.impl.XMLErrorReporter;
--- xerces-2_6_2/src/org/apache/xerces/xs/XSLoader.java~	2004-02-20 18:58:13.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/xs/XSLoader.java	2005-04-27 13:44:14.000000000 +0100
@@ -57,7 +57,7 @@
 
 package org.apache.xerces.xs;
 
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.ls.LSInput;
 
 /**
--- xerces-2_6_2/src/org/apache/xerces/impl/xs/opti/DefaultNode.java~	2004-02-20 18:58:12.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/impl/xs/opti/DefaultNode.java	2005-04-27 13:48:07.000000000 +0100
@@ -57,7 +57,7 @@
 
 package org.apache.xerces.impl.xs.opti;
 
-import org.apache.xerces.dom3.UserDataHandler;
+import org.w3c.dom.UserDataHandler;
 import org.w3c.dom.Node;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
--- xerces-2_6_2/src/org/apache/xerces/parsers/DOMParserImpl.java~	2004-02-20 18:58:07.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xerces/parsers/DOMParserImpl.java	2005-04-27 13:51:32.000000000 +0100
@@ -65,10 +65,10 @@
 import org.apache.xerces.dom.DOMErrorImpl;
 import org.apache.xerces.dom.DOMMessageFormatter;
 import org.apache.xerces.dom.DOMStringListImpl;
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.apache.xerces.dom3.DOMError;
 import org.apache.xerces.dom3.DOMErrorHandler;
-import org.apache.xerces.dom3.DOMStringList;
+import org.w3c.dom.DOMStringList;
 import org.apache.xerces.impl.Constants;
 import org.apache.xerces.util.DOMEntityResolverWrapper;
 import org.apache.xerces.util.DOMErrorHandlerWrapper;
--- xerces-2_6_2/src/org/w3c/dom/ls/LSParser.java~	2004-02-20 18:58:10.000000000 +0000
+++ xerces-2_6_2/src/org/w3c/dom/ls/LSParser.java	2005-04-27 15:01:41.000000000 +0100
@@ -13,7 +13,7 @@
 package org.w3c.dom.ls;
 
 import org.w3c.dom.Document;
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.Node;
 import org.w3c.dom.DOMException;
 
--- xerces-2_6_2/src/org/apache/xml/serialize/DOMSerializerImpl.java~	2004-02-20 18:58:10.000000000 +0000
+++ xerces-2_6_2/src/org/apache/xml/serialize/DOMSerializerImpl.java	2005-04-27 16:36:48.000000000 +0100
@@ -80,10 +80,10 @@
 import org.apache.xerces.dom.DOMMessageFormatter;
 import org.apache.xerces.dom.DOMNormalizer;
 import org.apache.xerces.dom.DOMStringListImpl;
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.apache.xerces.dom3.DOMError;
 import org.apache.xerces.dom3.DOMErrorHandler;
-import org.apache.xerces.dom3.DOMStringList;
+import org.w3c.dom.DOMStringList;
 import org.apache.xerces.impl.Constants;
 import org.apache.xerces.impl.XMLEntityManager;
 import org.apache.xerces.util.NamespaceSupport;
--- xerces-2_6_2/src/org/w3c/dom/ls/LSSerializer.java~	2004-02-20 18:58:08.000000000 +0000
+++ xerces-2_6_2/src/org/w3c/dom/ls/LSSerializer.java	2005-04-27 17:21:35.000000000 +0100
@@ -12,7 +12,7 @@
 
 package org.w3c.dom.ls;
 
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.Node;
 import org.w3c.dom.DOMException;
 
--- xerces-2_6_2/samples/dom/ASBuilder.java~	2004-02-20 18:58:14.000000000 +0000
+++ xerces-2_6_2/samples/dom/ASBuilder.java	2005-04-27 17:46:08.000000000 +0100
@@ -57,7 +57,7 @@
 
 package dom;
 
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.apache.xerces.dom3.DOMError;
 import org.apache.xerces.dom3.DOMErrorHandler;
 
--- xerces-2_6_2/samples/xs/QueryXS.java~	2004-02-20 18:58:14.000000000 +0000
+++ xerces-2_6_2/samples/xs/QueryXS.java	2005-04-27 17:46:58.000000000 +0100
@@ -57,7 +57,7 @@
 
 package xs;
 
-import org.apache.xerces.dom3.DOMConfiguration;
+import org.w3c.dom.DOMConfiguration;
 import org.apache.xerces.dom3.DOMError;
 import org.apache.xerces.dom3.DOMErrorHandler;
 import org.apache.xerces.dom3.bootstrap.DOMImplementationRegistry;


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- xerces-j2.spec	21 Apr 2005 10:41:10 -0000	1.12
+++ xerces-j2.spec	27 Apr 2005 17:40:27 -0000	1.12.2.1
@@ -12,14 +12,12 @@
 License:	Apache Software License
 URL:		http://xml.apache.org/xerces2-j/
 Group:		Text Processing/Markup/XML
-#Vendor:		JPackage Project
-#Distribution:	JPackage
 Source0:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.%{version}.tar.gz
 Source1:        %{name}-version.sh
 Source2:        %{name}-constants.sh
 Source3:       http://archive.apache.org/dist/xml/xerces-j/Xerces-J-tools.%{version}.tar.gz
-Source4:	XJavac.java
 Patch0:         %{name}-build.patch
+Patch1:         %{name}-bz152255.patch
 Provides:	jaxp_parser_impl
 Requires:	xml-commons-apis
 Requires:	xml-commons-resolver
@@ -113,20 +111,13 @@
 %setup -q -n xerces-%{cvs_version}
 %setup -q -T -a 3 -D -n xerces-%{cvs_version}
 %setup -T -D -n xerces-%{cvs_version}
-rm -f tools/bin/xjavac.jar
-
 %patch0 -p1 -b .build
+%patch1 -p1 -b .bz152255
 
+# clean jar files
+find -name "*.jar" | sed '/\/xjavac\.jar$/d' | xargs rm -f
 
 %build
-mkdir -p org/apache/xerces/util
-cp $RPM_SOURCE_DIR/XJavac.java org/apache/xerces/util
-javac \
-        -classpath $(%{_bindir}/build-classpath ant) \
-        org/apache/xerces/util/XJavac.java
-jar cf tools/bin/xjavac.jar org/apache/xerces/util/*.class
-rm -rf org
-
 unset CLASSPATH
 ant \
 	-Dbuild.compiler=modern \

More information about the fedora-cvs-commits mailing list