rpm/xerces-j2
SHA256
1
0
Fork 0
forked from pool/xerces-j2
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=26

Browse Source
This commit is contained in:
Tomáš Chvátal 2014-06-06 14:33:23 +00:00 committed by Git OBS Bridge
parent 364b52d7c2
commit e5d7025c88
12 changed files with 51 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Xerces-J-src.2.11.0.tar.gz Normal file
View File

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

3
Xerces-J-src.2.8.1.tar.bz2
View File

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

3
Xerces-J-tools.2.11.0.tar.gz Normal file
View File

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

3
Xerces-J-tools.2.8.1.tar.bz2
View File

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

94
java150_build.patch
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}"

18
xerces-build.patch
View File

@ -1,18 +0,0 @@
Index: build.xml
===================================================================
--- build.xml
+++ build.xml
@@ -28,11 +28,13 @@ Copyright:
<property name="tools.dir" value="./tools"/>
<!-- enable compilation under JDK 1.4 and above -->
+ <!-- commented out by SUSE packager
<taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
<classpath>
<pathelement location="${tools.dir}/bin/xjavac.jar"/>
</classpath>
</taskdef>
+ -->
<!-- Allow properties following these statements to be overridden -->
<!-- Note that all of these don't have to exist. They've just been defined

74
xerces-j2-2.8.1_new_unsupported_dom_methods.patch
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.

79
xerces-j2-gcj-switch-constants-bug.patch
View File

@ -1,79 +0,0 @@
Index: src/org/apache/xerces/xpointer/ElementSchemePointer.java
===================================================================
--- src/org/apache/xerces/xpointer/ElementSchemePointer.java
+++ src/org/apache/xerces/xpointer/ElementSchemePointer.java
@@ -162,8 +162,7 @@ class ElementSchemePointer implements XP
while (tokens.hasMore()) {
int token = tokens.nextToken();
- switch (token) {
- case Tokens.XPTRTOKEN_ELEM_NCNAME: {
+ if( token == Tokens.XPTRTOKEN_ELEM_NCNAME) {
// Note: Only a single ShortHand pointer can be present
// The shortHand name
@@ -175,14 +174,12 @@ class ElementSchemePointer implements XP
fShortHandPointer.setSchemeName(fShortHandPointerName);
break;
- }
- case Tokens.XPTRTOKEN_ELEM_CHILD: {
+ } else if( token == Tokens.XPTRTOKEN_ELEM_CHILD) {
tmpChildSequence[i] = tokens.nextToken();
i++;
break;
- }
- default:
+ } else {
reportError("InvalidElementSchemeXPointer",
new Object[] { xpointer });
}
@@ -871,4 +868,4 @@ class ElementSchemePointer implements XP
} // class Scanner
-}
\ No newline at end of file
+}
Index: src/org/apache/xerces/xpointer/XPointerHandler.java
===================================================================
--- src/org/apache/xerces/xpointer/XPointerHandler.java
+++ src/org/apache/xerces/xpointer/XPointerHandler.java
@@ -165,8 +165,7 @@ public final class XPointerHandler exten
while (tokens.hasMore()) {
int token = tokens.nextToken();
- switch (token) {
- case Tokens.XPTRTOKEN_SHORTHAND: {
+ if(token == Tokens.XPTRTOKEN_SHORTHAND) {
// The shortHand name
token = tokens.nextToken();
@@ -182,8 +181,7 @@ public final class XPointerHandler exten
shortHandPointer.setSchemeName(shortHandPointerName);
fXPointerParts.add(shortHandPointer);
break;
- }
- case Tokens.XPTRTOKEN_SCHEMENAME: {
+ } else if(token == Tokens.XPTRTOKEN_SCHEMENAME) {
// Retreive the local name and prefix to form the scheme name
token = tokens.nextToken();
@@ -273,8 +271,7 @@ public final class XPointerHandler exten
}
break;
- }
- default:
+ } else {
reportError("InvalidXPointerExpression",
new Object[] { xpointer });
}
@@ -1248,4 +1245,4 @@ public final class XPointerHandler exten
super.setProperty(propertyId, value);
}
-}
\ No newline at end of file
+}

19
xerces-j2-parsing.patch
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.

42
xerces-j2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xerces-j2
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,25 +18,22 @@
Name: xerces-j2
%define name xerces-j2
%define version 2.8.1
%define cvs_version 2_8_1
%define version 2.11.0
%define cvs_version 2_11_0
%define release 3jpp
%define section free
Version: 2.8.1
Version: 2.11.0
Release: 0
Summary: Java XML parser
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://xml.apache.org/xerces2-j/
Source0: Xerces-J-src.%{version}.tar.bz2
Source1: %{name}-version.sh
Source2: %{name}-constants.sh
Source3: Xerces-J-tools.%{version}.tar.bz2
Patch1: java150_build.patch
Patch2: %{name}-%{version}_new_unsupported_dom_methods.patch
#PATCH-FIX-UPSTREAM bnc#530717
#http://svn.apache.org/viewvc?view=rev&revision=787352
Patch3: xerces-j2-parsing.patch
Source0: http://www.eu.apache.org/dist/xerces/j/source/Xerces-J-src.%{version}.tar.gz
Source2: http://www.eu.apache.org/dist/xerces/j/source/Xerces-J-tools.%{version}.tar.gz
Source3: %{name}-version.sh
Source4: %{name}-version.1
Source5: %{name}-constants.sh
Source6: %{name}-constants.1
Provides: jaxp_parser_impl
PreReq: update-alternatives /bin/ln
# some build requirements removed to enable jpackage bootstrap. this is
@ -169,11 +166,18 @@ This package contains the APIs subproject of xml-commons.
%prep
%setup -q -n xerces-%{cvs_version}
%setup -q -T -a 3 -D -n xerces-%{cvs_version}
%setup -q -T -a 2 -D -n xerces-%{cvs_version}
%setup -T -D -n xerces-%{cvs_version}
%patch1 -p1
%patch2 -p1
%patch3 -p1 -b .parsing
# Copy the custom ant tasks into place
mkdir -p tools/org/apache/xerces/util
mkdir -p tools/bin
# Make sure upstream hasn't sneaked in any jars we don't know about
#find -name '*.class' -exec rm -f '{}' \;
#find -name '*.jar' -exec rm -f '{}' \;
sed -i 's/\r//' LICENSE README NOTICE build.sh
%build
## this uses the ant.jar provided by the xerces packages. Tough luck,
@ -183,7 +187,6 @@ export JAVA_HOME=%{_libdir}/jvm/java-1.5.0-gcj
export GC_MAXIMUM_HEAP_SIZE="134217728"
export CLASSPATH=$CLASSPATH:`build-classpath antlr-bootstrap`
sh build.sh jars
#ant tests test
%install
@ -212,9 +215,6 @@ ln -s %{_sysconfdir}/alternatives \
ln -s %{_sysconfdir}/alternatives \
$RPM_BUILD_ROOT%{_javadir}/xml-commons-resolver.jar
%clean
rm -rf $RPM_BUILD_ROOT
%post
/usr/sbin/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl %{_javadir}/%{name}.jar 23
/usr/sbin/update-alternatives --auto jaxp_parser_impl