Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2014-02-25 19:29:18 +0000
committerslewis2014-02-25 19:29:18 +0000
commit5b9424d306984d6773829d2b715aac26a367dbe6 (patch)
treecc1be34bd27c6f302ec5b0815acc96ae6c28a772 /examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host
parent48865ea34fb8e4ba10582721e6330050b975d830 (diff)
parenta142dff7d9eae3a312a6fa3e07d789ff837eb349 (diff)
downloadorg.eclipse.ecf-5b9424d306984d6773829d2b715aac26a367dbe6.tar.gz
org.eclipse.ecf-5b9424d306984d6773829d2b715aac26a367dbe6.tar.xz
org.eclipse.ecf-5b9424d306984d6773829d2b715aac26a367dbe6.zip
Merge remote-tracking branch 'origin/master' into rfc1.1
Diffstat (limited to 'examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host')
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product1
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java2
2 files changed, 3 insertions, 0 deletions
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product
index 5376fe1ff..eabd26acf 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product
@@ -48,6 +48,7 @@
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.concurrent"/>
<plugin id="org.eclipse.equinox.console"/>
+ <plugin id="org.eclipse.equinox.event"/>
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.osgi"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java
index 524de1013..0fe44903d 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/src/org/eclipse/ecf/internal/examples/remoteservices/hello/host/HelloHostApplication.java
@@ -15,6 +15,7 @@ import java.util.Hashtable;
import java.util.Properties;
import org.eclipse.ecf.examples.remoteservices.hello.IHello;
+import org.eclipse.ecf.examples.remoteservices.hello.IHelloAsync;
import org.eclipse.ecf.examples.remoteservices.hello.impl.Hello;
import org.eclipse.ecf.osgi.services.distribution.IDistributionConstants;
import org.eclipse.equinox.app.IApplication;
@@ -72,6 +73,7 @@ public class HelloHostApplication implements IApplication,
props.put(
IDistributionConstants.SERVICE_EXPORTED_CONTAINER_FACTORY_ARGUMENTS,
containerId);
+ props.put("ecf.exported.async.objectClass",new String[] { IHelloAsync.class.getName() });
// register remote service
helloRegistration = bundleContext.registerService(
IHello.class.getName(), new Hello(), props);

Back to the top