added support for edef hello consumer example

4 files changed, 52 insertions, 79 deletions

diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/OSGI-INF/remote-service/hello-service-description-generic.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/OSGI-INF/remote-service/hello-service-description-generic.xml
deleted file mode 100644
index b46e9e1e4..000000000
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/OSGI-INF/remote-service/hello-service-description-generic.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-  <service-descriptions xmlns="http://www.osgi.org/xmlns/sd/v1.0.0">
-    <service-description>
-      <provide
-interface="org.eclipse.ecf.examples.remoteservices.hello.IHello"/>
-      <property
-name="ecf.sp.cid">ecftcp://localhost:3787/server</property>
-      <property name="ecf.sp.cns">org.eclipse.ecf.core.identity.StringID</property>
-      <property name="ecf.sp.ect">ecf.generic.server</property>
-   </service-description>
-</service-descriptions>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties
index f2d5daa49..83fd982e4 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                about.html,\
                bundle.properties,\
                plugin.xml,\
-               OSGI-INF/,\
                products/
 src.includes = about.html,\
                bundle.properties,\
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (localfile,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (localfile,generic).product
index df3b9072b..b335ebb79 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (localfile,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (localfile,generic).product
@@ -1,51 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="Generic Hello Consumer" uid="org.eclipse.ecf.examples.remoteservices.generichelloconsumer.local" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.0.0" useFeatures="false" includeLaunchers="false">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-console -consoleLog -containerType ecf.generic.client</programArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.ecf"/>
-      <plugin id="org.eclipse.ecf.discovery"/>
-      <plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
-      <plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer"/>
-      <plugin id="org.eclipse.ecf.identity"/>
-      <plugin id="org.eclipse.ecf.osgi.services.discovery"/>
-      <plugin id="org.eclipse.ecf.osgi.services.discovery.local"/>
-      <plugin id="org.eclipse.ecf.osgi.services.distribution"/>
-      <plugin id="org.eclipse.ecf.provider"/>
-      <plugin id="org.eclipse.ecf.provider.localdiscovery"/>
-      <plugin id="org.eclipse.ecf.provider.remoteservice"/>
-      <plugin id="org.eclipse.ecf.remoteservice"/>
-      <plugin id="org.eclipse.ecf.sharedobject"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.concurrent"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.services"/>
-   </plugins>
-
-
-</product>
+<?xml version="1.0" encoding="UTF-8"?>

+<?pde version="3.5"?>

+

+<product name="Generic Hello Consumer" uid="org.eclipse.ecf.examples.remoteservices.generichelloconsumer.local" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.0.0" useFeatures="false" includeLaunchers="false">

+

+   <configIni use="default">

+   </configIni>

+

+   <launcherArgs>

+      <programArgs>-console -consoleLog -containerType ecf.generic.client</programArgs>

+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>

+   </launcherArgs>

+

+   <launcher>

+      <solaris/>

+      <win useIco="false">

+         <bmp/>

+      </win>

+   </launcher>

+

+   <vm>

+   </vm>

+

+   <plugins>

+      <plugin id="org.eclipse.core.contenttype"/>

+      <plugin id="org.eclipse.core.jobs"/>

+      <plugin id="org.eclipse.core.runtime"/>

+      <plugin id="org.eclipse.ecf"/>

+      <plugin id="org.eclipse.ecf.discovery"/>

+      <plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>

+      <plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer"/>

+      <plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer.edef"/>

+      <plugin id="org.eclipse.ecf.identity"/>

+      <plugin id="org.eclipse.ecf.osgi.services.discovery"/>

+      <plugin id="org.eclipse.ecf.osgi.services.distribution"/>

+      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>

+      <plugin id="org.eclipse.ecf.provider"/>

+      <plugin id="org.eclipse.ecf.provider.remoteservice"/>

+      <plugin id="org.eclipse.ecf.remoteservice"/>

+      <plugin id="org.eclipse.ecf.sharedobject"/>

+      <plugin id="org.eclipse.equinox.app"/>

+      <plugin id="org.eclipse.equinox.common"/>

+      <plugin id="org.eclipse.equinox.concurrent"/>

+      <plugin id="org.eclipse.equinox.preferences"/>

+      <plugin id="org.eclipse.equinox.registry"/>

+      <plugin id="org.eclipse.osgi"/>

+      <plugin id="org.eclipse.osgi.services"/>

+      <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>

+   </plugins>

+

+

+</product>

diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/HelloConsumerApplication.java b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/HelloConsumerApplication.java
index 6041f6ed8..8dcb26e63 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/HelloConsumerApplication.java
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/HelloConsumerApplication.java
@@ -24,7 +24,6 @@ import org.eclipse.ecf.remoteservice.RemoteServiceHelper;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.equinox.concurrent.future.IFuture;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;
@@ -67,26 +66,11 @@ public class HelloConsumerApplication implements IApplication,
 				createRemoteFilter(), this);
 		helloServiceTracker.open(true);
 
-		startLocalDiscoveryIfPresent();
-		
 		waitForDone();
 
 		return IApplication.EXIT_OK;
 	}
 
-	private void startLocalDiscoveryIfPresent() {
-		Bundle[] bundles = bundleContext.getBundles();
-		for(int i=0; i < bundles.length; i++) {
-			if (bundles[i].getSymbolicName().equals("org.eclipse.ecf.osgi.services.discovery.local")) {
-				try {
-					bundles[i].start();
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
 	private Filter createRemoteFilter() throws InvalidSyntaxException {
 		// This filter looks for IHello instances that have the 
 		// 'service.imported' property set, as specified by OSGi 4.2