diff options
author | slewis | 2014-04-13 01:02:39 +0000 |
---|---|---|
committer | slewis | 2014-04-13 01:02:39 +0000 |
commit | a3239b76e7ce3aa3abde0a628a807b5a3f3370e4 (patch) | |
tree | c35d002555e00b25da305559a5a55ec169cdcda4 | |
parent | d509b5eb22e194991f030b430fa1b4aa78c8b14c (diff) | |
download | org.eclipse.ecf-a3239b76e7ce3aa3abde0a628a807b5a3f3370e4.tar.gz org.eclipse.ecf-a3239b76e7ce3aa3abde0a628a807b5a3f3370e4.tar.xz org.eclipse.ecf-a3239b76e7ce3aa3abde0a628a807b5a3f3370e4.zip |
Fixes for time service product configurations
Change-Id: I6a0eb779e73a49e81b59ef97dc7b9e4f94b67199
16 files changed, 79 insertions, 63 deletions
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.ds.generic.edef.noreg.product index df741d8ee..1cb323a3e 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.ds.generic.edef.noreg.product @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -51,7 +50,8 @@ <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"/> + <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"/> @@ -82,7 +82,8 @@ <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" 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" /> 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 index 470000d62..19757178c 100644 --- 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 @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -52,7 +51,8 @@ <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"/> + <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"/> @@ -86,7 +86,8 @@ <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" 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" /> 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 index 979bbf817..0d8cbf899 100644 --- 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 @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -50,7 +49,8 @@ <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"/> + <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"/> @@ -80,7 +80,8 @@ <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" 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" /> 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 index 15e147bf1..f2a8fdce0 100644 --- 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 @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -52,7 +51,8 @@ <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"/> + <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"/> @@ -86,7 +86,8 @@ <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" 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" /> 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 index 21adf35c8..9a64784f8 100644 --- 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 @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -57,7 +56,8 @@ <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"/> + <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"/> @@ -98,7 +98,8 @@ <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" 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" /> 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 index a3e672aa1..8c0d3fd4f 100644 --- 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 @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -59,7 +58,8 @@ <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"/> + <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"/> @@ -104,7 +104,8 @@ <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" 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" /> 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 index 537d9ebca..4503b0c11 100644 --- 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 @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -57,7 +56,8 @@ <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"/> + <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"/> @@ -98,7 +98,8 @@ <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" 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" /> 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 index 811c8ee54..c5f9fee5b 100644 --- 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 @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -59,7 +58,8 @@ <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"/> + <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"/> @@ -104,7 +104,8 @@ <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" 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" /> 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.ds.rosgi.noreg.product index 522d4b5b8..247e656f4 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.ds.rosgi.noreg.product @@ -28,7 +28,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -49,7 +48,8 @@ <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.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"/> @@ -81,7 +81,8 @@ <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.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" /> 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 index 41903ef9a..01d40b713 100644 --- 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 @@ -28,7 +28,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -51,7 +50,8 @@ <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.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"/> @@ -87,7 +87,8 @@ <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.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" /> 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 index a7136b6f1..72dc452ff 100644 --- 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 @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -50,7 +49,8 @@ <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"/> + <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"/> @@ -63,7 +63,7 @@ <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.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" /> @@ -72,13 +72,14 @@ <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.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" 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" /> 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 index 07a90f573..c4114a6bc 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.product @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -52,7 +51,8 @@ <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"/> + <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"/> @@ -67,7 +67,7 @@ <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.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" /> @@ -78,13 +78,14 @@ <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.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" 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" /> 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.noreg.product index 3efa852f6..10e405a94 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.noreg.product @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -57,7 +56,8 @@ <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"/> + <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"/> @@ -87,7 +87,7 @@ <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.common" autoStart="true" startLevel="0" /> - <plugin id="com.mycorp.examples.timeservice.provider.rest.host" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.provider.rest.host" autoStart="true" startLevel="6" /> <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" /> @@ -101,13 +101,14 @@ <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.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" 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" /> 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 index 79419365a..83431c941 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.product @@ -30,7 +30,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -59,7 +58,8 @@ <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"/> + <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"/> @@ -93,7 +93,7 @@ <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="0" /> <plugin id="com.mycorp.examples.timeservice.provider.rest.common" autoStart="true" startLevel="0" /> <plugin id="com.mycorp.examples.timeservice.provider.rest.host" autoStart="true" startLevel="0" /> - <plugin id="javax.servlet" 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" /> @@ -108,13 +108,14 @@ <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.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" 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" /> 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 index 030c59fce..7060bd74a 100644 --- 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 @@ -28,7 +28,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -49,7 +48,8 @@ <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.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"/> @@ -64,7 +64,7 @@ <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="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" /> @@ -74,12 +74,13 @@ <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.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.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" /> 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 index bae3e220a..eb0784a3c 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.product +++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.product @@ -28,7 +28,6 @@ </launcher> <vm> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows> </vm> <plugins> @@ -51,7 +50,8 @@ <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.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"/> @@ -85,7 +85,8 @@ <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.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" /> |