Attachment 649449 Details for Bug 710815 – git format-patch - re-add javax.xml & system.bundle

[patch] git format-patch - re-add javax.xml & system.bundle

0001-Re-add-system.bundle-and-javax.xml-to-OSGi-required-.patch (text/plain), 4.44 KB, created by Gerard Ryan on 2012-11-22 00:06:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2012-11-22 00:06:46 UTC

Size: 4.44 KB

patch

obsolete

>From 06db66b2327180fad566377074d24d2b85df35f3 Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Wed, 21 Nov 2012 23:26:59 +0000
>Subject: [PATCH] Re-add system.bundle and javax.xml to OSGi required bundles:
> RHBZ #710815
>
>The relevant parts of RHBZ #710815 are from comments 52-68. This fixes
>various odd problems with using xerces-j2 in Eclipse. Without having
>javax.xml as a required bundle, then the org.w3c.dom package appears to
>be being loaded from somewhere else other than the expected
>xml-commons-apis. This leads to a java.lang.NoClassDefFoundError:
>org/w3c/dom/ElementTraversal.
>With javax.xml listed as a required bundle (without system.bundle), then
>various other problems arise. Re-adding both appears to resolve all
>issues.
>
>Note: This just undoes some of the changes made in commit 984153f.
>---
> xerces-j2-manifest.patch | 2 +-
> xerces-j2.spec           | 5 ++++-
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/xerces-j2-manifest.patch b/xerces-j2-manifest.patch
>index 64e0bca..4f6f331 100644
>--- a/xerces-j2-manifest.patch
>+++ b/xerces-j2-manifest.patch
>@@ -10,7 +10,7 @@
> +Bundle-Localization: plugin
> +Bundle-Version: @impl.version@
> +Bundle-Vendor: Apache Software Foundation
>-+Require-Bundle: org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
>++Require-Bundle: system.bundle,javax.xml;bundle-version="[1.3.4,2.0.0)",org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
> +Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version@",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerces.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@"
>  
>  Name: org/apache/xerces/impl/Version.class
>diff --git a/xerces-j2.spec b/xerces-j2.spec
>index 7edc7eb..eeb388e 100644
>--- a/xerces-j2.spec
>+++ b/xerces-j2.spec
>@@ -2,7 +2,7 @@
> 
> Name:          xerces-j2
> Version:       2.11.0
>-Release:       9%{?dist}
>+Release:       10%{?dist}
> Summary:       Java XML parser
> Group:         Development/Libraries
> License:       ASL 2.0
>@@ -206,6 +206,9 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
> %{_datadir}/%{name}
> 
> %changelog
>+* Wed Nov 21 2012 Gerard Ryan <galileo@fedoraproject.org> 2.11.0-10
>+- Re-add system.bundle and javax.xml to OSGi required bundles: RHBZ #710815
>+
> * Tue Sep 25 2012 Krzysztof Daniel <kdaniel@redhat.com> 2.11.0-9
> - Remove javax.xml from required bundles. They are provided by JVM.
> 
>-- 
>1.8.0
>

Actions: View | Diff

Attachments on bug 710815: 578135 | 578267 | 579422 | 649449 | 915358