1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
Description: This patch prevents a FTBFS because of missing implemented methods. This patch
can be dropped when a future release of bnd incorporates the changes from OSGi R6.
Author: Markus Koschany <apo@debian.org>
Forwarded: not-needed
--- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
@@ -393,16 +393,20 @@
}
@Override
- public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) {
+ public ServiceRegistration<?> registerService(String[] clazzes, Object service, Dictionary<String,?> properties) {
return null;
}
@Override
- public ServiceRegistration registerService(String clazz, Object service, Dictionary properties) {
+ public ServiceRegistration<?> registerService(String clazz, Object service, Dictionary<String,?> properties) {
return null;
}
- public ServiceRegistration registerService(Class<?> clazz, Object service, Dictionary<String, ?> properties) {
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ return null;
+ }
+
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, org.osgi.framework.ServiceFactory<S> factory, Dictionary<String, ? > properties) {
return null;
}
@@ -410,7 +414,7 @@
return null;
}
- public <S> Collection<ServiceReference> getServiceReferences(Class<S> clazz, String filter)
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter)
throws InvalidSyntaxException {
return null;
}
@@ -432,4 +436,8 @@
public <A> A adapt(Class<A> type) {
return null;
}
+
+ public <S> org.osgi.framework.ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+ return null;
+ }
}
--- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
@@ -52,6 +52,11 @@
}
@Override
+ public void init(FrameworkListener... listeners) throws BundleException {
+ init();
+ }
+
+ @Override
public FrameworkEvent waitForStop(long timeout) throws InterruptedException {
long deadline = System.currentTimeMillis() + timeout;
@@ -353,7 +358,12 @@
return null;
}
- public <S> ServiceRegistration registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ return null;
+ }
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, org.osgi.framework.ServiceFactory<S> factory, Dictionary<String, ? > properties) {
return null;
}
@@ -361,7 +371,7 @@
return null;
}
- public <S> Collection<ServiceReference> getServiceReferences(Class<S> clazz, String filter)
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter)
throws InvalidSyntaxException {
return null;
}
@@ -383,4 +393,8 @@
public <A> A adapt(Class<A> type) {
return null;
}
+
+ public <S> org.osgi.framework.ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
+ return null;
+ }
}
|
