[felix-osgi-compendium/f17] - Add CM_LOCATION_CHANGED property to ConfigurationEvent - Add TARGET property to ConfigurationPermi

[Marek Goldmann]

commit 1953bf1b309dc655aa81df752687bb2428069674
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Fri Jun 15 11:29:12 2012 +0200

    - Add CM_LOCATION_CHANGED property to ConfigurationEvent
    - Add TARGET property to ConfigurationPermission

 ...TION_CHANGED-property-to-ConfigurationEve.patch |   37 ++++++++++++++++++++
 ...ARGET-property-to-ConfigurationPermission.patch |   31 ++++++++++++++++
 felix-osgi-compendium.spec                         |   13 ++++++-
 3 files changed, 80 insertions(+), 1 deletions(-)
---
diff --git a/0003-Add-CM_LOCATION_CHANGED-property-to-ConfigurationEve.patch b/0003-Add-CM_LOCATION_CHANGED-property-to-ConfigurationEve.patch
new file mode 100644
index 0000000..a3127c1
--- /dev/null
+++ b/0003-Add-CM_LOCATION_CHANGED-property-to-ConfigurationEve.patch
@@ -0,0 +1,37 @@
+From ec6885545fb6889ed9a5522647b9780a53c6fd93 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Fri, 15 Jun 2012 11:25:12 +0200
+Subject: [PATCH 3/3] Add CM_LOCATION_CHANGED property to ConfigurationEvent.
+
+---
+ .../java/org/osgi/service/cm/ConfigurationEvent.java     |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/main/java/org/osgi/service/cm/ConfigurationEvent.java b/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
+index f17007f..e98f3ac 100644
+--- a/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
++++ b/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
+@@ -79,6 +79,20 @@ public class ConfigurationEvent {
+ 	 */
+ 	public static final int			CM_DELETED	= 2;
+ 	/**
++	 * The location of a {@code Configuration} has been changed.
++	 * 
++	 * <p>
++	 * This {@code ConfigurationEvent} type that indicates that the location of
++	 * a {@code Configuration} object has been changed.
++	 * 
++	 * An event is fired when a call to
++	 * {@link Configuration#setBundleLocation(String)} successfully changes the
++	 * location.
++	 * 
++	 * @since 1.4
++	 */
++	public static final int			CM_LOCATION_CHANGED	= 3;
++	/**
+ 	 * Type of this event.
+ 	 * 
+ 	 * @see #getType
+-- 
+1.7.10.2
+
diff --git a/0004-Add-TARGET-property-to-ConfigurationPermission.patch b/0004-Add-TARGET-property-to-ConfigurationPermission.patch
new file mode 100644
index 0000000..7d3c064
--- /dev/null
+++ b/0004-Add-TARGET-property-to-ConfigurationPermission.patch
@@ -0,0 +1,31 @@
+From 88616a67fcdcf3bbc201ed1736b31a61da7f609e Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <goldmann at fedoraproject.org>
+Date: Fri, 15 Jun 2012 11:32:27 +0200
+Subject: [PATCH 4/4] Add TARGET property to ConfigurationPermission
+
+---
+ src/main/java/org/osgi/service/cm/ConfigurationPermission.java |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/main/java/org/osgi/service/cm/ConfigurationPermission.java b/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
+index 3af9088..7b8f3e3 100644
+--- a/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
++++ b/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
+@@ -40,6 +40,14 @@ public final class ConfigurationPermission extends BasicPermission {
+ 	public final static String	CONFIGURE			= "configure";
+ 
+ 	/**
++	 * The permission to be updated, that is, act as a Managed Service or
++	 * Managed Service Factory. The action string {@value #TARGET}.
++	 * 
++	 * @since 1.4
++	 */
++	public final static String		TARGET				= "target";
++
++	/**
+ 	 * Create a new ConfigurationPermission.
+ 	 * 
+ 	 * @param name Name must be &quot;*&quot;.
+-- 
+1.7.10.2
+
diff --git a/felix-osgi-compendium.spec b/felix-osgi-compendium.spec
index 955506b..5cd4fa7 100644
--- a/felix-osgi-compendium.spec
+++ b/felix-osgi-compendium.spec
@@ -7,7 +7,7 @@
 
 Name:    felix-osgi-compendium
 Version: 1.4.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Felix OSGi R4 Compendium Bundle
 
 Group:   Development/Libraries
@@ -17,6 +17,9 @@ Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
 
 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
+
 BuildArch:      noarch
 
 BuildRequires: java-devel >= 1:1.6.0
@@ -56,6 +59,10 @@ API documentation for %{name}.
 %patch0 -p1
 # fix compile source/target
 %patch1 -p1
+# add CM_LOCATION_CHANGED property
+%patch2 -p1
+# add TARGET property
+%patch3 -p1
 
 %build
 mvn-rpmbuild install javadoc:javadoc
@@ -89,6 +96,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* 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
+
 * Wed Mar 21 2012 Alexander Kurtakov <akurtako at redhat.com> 1.4.0-9
 - Move to tomcat 7.x servlet api.