Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2016-11-28 03:45:54 +0000
committerslewis2016-11-28 03:45:54 +0000
commit2db512285a3816723bb356e8daf7969b4f8ba7e6 (patch)
treeb44ad1e8b909b03b89d1d4a5b095d376bf18a5ac
parentfd46744dcc2965b870ee44d02562ab0e525d3271 (diff)
downloadorg.eclipse.ecf-2db512285a3816723bb356e8daf7969b4f8ba7e6.tar.gz
org.eclipse.ecf-2db512285a3816723bb356e8daf7969b4f8ba7e6.tar.xz
org.eclipse.ecf-2db512285a3816723bb356e8daf7969b4f8ba7e6.zip
fixes to timeservice host product configuration files
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.zeroconf.product1
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.zeroconf.product135
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product4
4 files changed, 2 insertions, 141 deletions
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.zeroconf.product
index bdd87351c..3e91a3ee3 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.zeroconf.product
@@ -52,7 +52,7 @@
<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" version="2.0.0.v20140410-1838"/>
+ <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,6 @@
<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" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.zeroconf.product
index 75374761f..6027b8dd5 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.activemq.zeroconf.product
@@ -44,7 +44,6 @@
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
- <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
<plugin id="org.eclipse.ecf"/>
<plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.datashare"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.zeroconf.product
deleted file mode 100644
index 7abbf201a..000000000
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rest.zeroconf.product
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="MyCorp Remote TimeService REST Host No Registry" uid="com.mycorp.examples.timeservice.rest.host.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.host"/>
- <plugin id="com.mycorp.examples.timeservice.provider.rest.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.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" 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="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" />
- <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.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.rosgi.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product
index 795f03b1f..72749ce76 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product
@@ -13,7 +13,6 @@
-Dosgi.noShutdown=true
-DverboseRemoteServiceAdmin=true
-Dservice.exported.configs=ecf.r_osgi.peer
--Dch.ethz.iks.r_osgi.port=9285
-Decf.exported.async.interfaces=*
-Dch.ethz.iks.r_osgi.topic.filter=*
</vmArgs>
@@ -52,7 +51,7 @@
<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" version="2.0.100.v20150702-1411"/>
+ <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 +81,6 @@
<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" />

Back to the top