diff options
35 files changed, 236 insertions, 171 deletions
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeroconf.product new file mode 100644 index 000000000..d8580b157 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeroconf.product @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="TimeServiceConsumer JMS/ActiveMQ Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.jms.activemq.ds.product" version="1.1.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> + <win useIco="false"> + <bmp/> + </win> + </launcher> + + <vm> + </vm> + + <plugins> + <plugin id="com.mycorp.examples.timeservice.async"/> + <plugin id="com.mycorp.examples.timeservice.consumer.ds.async"/> + <plugin id="javax.jms"/> + <plugin id="org.apache.felix.gogo.command"/> + <plugin id="org.apache.felix.gogo.runtime"/> + <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> + <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.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.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.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.eclipse.osgi.util"/> + </plugins> + + <configurations> + <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.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.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/TimeServiceConsumer.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product index 34c732738..488bc235c 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceConsumer Generic Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceConsumer Generic Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product index e2a664a12..fe59b1567 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceConsumer Generic EDEF Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.ds.edef.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceConsumer Generic EDEF Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.ds.edef.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -38,9 +38,9 @@ <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <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"/> @@ -60,17 +60,16 @@ <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> </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="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" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product index 9d5d9684a..0d5a382f4 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceConsumer Generic Etcd Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.etcd.java8.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceConsumer Generic Etcd Discovery" uid="com.mycorp.examples.timeservice.consumer.generic.etcd.java8.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -16,7 +16,7 @@ -Decf.generic.server.java8.port=3288 -Decf.generic.server.java8.hostname=localhost -Decf.exported.async.interfaces=* --Decf.discovery.etcd.hostname=disco.ecf-project.org +-Decf.discovery.etcd.hostname=127.0.0.1 </vmArgs> <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts </vmArgsMac> @@ -25,7 +25,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -37,13 +36,13 @@ <plugins> <plugin id="com.mycorp.examples.timeservice.async"/> - <plugin id="com.mycorp.examples.timeservice.consumer.ds.async"/> + <plugin id="com.mycorp.examples.timeservice.consumer.ds"/> <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <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"/> @@ -52,7 +51,6 @@ <plugin id="org.eclipse.ecf.provider"/> <plugin id="org.eclipse.ecf.provider.etcd"/> <plugin id="org.eclipse.ecf.provider.remoteservice"/> - <plugin id="org.eclipse.ecf.provider.remoteservice.java8"/> <plugin id="org.eclipse.ecf.remoteservice"/> <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/> <plugin id="org.eclipse.ecf.sharedobject"/> @@ -65,27 +63,24 @@ <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> <plugin id="org.json"/> </plugins> <configurations> <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.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.etcd" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf.provider.remoteservice" autoStart="true" startLevel="0" /> - <plugin id="org.eclipse.ecf.provider.remoteservice.java8" 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" /> 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 index 6ccadc9d7..facc696ae 100644 --- 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 @@ -2,10 +2,10 @@ The use of the TimeServiceConosumer.generic.etc.product relies on the presence o 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: +It also assumes that an etcd server is running on 127.0.0.1 at port 2379. The system properties +in the product config are currently set to `127.0.0.1 (localhost) and port 2379 via: --Decf.discovery.etcd.hostname=localhost +-Decf.discovery.etcd.hostname=127.0.0.1 -Decf.discovery.etcd.port=2379 These can be changed in the product config or the generated launch config if desired to diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeronconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.product index 504631bba..19d5dcdd1 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeronconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceConsumer JGroups Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.jgroups.ds.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceConsumer JGroups Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.jgroups.ds.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -21,7 +21,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -36,9 +35,9 @@ <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <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"/> @@ -60,6 +59,7 @@ <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> <plugin id="org.jgroups"/> </plugins> @@ -70,7 +70,6 @@ <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" /> 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 index deb42f05f..79e107e52 100644 --- 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 @@ -1,5 +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 +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.jms.zeronconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeroconf.product index 34ed149db..cef331ce6 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.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceConsumer JMS/ActiveMQ Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.jms.activemq.ds.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceConsumer JMS/ActiveMQ Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.jms.activemq.ds.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -20,7 +20,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -33,23 +32,19 @@ <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.apache.felix.scr"/> <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"/> @@ -57,30 +52,25 @@ <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"/> + <plugin id="org.eclipse.osgi.util"/> </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" /> @@ -99,8 +89,6 @@ <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" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product index a780a4294..0c5534681 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceConsumer ROSGI Websockets Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.rosgi.ws.ds.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceConsumer ROSGI Websockets Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.rosgi.ws.ds.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -23,7 +23,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -37,10 +36,10 @@ <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.apache.felix.scr"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.console"/> @@ -64,14 +63,16 @@ <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> + <plugin id="org.java_websocket"/> <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.async" 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" /> @@ -92,7 +93,7 @@ <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.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" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product index a29f7ef86..97d55f90e 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceConsumer ROSGI Secure Websockets Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.rosgi.wss.ds.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceConsumer ROSGI Secure Websockets Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.rosgi.wss.ds.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -27,7 +27,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -41,10 +40,10 @@ <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.apache.felix.scr"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.console"/> @@ -68,14 +67,16 @@ <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"/> + <plugin id="org.eclipse.osgi.util"/> + <plugin id="org.java_websocket"/> + <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.async" 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" /> @@ -96,13 +97,12 @@ <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.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" /> - <plugin id="org.objectweb.asm" autoStart="true" startLevel="0" /> </configurations> </product> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product index 3fdf1df85..e1bf377fc 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceConsumer ROSGI Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.rosgi.ds.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceConsumer ROSGI Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.rosgi.ds.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -22,7 +22,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -38,9 +37,9 @@ <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <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"/> @@ -61,7 +60,8 @@ <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"/> + <plugin id="org.eclipse.osgi.util"/> + <plugin id="org.objectweb.asm"/> </plugins> <configurations> @@ -72,7 +72,6 @@ <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" /> @@ -93,7 +92,6 @@ <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/TimeServiceConsumer.xmlrpc.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product index ca07841bc..9a087bbea 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceConsumer XmlRpc Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.xmlrpc.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceConsumer XmlRpc Zeroconf Discovery" uid="com.mycorp.examples.timeservice.consumer.xmlrpc.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -19,7 +19,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -36,9 +35,9 @@ <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <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"/> @@ -58,6 +57,7 @@ <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> </plugins> <configurations> @@ -67,7 +67,6 @@ <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" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product index f21bb2bfa..ffa40729a 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product @@ -40,7 +40,6 @@ <plugin id="org.apache.felix.scr"/> <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"/> @@ -71,7 +70,6 @@ <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" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product index 231bd54cd..6bc3b85ea 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceHost Generic Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.generic.noreg.java8.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceHost Generic Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.generic.noreg.java8.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product index 8f547c10a..f5366e3d7 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product @@ -26,7 +26,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -42,9 +41,9 @@ <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <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"/> @@ -59,26 +58,28 @@ <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.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> <plugin id="org.json"/> </plugins> <configurations> <plugin id="com.mycorp.examples.timeservice.async" autoStart="true" startLevel="0" /> - <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="6" /> + <plugin id="com.mycorp.examples.timeservice.host" 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.apache.felix.scr" autoStart="false" 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.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.etcd" autoStart="true" startLevel="0" /> 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 index 7acf18281..e3b9d6c70 100644 --- 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 @@ -2,10 +2,10 @@ 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: +It also assumes that an etcd server is running on 127.0.0.1 at port 2379. The system properties +in the product config are currently set to 127.0.0.1 (localhost) and port 2379 via: --Decf.discovery.etcd.hostname=localhost +-Decf.discovery.etcd.hostname=127.0.0.1 -Decf.discovery.etcd.port=2379 These can be changed in the product config or the generated launch config if desired to diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product index 64e78eac3..75bdf0248 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceHost JavaGroups Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.jgroups.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceHost JavaGroups Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.jgroups.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -23,7 +23,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -33,14 +32,14 @@ </vm> <plugins> - <plugin id="com.mycorp.examples.timeservice"/> + <plugin id="com.mycorp.examples.timeservice.async"/> <plugin id="com.mycorp.examples.timeservice.host"/> <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <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"/> @@ -60,22 +59,21 @@ <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> <plugin id="org.jgroups"/> </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.host" 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="5" /> - <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="5" /> + <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.jgroups" autoStart="true" startLevel="0" /> 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 index 36d09c6fc..131baeb6e 100644 --- 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 @@ -2,12 +2,3 @@ The use of the TimeServiceHost.jgroups.zeroconf.product relies on the presence o 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.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product index 3b82788af..d310ed441 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceHost JMS/ActiveMQ Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.jms.activemq.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceHost JMS/ActiveMQ Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.jms.activemq.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -24,7 +24,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -34,18 +33,15 @@ </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.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.apache.felix.scr"/> <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"/> @@ -53,7 +49,6 @@ <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"/> @@ -61,33 +56,28 @@ <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.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> </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="javax.xml" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.host" 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="5" /> - <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="5" /> + <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" /> @@ -100,9 +90,8 @@ <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.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" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product index c25c76f59..d97b6b754 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceHost ROSGI Websockets Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.rosgi.ws.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceHost ROSGI Websockets Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.rosgi.ws.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -13,7 +13,7 @@ -Dosgi.noShutdown=true -DverboseRemoteServiceAdmin=true -Dservice.exported.configs=ecf.r_osgi.peer.ws --Decf.r_osgi.peer.ws.id=r-osgi.ws://myhost +-Decf.r_osgi.peer.ws.id=r-osgi.ws://localhost -Dch.ethz.iks.r_osgi.transport.registerHttps=false -Dch.ethz.iks.r_osgi.registerDefaultChannel=false -Dch.ethz.iks.r_osgi.topic.filter=* @@ -25,7 +25,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -37,12 +36,12 @@ <plugins> <plugin id="ch.ethz.iks.r_osgi.remote"/> <plugin id="ch.ethz.iks.r_osgi.transport.http"/> - <plugin id="com.mycorp.examples.timeservice"/> + <plugin id="com.mycorp.examples.timeservice.async"/> <plugin id="com.mycorp.examples.timeservice.host"/> - <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.apache.felix.scr"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.discovery"/> @@ -59,19 +58,20 @@ <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.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> + <plugin id="org.java_websocket"/> <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" autoStart="true" startLevel="0" /> - <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="6" /> - <plugin id="java_websocket" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.host" 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" /> @@ -79,9 +79,9 @@ <plugin id="org.eclipse.ecf" 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.proxy" autoStart="true" startLevel="5" /> + <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" /> @@ -91,6 +91,7 @@ <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.osgi" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.readme b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.readme index f4fc09626..8367faad3 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.readme +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.readme @@ -16,3 +16,5 @@ 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 +Note that localhost port 433 must be open to allow the service to be exported via this provider + diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product index ce7c9e22f..1dbdf0f88 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceHost ROSGI Secure Websockets Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.rosgi.wss.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceHost ROSGI Secure Websockets Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.rosgi.wss.noreg.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -29,7 +29,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -41,12 +40,12 @@ <plugins> <plugin id="ch.ethz.iks.r_osgi.remote"/> <plugin id="ch.ethz.iks.r_osgi.transport.http"/> - <plugin id="com.mycorp.examples.timeservice"/> + <plugin id="com.mycorp.examples.timeservice.async"/> <plugin id="com.mycorp.examples.timeservice.host"/> - <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.apache.felix.scr"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.discovery"/> @@ -63,19 +62,21 @@ <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.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> + <plugin id="org.java_websocket"/> <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" autoStart="true" startLevel="0" /> - <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="6" /> - <plugin id="java_websocket" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.async" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.host" 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" /> @@ -83,9 +84,9 @@ <plugin id="org.eclipse.ecf" 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.proxy" autoStart="true" startLevel="5" /> + <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" /> @@ -95,6 +96,7 @@ <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.osgi" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeronconf.readme b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.readme index bc0954eb6..3fa51a83c 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeronconf.readme +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.readme @@ -40,6 +40,7 @@ above would refer to a file location of (e.g.): c:\eclipsehome\security\server.ks +Note that localhost port 433 must be available to allow the service to be exported via this provider diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product index 5f7df8598..315d8f492 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceHost R-OSGi Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.rosgi.noreg.java8.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceHost R-OSGi Zeroconf Discovery" uid="com.mycorp.examples.timeservice.host.rosgi.noreg.java8.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -23,7 +23,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -40,6 +39,7 @@ <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <plugin id="org.eclipse.core.jobs"/> <plugin id="org.eclipse.ecf"/> <plugin id="org.eclipse.ecf.discovery"/> @@ -56,17 +56,19 @@ <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.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.osgi.util"/> <plugin id="org.objectweb.asm"/> </plugins> <configurations> <plugin id="ch.ethz.iks.r_osgi.remote" autoStart="true" startLevel="0" /> <plugin id="com.mycorp.examples.timeservice.async" autoStart="true" startLevel="0" /> - <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="6" /> + <plugin id="com.mycorp.examples.timeservice.host" 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" /> @@ -74,8 +76,8 @@ <plugin id="org.eclipse.ecf" 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.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" /> @@ -85,6 +87,7 @@ <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.osgi" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product index 45bdc0fcc..8a815e5e3 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="TimeServiceHost XmlRpc Zeroconf Discovery" uid="com.mycorp.examples.timeservice.xmlrpc.j8.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> +<product name="TimeServiceHost XmlRpc Zeroconf Discovery" uid="com.mycorp.examples.timeservice.xmlrpc.j8.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> @@ -24,7 +24,6 @@ <windowImages/> <launcher> - <solaris/> <win useIco="false"> <bmp/> </win> @@ -42,11 +41,11 @@ <plugin id="org.apache.felix.gogo.command"/> <plugin id="org.apache.felix.gogo.runtime"/> <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.apache.felix.scr"/> <plugin id="org.apache.httpcomponents.httpclient"/> <plugin id="org.apache.httpcomponents.httpcore"/> <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"/> @@ -95,11 +94,10 @@ <plugin id="org.apache.httpcomponents.httpcore" 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.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" /> @@ -113,7 +111,7 @@ <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.http.servlet" autoStart="true" startLevel="0" /> diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/META-INF/MANIFEST.MF index f7967095e..4a1910d7e 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example Timeservice REST Provider Consumer Bundle-SymbolicName: com.mycorp.examples.timeservice.provider.rest.consumer -Bundle-Version: 1.1.0.qualifier +Automatic-Module-Name: com.mycorp.examples.timeservice.provider.rest.consumer +Bundle-Version: 1.1.100.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml index 023cb3094..d183d0571 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>com.mycorp.examples.timeservice.provider.rest.consumer</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/META-INF/MANIFEST.MF index 48801efb5..7fa124098 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/META-INF/MANIFEST.MF @@ -2,11 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF RS Example TimeService REST Provider Host Bundle-SymbolicName: com.mycorp.examples.timeservice.provider.rest.host -Bundle-Version: 1.1.0.qualifier +Automatic-Module-Name: com.mycorp.examples.timeservice.provider.rest.host +Bundle-Version: 1.1.100.qualifier Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.equinox.common, - org.eclipse.ecf +Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.ecf;bundle-version="[3.0.0,4.0.0)" Import-Package: com.mycorp.examples.timeservice;version="1.0.0", javax.servlet, javax.servlet.http, diff --git a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml index 4c7280778..eea0232b9 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml +++ b/examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>com.mycorp.examples.timeservice.provider.rest.host</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF index bbdf2bb8a..000f04f2c 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF @@ -2,14 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: ch.ethz.iks.r_osgi.remote -Bundle-Version: 1.0.9.qualifier +Automatic-Module-Name: ch.ethz.iks.r_osgi.remote +Bundle-Version: 1.0.100.qualifier Bundle-Vendor: %plugin.provider Import-Package: org.objectweb.asm;version="[5.0.1,6.0.0)", - org.osgi.framework, - org.osgi.service.event, - org.osgi.service.log, - org.osgi.service.packageadmin, - org.osgi.util.tracker + org.osgi.framework;version="[1.0.0,2.0.0)", + org.osgi.service.event;version="[1.0.0,2.0.0)", + org.osgi.service.log;version="[1.0.0,2.0.0)", + org.osgi.service.packageadmin;version="[1.0.0,2.0.0)", + org.osgi.util.tracker;version="[1.0.0,2.0.0)" Export-Package: ch.ethz.iks.r_osgi;version="1.0.9", ch.ethz.iks.r_osgi.channels;version="1.0.1", ch.ethz.iks.r_osgi.messages;version="1.0.1", diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/build.properties b/protocols/bundles/ch.ethz.iks.r_osgi.remote/build.properties index 532cc5991..d45a961ba 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/build.properties +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/build.properties @@ -7,5 +7,5 @@ bin.includes = META-INF/,\ LICENSE.txt src.includes = about.html,\ LICENSE.txt -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-1.3 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml index a74c66bde..f597064c2 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>ch.ethz.iks.r_osgi.remote</artifactId> - <version>1.0.9-SNAPSHOT</version> + <version>1.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/protocols/bundles/ch.ethz.iks.slp/META-INF/MANIFEST.MF b/protocols/bundles/ch.ethz.iks.slp/META-INF/MANIFEST.MF index b184a5924..4156ae8c1 100644 --- a/protocols/bundles/ch.ethz.iks.slp/META-INF/MANIFEST.MF +++ b/protocols/bundles/ch.ethz.iks.slp/META-INF/MANIFEST.MF @@ -2,11 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Service Location Protocol (RFC 2608) Implementation Bundle-SymbolicName: ch.ethz.iks.slp -Bundle-Version: 1.1.100.qualifier +Automatic-Module-Name: ch.ethz.iks.slp +Bundle-Version: 1.1.200.qualifier Export-Package: ch.ethz.iks.slp;version="1.0.0" Bundle-Activator: ch.ethz.iks.slp.impl.Activator Bundle-Vendor: Eclipse.org - ECF -Import-Package: org.osgi.framework, org.osgi.service.log +Import-Package: org.osgi.framework;version="[1.0.0,2.0.0)", + org.osgi.service.log;version="[1.0.0,2.0.0)" Bundle-Description: jSLP, the pure Java Service Location Protocol implementation Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/protocols/bundles/ch.ethz.iks.slp/pom.xml b/protocols/bundles/ch.ethz.iks.slp/pom.xml index 168ca0a33..102e0ccc8 100644 --- a/protocols/bundles/ch.ethz.iks.slp/pom.xml +++ b/protocols/bundles/ch.ethz.iks.slp/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>ch.ethz.iks.slp</artifactId> - <version>1.1.100-SNAPSHOT</version> + <version>1.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> 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 6deb2e94c..a6a3ab8e9 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 @@ -4,17 +4,17 @@ 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 -Import-Package: ch.ethz.iks.r_osgi;version="1.0.1", +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", - org.eclipse.equinox.concurrent.future;version="1.0.0", - org.osgi.framework;version="1.3.0", - org.osgi.framework.wiring, - org.osgi.util.tracker;version="1.3.3" -Require-Bundle: org.eclipse.ecf;bundle-version="3.1.0", - org.eclipse.ecf.provider, - org.eclipse.ecf.remoteservice;bundle-version="5.0.0", - org.eclipse.equinox.common + org.eclipse.ecf.remoteservice.asyncproxy;version="[1.0.0,3.0.0)", + org.eclipse.equinox.concurrent.future;version="[1.0.0,2.0.0)", + org.osgi.framework;version="[1.3.0,2.0.0)", + org.osgi.framework.wiring;version="[1.2.0,3.0.0)", + org.osgi.util.tracker;version="[1.3.3,2.0.0)" +Require-Bundle: org.eclipse.ecf;bundle-version="[3.1.0,4.0.0)", + org.eclipse.ecf.provider;bundle-version="[4.0.0,5.0.0)", + org.eclipse.ecf.remoteservice;bundle-version="[8.0.0,10.0.0)", + org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)" Bundle-Activator: org.eclipse.ecf.internal.provider.r_osgi.Activator Eclipse-LazyStart: true Export-Package: org.eclipse.ecf.provider.r_osgi.identity;version="3.2.0" |