Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF2
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml2
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/CodeAnalyzer.java2
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ProxyGenerator.java1
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/messages/DeliverServiceMessage.java20
5 files changed, 15 insertions, 12 deletions
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
index acd16d57f..76bce6a5c 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: ch.ethz.iks.r_osgi.remote
Automatic-Module-Name: ch.ethz.iks.r_osgi.remote
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.200.qualifier
Bundle-Vendor: %plugin.provider
Import-Package: org.eclipse.ecf.remoteservice;version="7.3.0",
org.eclipse.ecf.remoteservice.asyncproxy;version="[1.0.0,3.0.0)",
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml
index 38709e0f6..f9aa110bf 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>ch.ethz.iks.r_osgi.remote</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/CodeAnalyzer.java b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/CodeAnalyzer.java
index 541ccf614..61adbe00b 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/CodeAnalyzer.java
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/CodeAnalyzer.java
@@ -223,7 +223,7 @@ final class CodeAnalyzer extends ClassVisitor {
importDeclaration.append(pi[i]);
final Object v = importsMap.get(pi[i]);
if (v != null) {
- importDeclaration.append("; "); //$NON-NLS-1$
+ importDeclaration.append(";"); //$NON-NLS-1$
importDeclaration.append(v);
}
if (i < pi.length - 1) {
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ProxyGenerator.java b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ProxyGenerator.java
index 4ee905bb1..c23570eac 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ProxyGenerator.java
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ProxyGenerator.java
@@ -216,6 +216,7 @@ class ProxyGenerator extends ClassVisitor implements Opcodes {
final Manifest mf = new Manifest();
final Attributes attr = mf.getMainAttributes();
attr.putValue("Manifest-Version", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$
+ attr.putValue("Bundle-ManifestVersion","2"); //$NON-NLS-1$ //$NON-NLS-2$
attr.putValue("Created-By", "R-OSGi Proxy Generator"); //$NON-NLS-1$ //$NON-NLS-2$
attr.putValue("Bundle-Activator", className); //$NON-NLS-1$
attr.putValue("Bundle-Classpath", "."); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/messages/DeliverServiceMessage.java b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/messages/DeliverServiceMessage.java
index 8e541cf90..483947175 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/messages/DeliverServiceMessage.java
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/messages/DeliverServiceMessage.java
@@ -154,15 +154,18 @@ public final class DeliverServiceMessage extends RemoteOSGiMessage {
}
// generate option imports from injections
- final Set set = new HashSet();
-
// no need to add imports twice
- final String[] imp = (imports != null ? StringUtils.stringToArray(imports, ",") : new String[0]);
- for (int i = 0; i < imp.length; i++) {
- String string = imp[i].trim();
- set.add(string);
- }
-
+ final Set set = new HashSet();
+ if (imports != null) {
+ String[] imps = StringUtils.stringToArray(imports, ",");
+ if (imps != null)
+ for(String imp: imps) {
+ // take off version
+ String[] opts = imp.split(";");
+ if (opts != null && opts.length > 1)
+ set.add(opts[0].trim());
+ }
+ }
for (final Iterator itr = injections.keySet().iterator(); itr.hasNext();) {
final String className = (String) itr.next();
final int lastIndexOf = className.lastIndexOf("/");
@@ -173,7 +176,6 @@ public final class DeliverServiceMessage extends RemoteOSGiMessage {
+ pkgName + ";resolution:=optional";
}
}
-
}
/**

Back to the top