Tomáš Chvátal 2014-06-25 09:31:58 +00:00 committed by Git OBS Bridge
parent 9d95a94d92
commit 05da0a826e
11 changed files with 106 additions and 257 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f59a5ef7b51bd883f2e9bda37a9360692e6c5e439b98d9b6ac1953e1f98b0680
size 1792762

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ed1cb6b3bb65dfbf7a493dec45dba48673d6a7dd2ef28df5e32de6c0ddfefe0
size 1242079

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff9a5e3a12b4bdad5a9238db03ed5a4709831d3e2c13fe53601163c374ad2051
size 7079679

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b492f78042f5bbbc8cb7e0d9e82d7f7c0d1539b529b882310cdfc720839ce42
size 4065452

View File

@ -1,94 +0,0 @@
Index: xerces-2_8_1/build.xml
===================================================================
--- xerces-2_8_1.orig/build.xml
+++ xerces-2_8_1/build.xml
@@ -240,6 +240,7 @@ Copyright:
</copy>
<xjavac srcdir="${build.src}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}"
debug="${debug}"
@@ -300,6 +301,7 @@ Copyright:
<fileset dir="${samples.dir}"/>
</copy>
<xjavac srcdir="${build.samples}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
debug="${debug}"
@@ -317,6 +319,7 @@ Copyright:
excludes="dom/rename/**" />
</copy>
<xjavac srcdir="${build.tests}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
debug="${debug}"
@@ -403,6 +406,7 @@ Copyright:
<mkdir dir='${build.dir}/docs/javadocs/api'/>
<javadoc packagenames='javax.xml.*,org.w3c.*,org.xml.*'
+ source="1.4"
locale='en_US'
sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/api'
author='true' version='true'
@@ -412,6 +416,7 @@ Copyright:
/>
<mkdir dir='${build.dir}/docs/javadocs/xni'/>
<javadoc packagenames='org.apache.xerces.xni.*'
+ source="1.4"
locale='en_US'
sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/xni'
author='true' version='true'
@@ -422,6 +427,7 @@ Copyright:
/>
<mkdir dir='${build.dir}/docs/javadocs/xs'/>
<javadoc packagenames='org.apache.xerces.xs, org.apache.xerces.xs.datatypes'
+ source="1.4"
locale='en_US'
sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/xs'
author='true' version='true'
@@ -441,7 +447,9 @@ Copyright:
org.apache.xerces.xpointer'
locale='en_US'
sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/xerces2'
+ source="1.4"
classpath='${tools.dir}/${jar.resolver}'
+
author='true' version='true'
windowtitle='Xerces2 Implementation'
doctitle='Xerces2 Implementation'
@@ -455,6 +463,7 @@ Copyright:
locale='en_US'
sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/other'
author='true' version='true'
+ source="1.4"
windowtitle='Other Classes' doctitle='Other Classes'
bottom='${copyright}'
additionalparam='${additional.param}'
@@ -927,6 +936,7 @@ Copyright:
</copy>
<xjavac srcdir="${build.src}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
@@ -1213,6 +1223,7 @@ Copyright:
</copy>
<xjavac srcdir="${build.src}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
debug="${debug}"
@@ -1361,6 +1372,7 @@ Copyright:
</copy>
<xjavac srcdir="${build.src}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}"
debug="${debug}"

View File

@ -1,74 +0,0 @@
Index: xerces-2_8_1/src/org/apache/html/dom/HTMLFrameElementImpl.java
===================================================================
--- xerces-2_8_1.orig/src/org/apache/html/dom/HTMLFrameElementImpl.java
+++ xerces-2_8_1/src/org/apache/html/dom/HTMLFrameElementImpl.java
@@ -16,6 +16,8 @@
package org.apache.html.dom;
import org.w3c.dom.html.HTMLFrameElement;
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMException;
/**
* @xerces.internal
@@ -28,6 +30,10 @@ public class HTMLFrameElementImpl
extends HTMLElementImpl
implements HTMLFrameElement
{
+ public Document getContentDocument() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "method not supportet");
+ }
+
private static final long serialVersionUID = 635237057173695984L;
Index: xerces-2_8_1/src/org/apache/html/dom/HTMLIFrameElementImpl.java
===================================================================
--- xerces-2_8_1.orig/src/org/apache/html/dom/HTMLIFrameElementImpl.java
+++ xerces-2_8_1/src/org/apache/html/dom/HTMLIFrameElementImpl.java
@@ -14,6 +14,9 @@
* limitations under the License.
*/
package org.apache.html.dom;
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMException;
+
import org.w3c.dom.html.HTMLIFrameElement;
@@ -31,6 +34,11 @@ public class HTMLIFrameElementImpl
private static final long serialVersionUID = 2393622754706230429L;
+ public Document getContentDocument() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "method not supportet");
+ }
+
+
public String getAlign()
{
return capitalize( getAttribute( "align" ) );
Index: xerces-2_8_1/src/org/apache/html/dom/HTMLObjectElementImpl.java
===================================================================
--- xerces-2_8_1.orig/src/org/apache/html/dom/HTMLObjectElementImpl.java
+++ xerces-2_8_1/src/org/apache/html/dom/HTMLObjectElementImpl.java
@@ -16,6 +16,8 @@
package org.apache.html.dom;
import org.w3c.dom.html.HTMLObjectElement;
+import org.w3c.dom.Document;
+import org.w3c.dom.DOMException;
/**
* @xerces.internal
@@ -31,6 +33,10 @@ public class HTMLObjectElementImpl
private static final long serialVersionUID = 2276953229932965067L;
+ public Document getContentDocument() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "method not supportet");
+ }
+
public String getCode()
{
return getAttribute( "code" );

12
xerces-j2-constants.1 Normal file
View File

@ -0,0 +1,12 @@
.TH XERCES-J2-CONSTANTS 1 "08 April 2013" "xerces-2.11.0" "User commands"
.SH NAME
xerces-j2-constants \- display constants used by Xerces2 Java Parser
.SH SYNOPSIS
.BR xerces-j2-constants
.SH DESCRIPTION
Xerces-J2-Constants dumps common constants used by Xerces2 Java Parser
to standard output.

View File

@ -1,19 +0,0 @@
Index: xerces-2_8_1/src/org/apache/xerces/impl/XMLScanner.java
===================================================================
--- xerces-2_8_1.orig/src/org/apache/xerces/impl/XMLScanner.java 2006-09-14 03:23:36.000000000 +0200
+++ xerces-2_8_1/src/org/apache/xerces/impl/XMLScanner.java 2009-08-17 12:02:22.811296491 +0200
@@ -1026,6 +1026,14 @@
if (XMLChar.isMarkup(c) || c == ']') {
fStringBuffer.append((char)fEntityScanner.scanChar());
}
+ else if (XMLChar.isHighSurrogate(c)) {
+ scanSurrogates(fStringBuffer);
+ }
+ else if (isInvalidLiteral(c)) {
+ reportFatalError("InvalidCharInSystemID",
+ new Object[] { Integer.toHexString(c) });
+ fEntityScanner.scanChar();
+ }
} while (fEntityScanner.scanLiteral(quote, ident) != quote);
fStringBuffer.append(ident);
ident = fStringBuffer;

12
xerces-j2-version.1 Normal file
View File

@ -0,0 +1,12 @@
.TH XERCES-J2-VERSION 1 "08 April 2013" "xerces-2.11.0" "User commands"
.SH NAME
xerces-j2-version \- display version of Xerces2 Java Parser
.SH SYNOPSIS
.BR xerces-j2-version
.SH DESCRIPTION
Xerces-J2-Version prints version of Xerces2 Java Parser to standard
output.

View File

@ -1,9 +1,28 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 11 13:06:12 UTC 2014 - tchvatal@suse.com Fri Jun 6 15:48:05 UTC 2014 - tchvatal@suse.com
- Drop unused patches: - Version bump to 2.11.0:
* This release expands on Xerces' experimental support for XML
Schema 1.1 by providing implementations for the simplified
complex type restriction rules (also known as subsumption),
xs:override and a few other XML Schema 1.1 features. This
release also introduces experimental support for XML Schema
Component Designators (SCD). It fixes several bugs which were
present in Xerces-J 2.10.0 and also includes a few other minor
enhancements.
* As of this release, Xerces and Xalan now share a common
serialization codebase. The DOM Level 3 serialization support
which was in Xerces was migrated into the Xalan serializer and
Xerces' native serializer was deprecated. In this release we
also upgraded the xml-commons resolver to v1.2 (which provides
support for OASIS XML Catalogs v1.1), introduced a few minor
features and fixed several bugs.
- Obsoleted patches no longer needed:
* xerces-j2-parsing.patch
* xerces-j2-2.8.1_new_unsupported_dom_methods.patch
* xerces-build.patch * xerces-build.patch
* xerces-j2-gcj-switch-constants-bug.patch * xerces-j2-gcj-switch-constants-bug.patch
* java150_build.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 9 11:06:27 UTC 2013 - tchvatal@suse.com Mon Sep 9 11:06:27 UTC 2013 - tchvatal@suse.com

View File

@ -16,29 +16,22 @@
# #
Name: xerces-j2 %define cvs_version 2_11_0
%define name xerces-j2
%define version 2.8.1
%define cvs_version 2_8_1
%define release 3jpp %define release 3jpp
%define section free %define section free
Version: 2.8.1 Name: xerces-j2
Version: 2.11.0
Release: 0 Release: 0
Summary: Java XML parser Summary: Java XML parser
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://xml.apache.org/xerces2-j/ Url: http://xml.apache.org/xerces2-j/
Source0: Xerces-J-src.%{version}.tar.bz2 Source0: http://www.eu.apache.org/dist/xerces/j/source/Xerces-J-src.%{version}.tar.gz
Source1: %{name}-version.sh Source1: http://www.eu.apache.org/dist/xerces/j/source/Xerces-J-tools.%{version}.tar.gz
Source2: %{name}-constants.sh Source2: %{name}-version.sh
Source3: Xerces-J-tools.%{version}.tar.bz2 Source3: %{name}-version.1
Patch1: java150_build.patch Source4: %{name}-constants.sh
Patch2: %{name}-%{version}_new_unsupported_dom_methods.patch Source5: %{name}-constants.1
#PATCH-FIX-UPSTREAM bnc#530717
#http://svn.apache.org/viewvc?view=rev&revision=787352
Patch3: xerces-j2-parsing.patch
Provides: jaxp_parser_impl
PreReq: update-alternatives /bin/ln
# some build requirements removed to enable jpackage bootstrap. this is # some build requirements removed to enable jpackage bootstrap. this is
# the first package built, and we use the libraries in the tools subdir # the first package built, and we use the libraries in the tools subdir
# for it. # for it.
@ -47,8 +40,11 @@ BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: antlr antlr-java #!BuildIgnore: antlr antlr-java
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: unzip BuildRequires: unzip
BuildArch: noarch Requires(post): update-alternatives
Requires(pre): update-alternatives
Provides: jaxp_parser_impl
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description %description
Welcome to the future! Xerces2 is the next generation of high Welcome to the future! Xerces2 is the next generation of high
@ -97,8 +93,6 @@ Implementation page.
This package contains demonstration and sample files for Xerces2. This package contains demonstration and sample files for Xerces2.
%package scripts %package scripts
Summary: Additional utility scripts for xerces-j2 Summary: Additional utility scripts for xerces-j2
Group: Development/Libraries/Java Group: Development/Libraries/Java
@ -127,16 +121,15 @@ Implementation page.
This package contains additional utility scripts for Xerces2. This package contains additional utility scripts for Xerces2.
%package xml-resolver %package xml-resolver
Summary: Resolver subproject of xml-commons Summary: Resolver subproject of xml-commons
Group: Development/Libraries/Java Group: Development/Libraries/Java
Requires: javapackages-tools Requires: javapackages-tools
Requires(post): update-alternatives
Requires(pre): update-alternatives
Provides: xml-commons-resolver Provides: xml-commons-resolver
PreReq: update-alternatives
%description xml-resolver %description xml-resolver
xml-commons is focused on common code and guidelines for xml projects. xml-commons is focused on common code and guidelines for xml projects.
The first focus will be to organize and have common packaging for the The first focus will be to organize and have common packaging for the
various externally-defined standards code relating to XML - things like various externally-defined standards code relating to XML - things like
@ -144,16 +137,15 @@ the DOM, SAX, and JAXP interfaces.
This package contains the resolver subproject of xml-commons. This package contains the resolver subproject of xml-commons.
%package xml-apis %package xml-apis
Summary: APIs subproject of xml-commons Summary: APIs subproject of xml-commons
Group: Development/Libraries/Java Group: Development/Libraries/Java
Requires: javapackages-tools Requires: javapackages-tools
Requires(post): update-alternatives
Requires(pre): update-alternatives
Provides: xml-commons-apis Provides: xml-commons-apis
PreReq: update-alternatives
%description xml-apis %description xml-apis
xml-commons is focused on common code and guidelines for xml projects. xml-commons is focused on common code and guidelines for xml projects.
Its first focus will be to organize and have common packaging for the Its first focus will be to organize and have common packaging for the
various externally-defined standards code relating to XML - things like various externally-defined standards code relating to XML - things like
@ -165,15 +157,15 @@ subprojects.
This package contains the APIs subproject of xml-commons. This package contains the APIs subproject of xml-commons.
%prep %prep
%setup -q -n xerces-%{cvs_version} %setup -q -n xerces-%{cvs_version}
%setup -q -T -a 3 -D -n xerces-%{cvs_version} %setup -q -T -a 1 -D -n xerces-%{cvs_version}
%setup -T -D -n xerces-%{cvs_version} %setup -q -T -D -n xerces-%{cvs_version}
%patch1 -p1
%patch2 -p1 echo 'javac.target=1.5' > build.properties
%patch3 -p1 -b .parsing echo 'javac.source=1.5' >> build.properties
sed -i 's/\r//' LICENSE README NOTICE build.sh
%build %build
## this uses the ant.jar provided by the xerces packages. Tough luck, ## this uses the ant.jar provided by the xerces packages. Tough luck,
@ -183,71 +175,71 @@ export JAVA_HOME=%{_libdir}/jvm/java-1.5.0-gcj
export GC_MAXIMUM_HEAP_SIZE="134217728" export GC_MAXIMUM_HEAP_SIZE="134217728"
export CLASSPATH=$CLASSPATH:`build-classpath antlr-bootstrap` export CLASSPATH=$CLASSPATH:`build-classpath antlr-bootstrap`
sh build.sh jars sh build.sh jars
#ant tests test #ant tests test
%install %install
# jars # jars
mkdir -p $RPM_BUILD_ROOT%{_javadir} mkdir -p %{buildroot}%{_javadir}
cp -p build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar cp -p build/xercesImpl.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
cp -p build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}-xml-resolver.jar cp -p build/resolver.jar %{buildroot}%{_javadir}/%{name}-%{version}-xml-resolver.jar
cp -p build/xml-apis.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}-xml-apis.jar cp -p build/xml-apis.jar %{buildroot}%{_javadir}/%{name}-%{version}-xml-apis.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) (cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# scripts # scripts
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p %{buildroot}%{_bindir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-version cp -p %{SOURCE2} %{buildroot}%{_bindir}/%{name}-version
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-constants cp -p %{SOURCE4} %{buildroot}%{_bindir}/%{name}-constants
# mans
install -d -m 755 %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE5} %{buildroot}%{_mandir}/man1
# demo # demo
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} mkdir -p %{buildroot}%{_datadir}/%{name}
cp -p build/xercesSamples.jar \ cp -p build/xercesSamples.jar \
$RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-samples.jar %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar
cp -pr data $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pr data %{buildroot}%{_datadir}/%{name}
# jaxp_parser_impl ghost symlink # jaxp_parser_impl ghost symlink
ln -s %{_sysconfdir}/alternatives \ ln -s %{_sysconfdir}/alternatives \
$RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar %{buildroot}%{_javadir}/jaxp_parser_impl.jar
# xml-apis ghost symlink # xml-apis ghost symlink
ln -s %{_sysconfdir}/alternatives \ ln -s %{_sysconfdir}/alternatives \
$RPM_BUILD_ROOT%{_javadir}/xml-commons-apis.jar %{buildroot}%{_javadir}/xml-commons-apis.jar
# xml-resolver ghost symlink # xml-resolver ghost symlink
ln -s %{_sysconfdir}/alternatives \ ln -s %{_sysconfdir}/alternatives \
$RPM_BUILD_ROOT%{_javadir}/xml-commons-resolver.jar %{buildroot}%{_javadir}/xml-commons-resolver.jar
%clean
rm -rf $RPM_BUILD_ROOT
%post %post
/usr/sbin/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl %{_javadir}/%{name}.jar 23 %{_sbindir}/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl %{_javadir}/%{name}.jar 23
/usr/sbin/update-alternatives --auto jaxp_parser_impl %{_sbindir}/update-alternatives --auto jaxp_parser_impl
%post xml-apis %post xml-apis
/usr/sbin/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/%{name}-xml-apis.jar 1 %{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/%{name}-xml-apis.jar 1
/usr/sbin/update-alternatives --auto xml-commons-apis %{_sbindir}/update-alternatives --auto xml-commons-apis
%post xml-resolver %post xml-resolver
/usr/sbin/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/%{name}-xml-resolver.jar 1 %{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/%{name}-xml-resolver.jar 1
/usr/sbin/update-alternatives --auto xml-commons-resolver %{_sbindir}/update-alternatives --auto xml-commons-resolver
%preun %preun
{ {
[ $1 = 0 ] || exit 0 [ $1 = 0 ] || exit 0
/usr/sbin/update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar %{_sbindir}/update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar
} >/dev/null 2>&1 || : } >/dev/null 2>&1 || :
%preun xml-apis %preun xml-apis
{ {
[ $1 = 0 ] || exit 0 [ $1 = 0 ] || exit 0
/usr/sbin/update-alternatives --remove xml-commons-apis %{_javadir}/%{name}-xml-apis.jar %{_sbindir}/update-alternatives --remove xml-commons-apis %{_javadir}/%{name}-xml-apis.jar
} >/dev/null 2>&1 || : } >/dev/null 2>&1 || :
%preun xml-resolver %preun xml-resolver
{ {
[ $1 = 0 ] || exit 0 [ $1 = 0 ] || exit 0
/usr/sbin/update-alternatives --remove xml-commons-resolver %{_javadir}/%{name}-xml-commons-resolver.jar %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/%{name}-xml-commons-resolver.jar
} >/dev/null 2>&1 || : } >/dev/null 2>&1 || :
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc LICENSE README ISSUES STATUS TODO %doc LICENSE README
%{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%ghost %{_javadir}/jaxp_parser_impl.jar %ghost %{_javadir}/jaxp_parser_impl.jar
@ -271,5 +263,6 @@ rm -rf $RPM_BUILD_ROOT
%files scripts %files scripts
%defattr(0755,root,root,0755) %defattr(0755,root,root,0755)
%{_bindir}/* %{_bindir}/*
%{_mandir}/man1/*
%changelog %changelog