diff options
author | slewis | 2016-11-28 04:48:32 +0000 |
---|---|---|
committer | slewis | 2016-11-28 04:48:32 +0000 |
commit | c6d4e4ce398e2461c6c7e433b198c09e603c38f4 (patch) | |
tree | 88995b5866a038f3baada1e9dc5304a797ba7d3f | |
parent | 0f1e8f56be302d99d432aeef01cb66dbbad7ec00 (diff) | |
download | org.eclipse.ecf-c6d4e4ce398e2461c6c7e433b198c09e603c38f4.tar.gz org.eclipse.ecf-c6d4e4ce398e2461c6c7e433b198c09e603c38f4.tar.xz org.eclipse.ecf-c6d4e4ce398e2461c6c7e433b198c09e603c38f4.zip |
Fixes for consumer.ds product configs and associated readme files
Change-Id: Ie24fe12a614b53c98a1c652a9be807e470eae76b
26 files changed, 525 insertions, 76 deletions
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.edef.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.edef.product new file mode 100644 index 000000000..41f1dbd7f --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.edef.product @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="MyCorp Remote TimeService Generic Consumer DS EDEF No Registry" uid="com.mycorp.examples.timeservice.consumer.generic.ds.edef.async.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="com.mycorp.examples.timeservice.consumer.filediscovery"/> + <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rest"/> + <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.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"/> + </plugins> + + <configurations> + <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery" autoStart="false" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rest" autoStart="false" 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.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/readme.TimeServiceConsumer.edef.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/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.async/launch/TimeServiceConsumer.generic.edef.readme diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jabsorb.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product index 16532b891..a11953810 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jabsorb.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="MyCorp Remote TimeService Jabsorb" uid="com.mycorp.examples.timeservice.host.jabsorb.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="MyCorp Remote TimeService Generic Consumer Etcd Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.etcd.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -10,11 +10,10 @@ <programArgs>-consoleLog -console </programArgs> <vmArgs>-Declipse.ignoreApp=true --Dosgi.noShutdown=true +-Dosgi.noShutdown=true -DverboseRemoteServiceAdmin=true --Dservice.exported.configs=ecf.jabsorb.server --Dorg.eclipse.equinox.http.jetty.http.port=8181 --Decf.exported.async.interfaces=* +-Decf.discovery.etcd.hostname=localhost +-Decf.discovery.etcd.port=2379 </vmArgs> <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts </vmArgsMac> @@ -34,15 +33,11 @@ </vm> <plugins> - <plugin id="com.mycorp.examples.timeservice"/> <plugin id="com.mycorp.examples.timeservice.async"/> - <plugin id="com.mycorp.examples.timeservice.host"/> - <plugin id="javax.servlet"/> + <plugin id="com.mycorp.examples.timeservice.consumer.ds.async"/> <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.console"/> @@ -52,56 +47,54 @@ <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.etcd"/> <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.ecf.ssl" fragment="true"/> <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.http.jetty"/> - <plugin id="org.eclipse.equinox.http.servlet"/> <plugin id="org.eclipse.equinox.util"/> - <plugin id="org.eclipse.jetty.http"/> - <plugin id="org.eclipse.jetty.io"/> - <plugin id="org.eclipse.jetty.security"/> - <plugin id="org.eclipse.jetty.server"/> - <plugin id="org.eclipse.jetty.servlet"/> - <plugin id="org.eclipse.jetty.util"/> <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> - <plugin id="org.jabsorb.ng"/> + <plugin id="org.eclipse.osgi.util"/> + <plugin id="org.json"/> </plugins> <configurations> - <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" /> - <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="6" /> + <plugin id="com.mycorp.examples.timeservice.async" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.consumer.ds.async" 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="5" /> - <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="5" /> + <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.jmdns" autoStart="true" startLevel="0" /> - <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.provider.etcd" 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.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="2" /> + <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.http.jetty" 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" /> + <plugin id="org.eclipse.osgi.util" autoStart="true" startLevel="0" /> </configurations> </product> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.readme new file mode 100644 index 000000000..6ccadc9d7 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/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.async/launch/TimeServiceConsumer.jgroups.zeroconf.product index bd32bbf96..90ec0a8c5 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jabsorb.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jgroups.zeroconf.product @@ -1,7 +1,7 @@ <?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"> +<product name="MyCorp Remote TimeService JGroups Consumer DS No Registry" uid="com.mycorp.examples.timeservice.consumer.jgroups.ds.async.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -12,9 +12,7 @@ <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 +-Djava.net.preferIPv4Stack=true </vmArgs> <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts </vmArgsMac> @@ -35,20 +33,19 @@ <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.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.jgroups"/> <plugin id="org.eclipse.ecf.provider.jmdns"/> <plugin id="org.eclipse.ecf.provider.remoteservice"/> <plugin id="org.eclipse.ecf.remoteservice"/> @@ -63,7 +60,7 @@ <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> - <plugin id="org.jabsorb.ng"/> + <plugin id="org.jgroups"/> </plugins> <configurations> @@ -71,7 +68,6 @@ <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" /> @@ -81,6 +77,7 @@ <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.jgroups" 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" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jgroups.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jgroups.zeroconf.readme new file mode 100644 index 000000000..deb42f05f --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/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.async/launch/TimeServiceConsumer.jms.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeroconf.readme new file mode 100644 index 000000000..fce25a9ef --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/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.async/launch/TimeServiceConsumer.jms.zeronconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeronconf.product new file mode 100644 index 000000000..41b673ced --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeronconf.product @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="MyCorp Remote TimeService JMS/ActiveMQ Consumer DS" uid="com.mycorp.examples.timeservice.consumer.jms.activemq.ds.async.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 + </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.jms"/> + <plugin id="javax.xml"/> + <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.contenttype"/> + <plugin id="org.eclipse.core.jobs"/> + <plugin id="org.eclipse.core.runtime"/> + <plugin id="org.eclipse.ecf"/> + <plugin id="org.eclipse.ecf.console"/> + <plugin id="org.eclipse.ecf.datashare"/> + <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.datashare"/> + <plugin id="org.eclipse.ecf.provider.jmdns"/> + <plugin id="org.eclipse.ecf.provider.jms"/> + <plugin id="org.eclipse.ecf.provider.jms.activemq"/> + <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.app"/> + <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.preferences"/> + <plugin id="org.eclipse.equinox.registry"/> + <plugin id="org.eclipse.equinox.util"/> + <plugin id="org.eclipse.osgi"/> + <plugin id="org.eclipse.osgi.services"/> + <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + </plugins> + + <configurations> + <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" /> + <plugin id="javax.xml" 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.contenttype" 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.jms" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.provider.jms.activemq" 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.preferences" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.registry" 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.rosgi.ws.edef.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product index 2f3d389c0..8313ca1e7 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.edef.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product @@ -1,7 +1,7 @@ <?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"> +<product name="MyCorp Remote TimeService Consumer ROSGI Websockets DS No Registry" uid="com.mycorp.examples.timeservice.consumer.rosgi.ws.ds.async.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -37,7 +37,6 @@ <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"/> @@ -51,6 +50,7 @@ <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.r_osgi"/> <plugin id="org.eclipse.ecf.remoteservice"/> <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/> @@ -71,7 +71,6 @@ <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" /> @@ -85,6 +84,7 @@ <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.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" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product new file mode 100644 index 000000000..92b669016 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="MyCorp Remote TimeService Consumer ROSGI Websockets Secure DS No Registry" uid="com.mycorp.examples.timeservice.consumer.rosgi.wss.ds.async.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.wss +-Dch.ethz.iks.r_osgi.transport.http.listen=false +-Djavax.net.ssl.keyStore=security/server.ks +-Djavax.net.ssl.keyStorePassword=server +-Djavax.net.ssl.trustStore=security/server.ks +-Djavax.net.debug=all +-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="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.jmdns"/> + <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" version="3.3.1"/> + </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="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.jmdns" 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" /> + <plugin id="org.objectweb.asm" 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.async/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.async/launch/TimeServiceConsumer.rosgi.wss.zeroconf.readme diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.readme new file mode 100644 index 000000000..f31d01749 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.readme @@ -0,0 +1,5 @@ +The use of the TimeServiceConsumer.jgroups.zeroconf.product relies on the presence of the +org.eclipse.ecf.provider.jgroups 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.generic.edef.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.readme new file mode 100644 index 000000000..dee9e3cc7 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.readme @@ -0,0 +1,18 @@ +README for TimeServiceConsumer.ds.*.edef product configurations + +For all the EDEF product configurations (those with .edef. in their name, for example TimeServiceConsumer.ds.generic.edef.product) +to actually 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. + +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 (e.g. TimeServiceConsumer.ds.generic.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 + +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 +osgi> Discovered ITimeService via DS +Current time is: 1425262293841 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.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.wss.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.readme new file mode 100644 index 000000000..a19aab4dd --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.readme @@ -0,0 +1,47 @@ +README for TimeServiceConsumer.rosgi.ds.wss.noreg.product + +This product config uses the websockets with SSL rosgi provider. + +The successful use of this provider for this example or +otherwise depends upon two things: + +1) 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 + +2) For the wss (Secure Websockets) provider it's also necessary to +configure an SSLContext prior to running/using the provider. + +As part of the VM arguments in the product config are these: + +-Djavax.net.ssl.keyStore=security/server.ks +-Djavax.net.ssl.keyStorePassword=server +-Djavax.net.ssl.trustStore=security/server.ks +-Djavax.net.debug=all + +These arguments specify the location of a java keystore/trustStore, a password for +runtime access to that keystore and the javax.net.debug=all turns on full debugging +to console of the SSLContext configuration. + +The referenced keystore must be present at the given path, have an appropriate certificate, +and the password must be correct for accessing that keystore in order for these example +product configs to work when Run/Debugged. + +Note that when Eclipse generates launch configs from product configs the working directory used is +the Eclipse working directory (e.g. c:\eclipsehome), meaning that the keyStore/trustStore paths given +above would refer to a file location of (e.g.): + +c:\eclipsehome\security\server.ks + + + + + + 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 diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.readme b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.readme new file mode 100644 index 000000000..7acf18281 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.readme @@ -0,0 +1,13 @@ +The use of the TimeServiceHost.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.host/launch/TimeServiceHost.jgroups.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.readme new file mode 100644 index 000000000..36d09c6fc --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.readme @@ -0,0 +1,13 @@ +The use of the TimeServiceHost.jgroups.zeroconf.product relies on the presence of the +org.eclipse.ecf.provider.jgroups distribution provider. This bundle is available +as described here: https://wiki.eclipse.org/Distribution_Providers + +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.host/launch/TimeServiceHost.jms.activemq.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product index 6027b8dd5..6027b8dd5 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.readme new file mode 100644 index 000000000..fce25a9ef --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.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.host/launch/readme.TimeServiceHost.rosgi.ws.zeroconf.txt b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.readme index f4fc09626..f4fc09626 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.ws.zeroconf.txt +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.readme diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.wss.zeronconf.txt b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeronconf.readme index bc0954eb6..bc0954eb6 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.wss.zeronconf.txt +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeronconf.readme diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.readme new file mode 100644 index 000000000..aa17f495c --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.readme @@ -0,0 +1,5 @@ +The use of the TimeServiceHost.xmlrpc.zeroconf.product relies on the presence of the +org.eclipse.ecf.provider.xmlrpc distribution provider. This bundle is available +as described here: https://wiki.eclipse.org/Distribution_Providers and it's dependencies. + + |