Fixes for consumer.ds product configs and associated readme files

Change-Id: Ie24fe12a614b53c98a1c652a9be807e470eae76b

9 files changed, 32 insertions, 239 deletions

diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.edef.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.readme
index dee9e3cc7..dee9e3cc7 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.edef.txt
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.readme
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.readme
new file mode 100644
index 000000000..6ccadc9d7
--- /dev/null
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.readme
@@ -0,0 +1,13 @@
+The use of the TimeServiceConosumer.generic.etc.product relies on the presence of the 
+org.eclipse.ecf.provider.etcd discovery provider.  This bundle is available 
+here:  https://github.com/ECF/etcd-provider/tree/master/bundles/org.eclipse.ecf.provider.etcd
+
+It also assumes that an etcd server is running on localhost at port 2379.  The system properties
+in the product config are currently set to localhost and port 2379 via:
+
+-Decf.discovery.etcd.hostname=localhost
+-Decf.discovery.etcd.port=2379
+
+These can be changed in the product config or the generated launch config if desired to
+point at some other etcd server.
+
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jabsorb.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jabsorb.zeroconf.product
deleted file mode 100644
index bd32bbf96..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jabsorb.zeroconf.product
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService Jabsorb Consumer DS No Registry" uid="com.mycorp.examples.timeservice.consumer.jabsorb.ds.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-consoleLog -console
-      </programArgs>
-      <vmArgs>-Declipse.ignoreApp=true 
--Dosgi.noShutdown=true 
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.generic.server
--Decf.generic.server.port=3288
--Decf.generic.server.hostname=localhost
-      </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
-   </launcherArgs>
-
-   <windowImages/>
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="com.mycorp.examples.timeservice.async"/>
-      <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
-      <plugin id="javax.servlet"/>
-      <plugin id="org.apache.felix.gogo.command"/>
-      <plugin id="org.apache.felix.gogo.runtime"/>
-      <plugin id="org.apache.felix.gogo.shell"/>
-      <plugin id="org.cohorte.ecf.provider.jabsorb"/>
-      <plugin id="org.cohorte.remote.utilities"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.ecf"/>
-      <plugin id="org.eclipse.ecf.discovery"/>
-      <plugin id="org.eclipse.ecf.identity"/>
-      <plugin id="org.eclipse.ecf.osgi.services.distribution"/>
-      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
-      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
-      <plugin id="org.eclipse.ecf.provider"/>
-      <plugin id="org.eclipse.ecf.provider.jmdns"/>
-      <plugin id="org.eclipse.ecf.provider.remoteservice"/>
-      <plugin id="org.eclipse.ecf.remoteservice"/>
-      <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
-      <plugin id="org.eclipse.ecf.sharedobject"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.concurrent"/>
-      <plugin id="org.eclipse.equinox.console"/>
-      <plugin id="org.eclipse.equinox.ds"/>
-      <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.util"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
-      <plugin id="org.jabsorb.ng"/>
-   </plugins>
-
-   <configurations>
-      <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
-      <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
-      <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
-      <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" />
-      <plugin id="org.cohorte.ecf.provider.jabsorb" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.core.jobs" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.console" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.discovery" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.identity" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.osgi.services.distribution" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.provider.remoteservice" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.remoteservice" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.sharedobject" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />
-   </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.readme
new file mode 100644
index 000000000..deb42f05f
--- /dev/null
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.readme
@@ -0,0 +1,5 @@
+The use of the TimeServiceConsumer.xmlrpc.zeroconf.product relies on the presence of the 
+org.eclipse.ecf.provider.xmlrpc distribution provider  and it's dependencies.  This bundle is available 
+as described here:  https://wiki.eclipse.org/Distribution_Providers.
+
+
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeroconf.readme
new file mode 100644
index 000000000..fce25a9ef
--- /dev/null
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeroconf.readme
@@ -0,0 +1,14 @@
+The use of the TimeServiceHost.xmlrpc.zeroconf.product relies on the presence of the 
+org.eclipse.ecf.provider.jms.activemq distribution provider and it's dependencies.  This 
+bundle is available as described here:  
+
+https://wiki.eclipse.org/Distribution_Providers and it's dependencies.
+
+This provider also depends upon a JMS broker running at the location specified by the following
+system properties:
+
+-Decf.jms.activemq.tcp.manager.id=tcp://localhost:61616/timeservice
+-Decf.jms.activemq.tcp.manager.username=guest
+-Decf.jms.activemq.tcp.manager.password=password
+
+
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeronconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeronconf.product
index c42b00674..4750a063a 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeronconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeronconf.product
@@ -40,7 +40,6 @@
       <plugin id="org.eclipse.core.contenttype"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
       <plugin id="org.eclipse.ecf"/>
       <plugin id="org.eclipse.ecf.console"/>
       <plugin id="org.eclipse.ecf.datashare"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.edef.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.edef.product
deleted file mode 100644
index 2f3d389c0..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.edef.product
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService Consumer ROSGI Websockets DS No Registry EDEF Filediscovery" uid="com.mycorp.examples.timeservice.consumer.rosgi.ws.ds.edef.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-consoleLog -console
-      </programArgs>
-      <vmArgs>-Declipse.ignoreApp=true 
--Dosgi.noShutdown=true 
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.r_osgi.peer.ws
--Dch.ethz.iks.r_osgi.transport.http.listen=false
--Dch.ethz.iks.r_osgi.topic.filter=*
-      </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
-   </launcherArgs>
-
-   <windowImages/>
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="ch.ethz.iks.r_osgi.remote"/>
-      <plugin id="ch.ethz.iks.r_osgi.transport.http"/>
-      <plugin id="com.mycorp.examples.timeservice.async"/>
-      <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
-      <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws"/>
-      <plugin id="java_websocket"/>
-      <plugin id="org.apache.felix.gogo.command"/>
-      <plugin id="org.apache.felix.gogo.runtime"/>
-      <plugin id="org.apache.felix.gogo.shell"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.ecf"/>
-      <plugin id="org.eclipse.ecf.console"/>
-      <plugin id="org.eclipse.ecf.discovery"/>
-      <plugin id="org.eclipse.ecf.identity"/>
-      <plugin id="org.eclipse.ecf.osgi.services.distribution"/>
-      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
-      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
-      <plugin id="org.eclipse.ecf.provider"/>
-      <plugin id="org.eclipse.ecf.provider.r_osgi"/>
-      <plugin id="org.eclipse.ecf.remoteservice"/>
-      <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
-      <plugin id="org.eclipse.ecf.sharedobject"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.concurrent"/>
-      <plugin id="org.eclipse.equinox.console"/>
-      <plugin id="org.eclipse.equinox.ds"/>
-      <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.util"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
-      <plugin id="org.objectweb.asm"/>
-   </plugins>
-
-   <configurations>
-      <plugin id="ch.ethz.iks.r_osgi.remote" autoStart="true" startLevel="0" />
-      <plugin id="ch.ethz.iks.r_osgi.transport.http" autoStart="true" startLevel="0" />
-      <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
-      <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws" autoStart="false" startLevel="0" />
-      <plugin id="java_websocket" autoStart="true" startLevel="0" />
-      <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
-      <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
-      <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.core.jobs" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.console" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.discovery" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.identity" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.osgi.services.distribution" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.provider.r_osgi" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.remoteservice" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.ecf.sharedobject" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />
-   </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.wss.zeroconf.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.readme
index a19aab4dd..a19aab4dd 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.wss.zeroconf.txt
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.readme
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.ws.edef.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.ws.edef.txt
deleted file mode 100644
index 214a5868b..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.ws.edef.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-README for TimeServiceConsumer.rosgi.ds.wss.noreg.product
-
-The successful use of this provider for this example or 
-otherwise depends upon
-
-Having a built, packaged, and installed version of these two 
-additional bundles:
-   a) java_websocket
-   b) ch.ethz.iks.r_osgi.transport.http
-   
-The source for these two bundles is available via the ECF github
-Websockets repository located here:  https://github.com/ECF/Websockets
-Note that there is also a feature for building these two bundles via 
-eclipse via the feature project located in 
-features/org.eclipse.ecf.remoteservices.rosgi.ws.feature
-
-Using EDEF Filediscovery to trigger TimeServiceConsumer discovery
-
-When using the EDEF product configurations to trigger the discovery of the remote service, 
-it's necessary to manually start (via the console) the bundle with symbolic 
-ID=com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws
-
-To run the example within Eclipse
-
-1) Launch the TimeService host (e.g. TimeServiceHost.ds.generic.noreg.product, from Eclipse product configuration editor Overview tab)
-2) Launch the TimeService consumer (TimeServiceConsumer.ds.rosgi.wss.noreg.product, from Eclipse product configuration editor Overview tab)
-3) In the consumer console, start the filediscovery/EDEF bundle..e.g.:
-
-osgi> start com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws
-
-This should result in the discover and use of the TimeService...with output on the consumer similar to the following:
-
-osgi> start com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws
-osgi> Discovered ITimeService via DS
-Current time is: 1425262293841