Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2016-11-27 15:38:45 -0500
committerslewis2016-11-27 15:38:45 -0500
commitb827bcb405bab24b26e68791de736f45802f228e (patch)
tree2f2580d749feb5d5147ad60acda1e7bcdb5d0cd7
parentbfcbf5eb72cb3e23a9849bbaa2e239774963c347 (diff)
downloadorg.eclipse.ecf-b827bcb405bab24b26e68791de736f45802f228e.tar.gz
org.eclipse.ecf-b827bcb405bab24b26e68791de736f45802f228e.tar.xz
org.eclipse.ecf-b827bcb405bab24b26e68791de736f45802f228e.zip
Renamed product files for clarity.
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF8
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/OSGI-INF/com.mycorp.examples.timeservice.consumer.ds.TimeServiceComponent.xml5
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/OSGI-INF/timeservicecomponent.xml5
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/build.properties1
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.edef.product105
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.noreg.product97
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.product105
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.edef.noreg.product117
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.edef.product125
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.noreg.product117
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.product125
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.product108
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.edef.noreg.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.java8.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.noreg.java8.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jabsorb.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.jabsorb.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeronconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.jgroups.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeronconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.jms.activemq.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.edef.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.ws.edef.noreg.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.ws.noreg.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.wss.noreg.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.noreg.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.xmlrpc.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.edef.txt (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.edef.txt)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.ws.edef.txt (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.ws.edef.noreg.txt)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.wss.zeroconf.txt (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.wss.noreg.txt)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/src/com/mycorp/examples/timeservice/consumer/ds/TimeServiceComponent.java7
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.product)3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.java8.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.noreg.product93
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.product101
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.noreg.java8.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jabsorb.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jabsorb.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.product144
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.noreg.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.noreg.product94
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.product102
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.noreg.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.noreg.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.noreg.java8.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.product135
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.j8.product)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.ws.zeroconf.txt (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.ws.noreg.txt)0
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.wss.zeronconf.txt (renamed from examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.wss.noreg.txt)0
47 files changed, 28 insertions, 1598 deletions
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF
index b14a75ec1..f97e2c149 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/META-INF/MANIFEST.MF
@@ -2,8 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF RS Example Timeservice Consumer DS
Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer.ds
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Vendor: Eclipse.org - ECF
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Service-Component: OSGI-INF/timeservicecomponent.xml
-Import-Package: com.mycorp.examples.timeservice;version="[1.0.0,2.0.0)"
+Import-Package: com.mycorp.examples.timeservice;version="[2.0.0,3.0.0)",
+ org.osgi.service.component.annotations;resolution:=optional
+Service-Component: OSGI-INF/com.mycorp.examples.timeservice.consumer.ds.TimeServiceComponent.xml
+Bundle-ActivationPolicy: lazy
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/OSGI-INF/com.mycorp.examples.timeservice.consumer.ds.TimeServiceComponent.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/OSGI-INF/com.mycorp.examples.timeservice.consumer.ds.TimeServiceComponent.xml
new file mode 100644
index 000000000..b138f9026
--- /dev/null
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/OSGI-INF/com.mycorp.examples.timeservice.consumer.ds.TimeServiceComponent.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="com.mycorp.examples.timeservice.consumer.ds.TimeServiceComponent">
+ <reference bind="bindTimeService" cardinality="1..n" interface="com.mycorp.examples.timeservice.ITimeService" name="TimeService" policy="dynamic" unbind="unbindTimeService"/>
+ <implementation class="com.mycorp.examples.timeservice.consumer.ds.TimeServiceComponent"/>
+</scr:component> \ No newline at end of file
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/OSGI-INF/timeservicecomponent.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/OSGI-INF/timeservicecomponent.xml
deleted file mode 100644
index 86a235fe1..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/OSGI-INF/timeservicecomponent.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" enabled="true" name="com.mycorp.examples.timeservice.consumer.ds">
- <implementation class="com.mycorp.examples.timeservice.consumer.ds.TimeServiceComponent"/>
- <reference bind="bindTimeService" cardinality="1..1" interface="com.mycorp.examples.timeservice.ITimeService" name="ITimeService" policy="dynamic" unbind="unbindTimeService"/>
-</scr:component>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/build.properties b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/build.properties
index ae221b989..6a14980bb 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/build.properties
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/build.properties
@@ -1,7 +1,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- OSGI-INF/timeservicecomponent.xml,\
OSGI-INF/,\
launch/,\
about.html
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.edef.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.edef.product
deleted file mode 100644
index 19757178c..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.edef.product
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService Generic Consumer DS EDEF" uid="com.mycorp.examples.timeservice.consumer.generic.ds.edef.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"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery"/>
- <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.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.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" autoStart="true" startLevel="0" />
- <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="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.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.ds.generic.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.noreg.product
deleted file mode 100644
index 0d8cbf899..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.noreg.product
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService Generic Consumer DS No Registry" uid="com.mycorp.examples.timeservice.consumer.generic.ds.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-consoleLog -console
- </programArgs>
- <vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.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"/>
- <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.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.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" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
- <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
- <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
- <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.core.jobs" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.console" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.discovery" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.identity" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.osgi.services.distribution" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.sharedobject" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
- <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.product
deleted file mode 100644
index f2a8fdce0..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.product
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService Generic Consumer DS" uid="com.mycorp.examples.timeservice.consumer.generic.ds.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-consoleLog -console
- </programArgs>
- <vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.generic.server
--Decf.generic.server.port=3288
--Decf.generic.server.hostname=localhost
- </vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
- </vmArgsMac>
- </launcherArgs>
-
- <windowImages/>
-
- <launcher>
- <solaris/>
- <win useIco="false">
- <bmp/>
- </win>
- </launcher>
-
- <vm>
- </vm>
-
- <plugins>
- <plugin id="com.mycorp.examples.timeservice"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
- <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.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.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.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" autoStart="true" startLevel="0" />
- <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.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.ds.rest.edef.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.edef.noreg.product
deleted file mode 100644
index abc64f569..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.edef.noreg.product
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService REST Consumer DS EDEF No Registry" uid="com.mycorp.examples.timeservice.rest.consumer.ds.edef.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-consoleLog -console
- </programArgs>
- <vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dorg.eclipse.equinox.http.jetty.http.port=8181
--Dservice.exported.configs=com.mycorp.examples.timeservice.rest.host
--Dcom.mycorp.examples.timeservice.rest.host.id=http://localhost:8181
- </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"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rest"/>
- <plugin id="com.mycorp.examples.timeservice.provider.rest.consumer"/>
- <plugin id="javax.servlet"/>
- <plugin id="org.apache.commons.codec"/>
- <plugin id="org.apache.commons.logging"/>
- <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.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"/>
- <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.remoteservice.rest"/>
- <plugin id="org.eclipse.ecf.remoteservice.servlet"/>
- <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"/>
- <plugin id="org.json"/>
- </plugins>
-
- <configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rest" autoStart="false" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.provider.rest.consumer" autoStart="true" startLevel="0" />
- <plugin id="javax.servlet" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.codec" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.logging" 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.httpcomponents.httpclient" autoStart="true" startLevel="0" />
- <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="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.remoteservice.rest" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.servlet" 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.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.eclipse.osgi.util" autoStart="true" startLevel="0" />
- <plugin id="org.json" autoStart="true" startLevel="0" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.edef.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.edef.product
deleted file mode 100644
index 40d9a0f03..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.edef.product
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService REST Consumer DS EDEF" uid="com.mycorp.examples.timeservice.rest.consumer.ds.edef.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
--Dorg.eclipse.equinox.http.jetty.http.port=8181
--Dservice.exported.configs=com.mycorp.examples.timeservice.rest.host
--Dcom.mycorp.examples.timeservice.rest.host.id=http://localhost:8181
- </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"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rest"/>
- <plugin id="com.mycorp.examples.timeservice.provider.rest.consumer"/>
- <plugin id="javax.servlet"/>
- <plugin id="javax.xml"/>
- <plugin id="org.apache.commons.codec"/>
- <plugin id="org.apache.commons.logging"/>
- <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.httpcomponents.httpclient"/>
- <plugin id="org.apache.httpcomponents.httpcore"/>
- <plugin id="org.eclipse.core.contenttype"/>
- <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.remoteservice.rest"/>
- <plugin id="org.eclipse.ecf.remoteservice.servlet"/>
- <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.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"/>
- <plugin id="org.json"/>
- </plugins>
-
- <configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rest" autoStart="false" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.provider.rest.consumer" autoStart="true" startLevel="0" />
- <plugin id="javax.servlet" autoStart="true" startLevel="0" />
- <plugin id="javax.xml" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.codec" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.logging" 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.httpcomponents.httpclient" autoStart="true" startLevel="0" />
- <plugin id="org.apache.httpcomponents.httpcore" 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.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.remoteservice.rest" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.servlet" 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.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" />
- <plugin id="org.eclipse.osgi.util" autoStart="true" startLevel="0" />
- <plugin id="org.json" autoStart="true" startLevel="0" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.noreg.product
deleted file mode 100644
index 3774016c1..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.noreg.product
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService REST Consumer DS No Registry" uid="com.mycorp.examples.timeservice.rest.consumer.ds.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-consoleLog -console
- </programArgs>
- <vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dorg.eclipse.equinox.http.jetty.http.port=8181
--Dservice.exported.configs=com.mycorp.examples.timeservice.rest.host
--Dcom.mycorp.examples.timeservice.rest.host.id=http://localhost:8181
- </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"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
- <plugin id="com.mycorp.examples.timeservice.provider.rest.consumer"/>
- <plugin id="javax.servlet"/>
- <plugin id="org.apache.commons.codec"/>
- <plugin id="org.apache.commons.logging"/>
- <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.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"/>
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
- <plugin id="org.eclipse.ecf.provider"/>
- <plugin id="org.eclipse.ecf.provider.jmdns"/>
- <plugin id="org.eclipse.ecf.provider.remoteservice"/>
- <plugin id="org.eclipse.ecf.remoteservice"/>
- <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
- <plugin id="org.eclipse.ecf.remoteservice.rest"/>
- <plugin id="org.eclipse.ecf.remoteservice.servlet"/>
- <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"/>
- <plugin id="org.json"/>
- </plugins>
-
- <configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.provider.rest.consumer" autoStart="true" startLevel="0" />
- <plugin id="javax.servlet" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.codec" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.logging" 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.httpcomponents.httpclient" autoStart="true" startLevel="0" />
- <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="0" />
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.rest" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.servlet" 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.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.eclipse.osgi.util" autoStart="true" startLevel="0" />
- <plugin id="org.json" autoStart="true" startLevel="0" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.product
deleted file mode 100644
index 5b45ad845..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rest.product
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService REST Consumer DS" uid="com.mycorp.examples.timeservice.rest.consumer.ds.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-consoleLog -console
- </programArgs>
- <vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dorg.eclipse.equinox.http.jetty.http.port=8181
--Dservice.exported.configs=com.mycorp.examples.timeservice.rest.host
--Dcom.mycorp.examples.timeservice.rest.host.id=http://localhost:8181
- </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"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
- <plugin id="com.mycorp.examples.timeservice.provider.rest.consumer"/>
- <plugin id="javax.servlet"/>
- <plugin id="javax.xml"/>
- <plugin id="org.apache.commons.codec"/>
- <plugin id="org.apache.commons.logging"/>
- <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.httpcomponents.httpclient"/>
- <plugin id="org.apache.httpcomponents.httpcore"/>
- <plugin id="org.eclipse.core.contenttype"/>
- <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.remoteservice"/>
- <plugin id="org.eclipse.ecf.remoteservice"/>
- <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
- <plugin id="org.eclipse.ecf.remoteservice.rest"/>
- <plugin id="org.eclipse.ecf.remoteservice.servlet"/>
- <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.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"/>
- <plugin id="org.json"/>
- </plugins>
-
- <configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.provider.rest.consumer" autoStart="true" startLevel="0" />
- <plugin id="javax.servlet" autoStart="true" startLevel="0" />
- <plugin id="javax.xml" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.codec" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.logging" 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.httpcomponents.httpclient" autoStart="true" startLevel="0" />
- <plugin id="org.apache.httpcomponents.httpcore" 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.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.remoteservice.rest" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.servlet" 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.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" />
- <plugin id="org.eclipse.osgi.util" autoStart="true" startLevel="0" />
- <plugin id="org.json" autoStart="true" startLevel="0" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.product
deleted file mode 100644
index 0374b7ff2..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.product
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService Consumer ROSGI DS" uid="com.mycorp.examples.timeservice.consumer.rosgi.ds.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-consoleLog -console
- </programArgs>
- <vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.r_osgi.peer
--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="com.mycorp.examples.timeservice"/>
- <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
- <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.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.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.objectweb.asm" version="3.3.1"/>
- </plugins>
-
- <configurations>
- <plugin id="ch.ethz.iks.r_osgi.remote" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
- <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.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.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" />
- <plugin id="org.objectweb.asm" autoStart="true" startLevel="0" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.edef.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product
index 1cb323a3e..3b4cfbf32 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.generic.edef.noreg.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product
@@ -33,7 +33,7 @@
</vm>
<plugins>
- <plugin id="com.mycorp.examples.timeservice"/>
+ <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"/>
@@ -65,7 +65,6 @@
</plugins>
<configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
<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" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.java8.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product
index 5fe2350eb..5fe2350eb 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.java8.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.noreg.java8.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.zeroconf.product
index 81171beb1..81171beb1 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.noreg.java8.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.jabsorb.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jabsorb.zeroconf.product
index 6aace052d..bd32bbf96 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.jabsorb.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jabsorb.zeroconf.product
@@ -33,7 +33,7 @@
</vm>
<plugins>
- <plugin id="com.mycorp.examples.timeservice"/>
+ <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"/>
@@ -67,7 +67,6 @@
</plugins>
<configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
<plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.jgroups.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeronconf.product
index 519c53db1..4580ac511 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.jgroups.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeronconf.product
@@ -31,7 +31,7 @@
</vm>
<plugins>
- <plugin id="com.mycorp.examples.timeservice"/>
+ <plugin id="com.mycorp.examples.timeservice.async"/>
<plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.runtime"/>
@@ -64,7 +64,6 @@
</plugins>
<configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
<plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.jms.activemq.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeronconf.product
index 407cbd6de..c42b00674 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.jms.activemq.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeronconf.product
@@ -30,7 +30,7 @@
</vm>
<plugins>
- <plugin id="com.mycorp.examples.timeservice"/>
+ <plugin id="com.mycorp.examples.timeservice.async"/>
<plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
<plugin id="javax.jms"/>
<plugin id="javax.xml"/>
@@ -73,7 +73,6 @@
</plugins>
<configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
<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" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.ws.edef.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.edef.product
index e579d660e..2f3d389c0 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.ws.edef.noreg.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.edef.product
@@ -35,7 +35,7 @@
<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.consumer.ds"/>
<plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws"/>
<plugin id="java_websocket"/>
@@ -70,7 +70,6 @@
<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.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" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.ws.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product
index 7656334aa..65cefa564 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.ws.noreg.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product
@@ -35,7 +35,7 @@
<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.consumer.ds"/>
<plugin id="java_websocket"/>
<plugin id="org.apache.felix.gogo.command"/>
@@ -70,7 +70,6 @@
<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.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" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.wss.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product
index 025de791f..79de576de 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.wss.noreg.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product
@@ -39,7 +39,7 @@
<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.consumer.ds"/>
<plugin id="java_websocket"/>
<plugin id="org.apache.felix.gogo.command"/>
@@ -74,7 +74,6 @@
<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.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" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product
index a0878e5e9..17ed4be19 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.noreg.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product
@@ -33,7 +33,7 @@
<plugins>
<plugin id="ch.ethz.iks.r_osgi.remote"/>
- <plugin id="com.mycorp.examples.timeservice"/>
+ <plugin id="com.mycorp.examples.timeservice.async"/>
<plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
<plugin id="org.apache.felix.gogo.command"/>
<plugin id="org.apache.felix.gogo.runtime"/>
@@ -66,7 +66,6 @@
<configurations>
<plugin id="ch.ethz.iks.r_osgi.remote" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
<plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.xmlrpc.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
index 3879c7e0d..b5f1dbed8 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.xmlrpc.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
@@ -29,7 +29,7 @@
</vm>
<plugins>
- <plugin id="com.mycorp.examples.timeservice"/>
+ <plugin id="com.mycorp.examples.timeservice.async"/>
<plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
<plugin id="javax.servlet"/>
<plugin id="org.apache.commons.logging"/>
@@ -61,7 +61,6 @@
</plugins>
<configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
<plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.edef.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.edef.txt
index dee9e3cc7..dee9e3cc7 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.edef.txt
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.edef.txt
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.ws.edef.noreg.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.ws.edef.txt
index 214a5868b..214a5868b 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.ws.edef.noreg.txt
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.ws.edef.txt
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.wss.noreg.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.wss.zeroconf.txt
index a19aab4dd..a19aab4dd 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.wss.noreg.txt
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.rosgi.wss.zeroconf.txt
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml
index d1ad65a31..498181028 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>com.mycorp.examples.timeservice.consumer.ds</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/src/com/mycorp/examples/timeservice/consumer/ds/TimeServiceComponent.java b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/src/com/mycorp/examples/timeservice/consumer/ds/TimeServiceComponent.java
index c23055878..9939bcb03 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/src/com/mycorp/examples/timeservice/consumer/ds/TimeServiceComponent.java
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/src/com/mycorp/examples/timeservice/consumer/ds/TimeServiceComponent.java
@@ -8,11 +8,18 @@
******************************************************************************/
package com.mycorp.examples.timeservice.consumer.ds;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+
import com.mycorp.examples.timeservice.ITimeService;
+@Component(immediate=true)
public class TimeServiceComponent {
// Called by DS upon ITimeService discovery
+ @Reference(policy=ReferencePolicy.DYNAMIC, cardinality=ReferenceCardinality.AT_LEAST_ONE)
void bindTimeService(ITimeService timeService) {
System.out.println("Discovered ITimeService via DS. Instance="+timeService);
// Call the service and print out result!
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.product b/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product
index a5585e6b5..d7fbafa38 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product
@@ -33,7 +33,7 @@
</vm>
<plugins>
- <plugin id="com.mycorp.examples.timeservice"/>
+ <plugin id="com.mycorp.examples.timeservice.async"/>
<plugin id="com.mycorp.examples.timeservice.consumer"/>
<plugin id="javax.xml"/>
<plugin id="org.apache.felix.gogo.command"/>
@@ -68,7 +68,6 @@
</plugins>
<configurations>
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
<plugin id="com.mycorp.examples.timeservice.consumer" autoStart="true" startLevel="5" />
<plugin id="javax.xml" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.java8.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product
index a1f494bb7..a1f494bb7 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.java8.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.noreg.product
deleted file mode 100644
index 72dc452ff..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.noreg.product
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService Generic No Extension Registry" uid="com.mycorp.examples.timeservice.host.generic.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-consoleLog -console
- </programArgs>
- <vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.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"/>
- <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.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.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.event"/>
- <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" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="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.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.proxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.sharedobject" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.event" 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.host/launch/TimeServiceHost.generic.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.product
deleted file mode 100644
index c4114a6bc..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.product
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService Generic" uid="com.mycorp.examples.timeservice.host.generic.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"/>
- <plugin id="com.mycorp.examples.timeservice.host"/>
- <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.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.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.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"/>
- </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="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.remoteserviceadmin.proxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.sharedobject" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.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" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.noreg.java8.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.zeroconf.product
index bdd87351c..bdd87351c 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.noreg.java8.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jabsorb.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jabsorb.zeroconf.product
index 16532b891..16532b891 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jabsorb.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jabsorb.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product
index c40515e2c..c40515e2c 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.zeroconf.product
index 75374761f..75374761f 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.product
deleted file mode 100644
index b07591cbc..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.product
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService REST Host" uid="com.mycorp.examples.timeservice.rest.host.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
--Dorg.eclipse.equinox.http.jetty.http.port=8181
--Dservice.exported.configs=com.mycorp.examples.timeservice.rest.host
--Dcom.mycorp.examples.timeservice.rest.host.id=http://localhost:8181
- </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"/>
- <plugin id="com.mycorp.examples.timeservice.host"/>
- <plugin id="com.mycorp.examples.timeservice.provider.rest.host"/>
- <plugin id="javax.servlet"/>
- <plugin id="javax.xml"/>
- <plugin id="org.apache.commons.codec"/>
- <plugin id="org.apache.commons.logging"/>
- <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.httpcomponents.httpclient"/>
- <plugin id="org.apache.httpcomponents.httpcore"/>
- <plugin id="org.eclipse.core.contenttype"/>
- <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.remoteservice"/>
- <plugin id="org.eclipse.ecf.remoteservice"/>
- <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
- <plugin id="org.eclipse.ecf.remoteservice.rest"/>
- <plugin id="org.eclipse.ecf.remoteservice.servlet"/>
- <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.preferences"/>
- <plugin id="org.eclipse.equinox.registry"/>
- <plugin id="org.eclipse.equinox.util"/>
- <plugin id="org.eclipse.jetty.continuation"/>
- <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.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="0" />
- <plugin id="com.mycorp.examples.timeservice.provider.rest.host" autoStart="true" startLevel="0" />
- <plugin id="javax.servlet" autoStart="true" startLevel="6" />
- <plugin id="javax.xml" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.codec" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.logging" 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.httpcomponents.httpclient" autoStart="true" startLevel="0" />
- <plugin id="org.apache.httpcomponents.httpcore" 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.remoteserviceadmin.proxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.rest" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.servlet" 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.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" />
- <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.jetty.continuation" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.io" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.security" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.server" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.servlet" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.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" />
- <plugin id="org.json" autoStart="true" startLevel="0" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.zeroconf.product
index 7abbf201a..7abbf201a 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.noreg.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.noreg.product
deleted file mode 100644
index 45c7c0ee1..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.noreg.product
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService ROSGI No Extension Registry" uid="com.mycorp.examples.timeservice.host.rosgi.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-consoleLog -console
- </programArgs>
- <vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.r_osgi.peer
--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="com.mycorp.examples.timeservice"/>
- <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.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.event"/>
- <plugin id="org.eclipse.osgi"/>
- <plugin id="org.eclipse.osgi.services"/>
- <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/>
- <plugin id="org.objectweb.asm"/>
- </plugins>
-
- <configurations>
- <plugin id="ch.ethz.iks.r_osgi.remote" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" />
- <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="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.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.proxy" autoStart="true" startLevel="5" />
- <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.event" 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.host/launch/TimeServiceHost.rosgi.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.product
deleted file mode 100644
index 7fc4b76a0..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.product
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService ROSGI" uid="com.mycorp.examples.timeservice.host.rosgi.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
--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="com.mycorp.examples.timeservice"/>
- <plugin id="com.mycorp.examples.timeservice.host"/>
- <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.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.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.objectweb.asm"/>
- </plugins>
-
- <configurations>
- <plugin id="ch.ethz.iks.r_osgi.remote" 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="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="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.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.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" />
- <plugin id="org.objectweb.asm" autoStart="true" startLevel="0" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product
index ce72350d7..ce72350d7 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.noreg.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product
index 5929fb5ad..5929fb5ad 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.noreg.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.noreg.java8.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product
index 795f03b1f..795f03b1f 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.noreg.java8.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.product
deleted file mode 100644
index 53eaa7d03..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.product
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService XmlRpc Host" uid="com.mycorp.examples.timeservice.xmlrpc.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
--Dorg.eclipse.equinox.http.jetty.http.port=8181
--Dservice.exported.configs=ecf.xmlrpc.server
--Decf.xmlrpc.server.uriContext=http://localhost:8181/xml-rpc
--Dcom.mycorp.examples.timeservice.rest.host.id=http://localhost:8181
- </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"/>
- <plugin id="com.mycorp.examples.timeservice.host"/>
- <plugin id="javax.servlet"/>
- <plugin id="org.apache.commons.codec"/>
- <plugin id="org.apache.commons.logging"/>
- <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.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"/>
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
- <plugin id="org.eclipse.ecf.provider"/>
- <plugin id="org.eclipse.ecf.provider.jmdns"/>
- <plugin id="org.eclipse.ecf.provider.remoteservice"/>
- <plugin id="org.eclipse.ecf.provider.xmlrpc"/>
- <plugin id="org.eclipse.ecf.remoteservice"/>
- <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
- <plugin id="org.eclipse.ecf.remoteservice.rest"/>
- <plugin id="org.eclipse.ecf.remoteservice.servlet"/>
- <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.http.jetty"/>
- <plugin id="org.eclipse.equinox.http.servlet"/>
- <plugin id="org.eclipse.equinox.util"/>
- <plugin id="org.eclipse.jetty.continuation"/>
- <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.eclipse.osgi.util"/>
- <plugin id="org.json"/>
- </plugins>
-
- <configurations>
- <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="0" />
- <plugin id="javax.servlet" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.codec" autoStart="true" startLevel="0" />
- <plugin id="org.apache.commons.logging" 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.httpcomponents.httpclient" autoStart="true" startLevel="0" />
- <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.remoteserviceadmin.proxy" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.remoteservice" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.provider.xmlrpc" 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.remoteservice.rest" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.ecf.remoteservice.servlet" 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.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" />
- <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.continuation" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.io" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.security" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.server" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.servlet" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.jetty.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" />
- <plugin id="org.json" autoStart="true" startLevel="0" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.j8.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
index b0027f8de..b0027f8de 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.j8.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.ws.noreg.txt b/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.ws.zeroconf.txt
index f4fc09626..f4fc09626 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.ws.noreg.txt
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.ws.zeroconf.txt
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.wss.noreg.txt b/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.wss.zeronconf.txt
index bc0954eb6..bc0954eb6 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.wss.noreg.txt
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/readme.TimeServiceHost.rosgi.wss.zeronconf.txt

Back to the top