[felix-osgi-compendium/f17] Add getResourceURL method to XMLParserActivator

[Marek Goldmann]

commit 2590478182f4ba4739f4c71c2377cbe5c5ce6cef
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Tue Jul 3 20:04:45 2012 +0200

    Add getResourceURL method to XMLParserActivator

 ...urceURL-method-to-make-jbosgi-framework-h.patch |   28 ++++++++++++++++++++
 felix-osgi-compendium.spec                         |   11 +++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/0005-Add-getResourceURL-method-to-make-jbosgi-framework-h.patch b/0005-Add-getResourceURL-method-to-make-jbosgi-framework-h.patch
new file mode 100644
index 0000000..aab7f71
--- /dev/null
+++ b/0005-Add-getResourceURL-method-to-make-jbosgi-framework-h.patch
@@ -0,0 +1,28 @@
+From d9df4679129efdc654b44213fb33abd7ac042e81 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Tue, 3 Jul 2012 18:43:17 +0200
+Subject: [PATCH 5/5] Add getResourceURL method to make jbosgi-framework
+ happy...
+
+---
+ src/main/java/org/osgi/util/xml/XMLParserActivator.java |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/main/java/org/osgi/util/xml/XMLParserActivator.java b/src/main/java/org/osgi/util/xml/XMLParserActivator.java
+index 963c092..85f9f56 100644
+--- a/src/main/java/org/osgi/util/xml/XMLParserActivator.java
++++ b/src/main/java/org/osgi/util/xml/XMLParserActivator.java
+@@ -165,6 +165,10 @@ public class XMLParserActivator implements BundleActivator, ServiceFactory {
+ 				.getResource(DOMCLASSFILE)));
+ 	}
+ 
++	protected URL getResourceURL(Bundle parserBundle, String resname) {
++		return parserBundle.getResource(resname);
++	}
++
+ 	/**
+ 	 * This method has nothing to do as all active service registrations will
+ 	 * automatically get unregistered when the bundle stops.
+-- 
+1.7.10.4
+
diff --git a/felix-osgi-compendium.spec b/felix-osgi-compendium.spec
index 5cd4fa7..39718a1 100644
--- a/felix-osgi-compendium.spec
+++ b/felix-osgi-compendium.spec
@@ -7,7 +7,7 @@
 
 Name:    felix-osgi-compendium
 Version: 1.4.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Felix OSGi R4 Compendium Bundle
 
 Group:   Development/Libraries
@@ -19,6 +19,10 @@ Patch0:         0001-Fix-servlet-api-dependency.patch
 Patch1:         0002-Fix-compile-target.patch
 Patch2:         0003-Add-CM_LOCATION_CHANGED-property-to-ConfigurationEve.patch
 Patch3:         0004-Add-TARGET-property-to-ConfigurationPermission.patch
+# This is an ugly patch that adds getResourceURL method. This prevents jbosgi-framework
+# package from bundling osgi files. Once the jbosgi-framework will be updated
+# to a new version without the need for this patch, REMOVE it!
+Patch4:         0005-Add-getResourceURL-method-to-make-jbosgi-framework-h.patch
 
 BuildArch:      noarch
 
@@ -63,6 +67,8 @@ API documentation for %{name}.
 %patch2 -p1
 # add TARGET property
 %patch3 -p1
+# add getResourceURL method
+%patch4 -p1
 
 %build
 mvn-rpmbuild install javadoc:javadoc
@@ -96,6 +102,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jul 03 2012 Marek Goldmann <mgoldman at redhat.com> 1.4.0-11
+- Add getResourceURL method to XMLParserActivator
+
 * Fri Jun 15 2012 Marek Goldmann <mgoldman at redhat.com> 1.4.0-10
 - Add CM_LOCATION_CHANGED property to ConfigurationEvent
 - Add TARGET property to ConfigurationPermission