969571
From 82b34a42835d82896c88bf3d3c7ea5f44fb76c39 Mon Sep 17 00:00:00 2001
695e14
From: Mikolaj Izdebski <mizdebsk@redhat.com>
695e14
Date: Fri, 21 Nov 2014 10:05:05 +0100
695e14
Subject: [PATCH 2/4] Port to Eclipse Luna OSGi
695e14
695e14
---
695e14
 xbean-bundleutils/pom.xml                                      |  8 +-------
695e14
 .../apache/xbean/osgi/bundle/util/DelegatingBundleContext.java | 10 ++++++++++
695e14
 2 files changed, 11 insertions(+), 7 deletions(-)
695e14
695e14
diff --git a/xbean-bundleutils/pom.xml b/xbean-bundleutils/pom.xml
695e14
index 015f97d..6dcad55 100644
695e14
--- a/xbean-bundleutils/pom.xml
695e14
+++ b/xbean-bundleutils/pom.xml
695e14
@@ -35,15 +35,9 @@
695e14
             <artifactId>slf4j-api</artifactId>
695e14
         </dependency>
695e14
         <dependency>
695e14
-            <groupId>org.osgi</groupId>
695e14
-            <artifactId>org.osgi.core</artifactId>
695e14
-            <version>4.3.1</version>
695e14
-            <scope>provided</scope>
695e14
-        </dependency>
695e14
-        <dependency>
695e14
             <groupId>org.eclipse</groupId>
695e14
             <artifactId>osgi</artifactId>
695e14
-            <version>3.6.0.v20100517</version>
695e14
+            <version>3.10.0-v20140606-1445</version>
695e14
             <scope>provided</scope>
695e14
         </dependency>
695e14
     </dependencies>
695e14
diff --git a/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java
695e14
index f4e876d..ea353ef 100644
695e14
--- a/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java
695e14
+++ b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java
695e14
@@ -31,7 +31,9 @@ import org.osgi.framework.BundleListener;
695e14
 import org.osgi.framework.Filter;
695e14
 import org.osgi.framework.FrameworkListener;
695e14
 import org.osgi.framework.InvalidSyntaxException;
695e14
+import org.osgi.framework.ServiceFactory;
695e14
 import org.osgi.framework.ServiceListener;
695e14
+import org.osgi.framework.ServiceObjects;
695e14
 import org.osgi.framework.ServiceReference;
695e14
 import org.osgi.framework.ServiceRegistration;
695e14
 
695e14
@@ -153,5 +155,13 @@ public class DelegatingBundleContext implements BundleContext {
695e14
     public Bundle getBundle(String location) {
695e14
         return bundleContext.getBundle(location);
695e14
     }
695e14
+
695e14
+    public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
695e14
+        return bundleContext.getServiceObjects(reference);
695e14
+    }
695e14
+
695e14
+    public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {
695e14
+        return bundleContext.registerService(clazz, factory, properties);
695e14
+    }
695e14
     
695e14
 }
695e14
-- 
969571
2.1.0
695e14