diff options
author | slewis | 2018-03-11 03:10:22 +0000 |
---|---|---|
committer | slewis | 2018-03-11 03:10:22 +0000 |
commit | 0c841087a4c835006de048cac73554af36a40ee4 (patch) | |
tree | ec561b8ae42196f0236abc051d6ed6c697cae0f4 /providers/bundles | |
parent | 1aa9691b99d3f0deca7b9ea7d4ba976ef4f7276e (diff) | |
download | org.eclipse.ecf-0c841087a4c835006de048cac73554af36a40ee4.tar.gz org.eclipse.ecf-0c841087a4c835006de048cac73554af36a40ee4.tar.xz org.eclipse.ecf-0c841087a4c835006de048cac73554af36a40ee4.zip |
Dependency fixes for bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=532205
Change-Id: I0000000000000000000000000000000000000000
Diffstat (limited to 'providers/bundles')
5 files changed, 4 insertions, 5 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF index a6a3ab8e9..21adbe54a 100644 --- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.provider.r_osgi;singleton:=true Automatic-Module-Name: org.eclipse.ecf.provider.r_osgi -Bundle-Version: 3.5.700.qualifier +Bundle-Version: 3.6.0.qualifier Import-Package: ch.ethz.iks.r_osgi;version="[1.0.1,2.0.0)", org.eclipse.ecf.core.util.reflection, org.eclipse.ecf.remoteservice.asyncproxy;version="[1.0.0,3.0.0)", diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml b/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml index 2e9f4caa5..d5eb985cf 100644 --- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml +++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.provider.r_osgi</artifactId> - <version>3.5.700-SNAPSHOT</version> + <version>3.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiContainerInstantiator.java b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiContainerInstantiator.java index de54fe980..5f147932a 100644 --- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiContainerInstantiator.java +++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/R_OSGiContainerInstantiator.java @@ -31,7 +31,7 @@ import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter; */ public final class R_OSGiContainerInstantiator implements IContainerInstantiator, IRemoteServiceContainerInstantiator { - public static final String[] r_OSGiIntents = {"passByValue", "exactlyOnce", "ordered",}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + public static final String[] r_OSGiIntents = {"osgi.basic", "osgi.async", "passByValue", "exactlyOnce", "ordered",}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ public static R_OSGiID createR_OSGiID(Namespace namespace, String uriStr) { return (R_OSGiID) IDFactory.getDefault().createID(namespace, uriStr); diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF index 13aa0e386..6c6898b83 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF @@ -22,7 +22,6 @@ Import-Package: org.eclipse.core.runtime.jobs, org.eclipse.osgi.framework.eventmgr;version="[1.0.0,2.0.0)", org.osgi.framework;version="[1.0.0,2.0.0)", org.osgi.service.log;version="[1.0.0,2.0.0)", - org.osgi.util.promise, org.osgi.util.tracker;version="[1.3.2,2.0.0)" Provide-Capability: osgi.remoteserviceadmin.distribution; configs:List<String>="ecf.generic.server,ecf.generic.client,ecf.generic.ssl.server,ecf.generic.ssl.client"; version:Version=1.1 Bundle-ActivationPolicy: lazy diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java index d27545aab..99cd49b49 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java @@ -1469,7 +1469,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer Class returnType = method.getReturnType(); // provider must expose osgi.async property and must be async return type if (reg.getProperty(Constants.OSGI_ASYNC_INTENT) != null && AsyncReturnUtil.isAsyncType(returnType)) - return AsyncReturnUtil.asyncReturn(result, returnType, call.getTimeout()); + return AsyncReturnUtil.convertAsyncToReturn(result, returnType, call.getTimeout()); } return result; } |