Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-03-07 13:42:24 -0500
committerslewis2018-03-07 13:42:24 -0500
commit09212c8c8538b8d1467dbd3495c724bf3661b593 (patch)
tree79fec525ffe39b0c8b554075d1584bbaaac37a38
parentf10ac64ac7ba862abca8932c4d14a8de9028c805 (diff)
downloadorg.eclipse.ecf-09212c8c8538b8d1467dbd3495c724bf3661b593.tar.gz
org.eclipse.ecf-09212c8c8538b8d1467dbd3495c724bf3661b593.tar.xz
org.eclipse.ecf-09212c8c8538b8d1467dbd3495c724bf3661b593.zip
Update to RSACommands for bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=532078 Change-Id: I0000000000000000000000000000000000000000
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/TimeServiceConsumer.generic.zeroconf.product8
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.edef.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product7
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jgroups.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeroconf.product5
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product8
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeroconf.product5
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product8
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF1
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product2
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product3
-rw-r--r--examples/bundles/com.mycorp.examples.timeservice.host/src/com/mycorp/examples/timeservice/host/Activator.java10
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/products/Hello Service Consumer RS.product52
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (edef,generic).product15
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,generic).product15
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,r-osgi).product15
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,generic).product18
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,r-osgi).product18
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/products/Hello Service Consumer DS (zeroconf,generic).product15
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product6
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/products/Hello Service Host RS.product59
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (edef,generic).product15
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product15
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,rosgi).product15
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,generic).product18
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,rosgi).product18
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml20
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java403
45 files changed, 420 insertions, 402 deletions
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/TimeServiceConsumer.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/TimeServiceConsumer.generic.zeroconf.product
index a7a810621..8bc4ce453 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/TimeServiceConsumer.generic.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/TimeServiceConsumer.generic.zeroconf.product
@@ -10,12 +10,7 @@
<programArgs>-consoleLog -console
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.generic.server.java8
--Decf.generic.server.java8.port=3288
--Decf.generic.server.java8.hostname=localhost
--Decf.exported.async.interfaces=*
+-Dosgi.noShutdown=true
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
@@ -47,6 +42,7 @@
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.edef.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.edef.product
index 5387d10fa..e9aad8b5f 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.edef.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.edef.product
@@ -11,7 +11,6 @@
</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
@@ -41,10 +40,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.remoteservice"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product
index 4d1f4ae94..0fad5cede 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.generic.etcd.product
@@ -11,11 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.generic.server.java8
--Decf.generic.server.java8.port=3288
--Decf.generic.server.java8.hostname=localhost
--Decf.exported.async.interfaces=*
-Decf.discovery.etcd.hostname=127.0.0.1
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
@@ -43,10 +38,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.etcd"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jgroups.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jgroups.zeroconf.product
index 2d1c7b5fa..7f3a8c83b 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jgroups.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jgroups.zeroconf.product
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Djava.net.preferIPv4Stack=true
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
@@ -38,10 +37,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jgroups"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeroconf.product
index d8580b157..5e6b26ebe 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.jms.zeroconf.product
@@ -10,8 +10,7 @@
<programArgs>-consoleLog -console
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
+-Dosgi.noShutdown=true
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
@@ -39,10 +38,12 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product
index 4a547a7a5..f7c75f24c 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Dservice.exported.configs=ecf.r_osgi.peer.ws
-Dch.ethz.iks.r_osgi.transport.http.listen=false
-Dch.ethz.iks.r_osgi.topic.filter=*
@@ -47,6 +46,7 @@
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product
index 806c6bf0a..1b89dc928 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Dservice.exported.configs=ecf.r_osgi.peer.wss
-Dch.ethz.iks.r_osgi.transport.http.listen=false
-Djavax.net.ssl.keyStore=security/server.ks
@@ -51,6 +50,7 @@
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.zeroconf.product
index f1ddd4735..88bc58e03 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.rosgi.zeroconf.product
@@ -11,7 +11,6 @@
</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>
@@ -40,10 +39,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
index 1fd6011b7..2162b12ce 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
@@ -38,10 +38,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
<plugin id="org.eclipse.ecf.provider.xmlrpc"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product
index 488bc235c..d83bf0e0d 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/TimeServiceConsumer.generic.zeroconf.product
@@ -10,12 +10,7 @@
<programArgs>-consoleLog -console
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
--Dservice.exported.configs=ecf.generic.server.java8
--Decf.generic.server.java8.port=3288
--Decf.generic.server.java8.hostname=localhost
--Decf.exported.async.interfaces=*
+-Dosgi.noShutdown=true
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
@@ -47,6 +42,7 @@
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product
index fe59b1567..db3deefb2 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.edef.product
@@ -41,10 +41,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.remoteservice"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product
index 0d5a382f4..c245a2129 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.generic.etcd.product
@@ -43,10 +43,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.etcd"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.product
index 19d5dcdd1..a26379735 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jgroups.zeroconf.product
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Djava.net.preferIPv4Stack=true
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
@@ -38,10 +37,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jgroups"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeroconf.product
index cef331ce6..abefa3556 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.jms.zeroconf.product
@@ -10,8 +10,7 @@
<programArgs>-consoleLog -console
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
--Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
+-Dosgi.noShutdown=true
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
@@ -39,10 +38,12 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product
index 0c5534681..aae5733e3 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.ws.zeroconf.product
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Dservice.exported.configs=ecf.r_osgi.peer.ws
-Dch.ethz.iks.r_osgi.transport.http.listen=false
-Dch.ethz.iks.r_osgi.topic.filter=*
@@ -47,6 +46,7 @@
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product
index 97d55f90e..bbcb47dd7 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.wss.zeroconf.product
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Dservice.exported.configs=ecf.r_osgi.peer.wss
-Dch.ethz.iks.r_osgi.transport.http.listen=false
-Djavax.net.ssl.keyStore=security/server.ks
@@ -51,6 +50,7 @@
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product
index e1bf377fc..18ac8e8a0 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.rosgi.zeroconf.product
@@ -11,7 +11,6 @@
</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>
@@ -40,10 +39,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
index 9a087bbea..e4180f90b 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
@@ -38,10 +38,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
<plugin id="org.eclipse.ecf.provider.xmlrpc"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product
index ffa40729a..3e2cfb457 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer/launch/TimeServiceConsumer.generic.zeroconf.product
@@ -10,11 +10,7 @@
<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
+-Dosgi.noShutdown=true
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
@@ -40,10 +36,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF
index d13a03adc..1b52d72db 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-Vendor: Eclipse.org - ECF
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Import-Package: com.mycorp.examples.timeservice;version="1.0.0",
- org.eclipse.ecf.osgi.services.remoteserviceadmin;version="1.2.0",
org.osgi.framework,
org.osgi.service.remoteserviceadmin;version="1.1.0"
Bundle-Activator: com.mycorp.examples.timeservice.host.Activator
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product
index 6bc3b85ea..c9d3408ac 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/TimeServiceHost.generic.zeroconf.product
@@ -11,7 +11,6 @@
</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
@@ -47,6 +46,7 @@
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product
index 9144f4b0e..b77d8730d 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.generic.etcd.product
@@ -11,7 +11,6 @@
</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
@@ -44,10 +43,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.etcd"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product
index 75bdf0248..07ed87ba2 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Dservice.exported.configs=ecf.jgroups.manager
-Decf.jgroups.manager.id=jgroups:exampleTimeServiceGroup
-Djava.net.preferIPv4Stack=true
@@ -40,10 +39,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jgroups"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product
index d310ed441..fb419956c 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jms.zeroconf.product
@@ -42,11 +42,13 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.datashare"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product
index d97b6b754..ff1fcaa97 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.ws.zeroconf.product
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Dservice.exported.configs=ecf.r_osgi.peer.ws
-Decf.r_osgi.peer.ws.id=r-osgi.ws://localhost
-Dch.ethz.iks.r_osgi.transport.registerHttps=false
@@ -44,10 +43,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product
index 1dbdf0f88..6ab6a1e5a 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.rosgi.wss.zeroconf.product
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Dservice.exported.configs=ecf.r_osgi.peer.wss
-Decf.r_osgi.peer.wss.id=r-osgi.wss://localhost
-Dch.ethz.iks.r_osgi.transport.registerHttp=false
@@ -48,10 +47,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
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 315d8f492..18684f4e2 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
@@ -11,7 +11,6 @@
</programArgs>
<vmArgs>-Declipse.ignoreApp=true
-Dosgi.noShutdown=true
--DverboseRemoteServiceAdmin=true
-Dservice.exported.configs=ecf.r_osgi.peer
-Decf.exported.async.interfaces=*
-Dch.ethz.iks.r_osgi.topic.filter=*
@@ -42,10 +41,12 @@
<plugin id="org.apache.felix.scr"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.identity"/>
<plugin id="org.eclipse.ecf.osgi.services.distribution"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
index 8a815e5e3..010701a68 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
@@ -11,7 +11,6 @@
</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
@@ -46,10 +45,12 @@
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/src/com/mycorp/examples/timeservice/host/Activator.java b/examples/bundles/com.mycorp.examples.timeservice.host/src/com/mycorp/examples/timeservice/host/Activator.java
index 33721b3d0..4eef7aa49 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/src/com/mycorp/examples/timeservice/host/Activator.java
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/src/com/mycorp/examples/timeservice/host/Activator.java
@@ -12,27 +12,17 @@ import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Properties;
-import org.eclipse.ecf.osgi.services.remoteserviceadmin.DebugRemoteServiceAdminListener;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener;
import com.mycorp.examples.timeservice.ITimeService;
public class Activator implements BundleActivator {
- private static final boolean verbose = Boolean.valueOf(System.getProperty(
- "verboseRemoteServiceAdmin", "true"));
-
private ServiceRegistration<ITimeService> timeServiceRegistration;
public void start(BundleContext context) throws Exception {
- // If verbose is not turned off then register debug listener
- if (verbose)
- context.registerService(RemoteServiceAdminListener.class,
- new DebugRemoteServiceAdminListener(), null);
-
// Create remote service properties
Dictionary<String, Object> props = createRemoteServiceProperties();
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/products/Hello Service Consumer RS.product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/products/Hello Service Consumer RS.product
deleted file mode 100644
index 9c5f22097..000000000
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/products/Hello Service Consumer RS.product
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console</programArgs>
- <vmArgs>-Declipse.ignoreApp=true -Dosgi.noShutdown=true</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
- </launcherArgs>
-
- <plugins>
- <plugin id="ch.ethz.iks.r_osgi.remote"/>
- <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.discovery"/>
- <plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
- <plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer.rs"/>
- <plugin id="org.eclipse.ecf.identity"/>
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
- <plugin id="org.eclipse.ecf.provider"/>
- <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.app"/>
- <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.objectweb.asm"/>
- </plugins>
-
- <configurations>
- <plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer.rs" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (edef,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (edef,generic).product
index 0cc3b9bf1..346f54f89 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (edef,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (edef,generic).product
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Generic Hello Consumer EDEF Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.edef.generic" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="Generic Hello Consumer EDEF Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.edef.generic" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
<launcherArgs>
- <programArgs>-console -consoleLog -containerType ecf.generic.client</programArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ <programArgs>-console -consoleLog -containerType ecf.generic.client
+ </programArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -22,7 +23,6 @@
</vm>
<plugins>
- <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"/>
@@ -30,6 +30,7 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer"/>
@@ -37,10 +38,12 @@
<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.console"/>
<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.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,generic).product
index 9ab46a69e..eef5f7d00 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,generic).product
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Generic Hello Consumer Zeroconf Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.zeroconf.generic" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="Generic Hello Consumer Zeroconf Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.zeroconf.generic" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
<launcherArgs>
- <programArgs>-console -consoleLog -containerType ecf.generic.client</programArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ <programArgs>-console -consoleLog -containerType ecf.generic.client
+ </programArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -22,7 +23,6 @@
</vm>
<plugins>
- <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"/>
@@ -30,17 +30,20 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer"/>
<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.console"/>
<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"/>
+ <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
<plugin id="org.eclipse.ecf.sharedobject"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,r-osgi).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,r-osgi).product
index 8e45160a1..f3cc104b6 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,r-osgi).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zeroconf,r-osgi).product
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="R-OSGi Hello Consumer Zeroconf Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.zeroconf.rosgi" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="R-OSGi Hello Consumer Zeroconf Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.zeroconf.rosgi" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
<launcherArgs>
- <programArgs>-console -consoleLog</programArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ <programArgs>-console -consoleLog
+ </programArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<windowImages/>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -26,7 +27,6 @@
<plugins>
<plugin id="ch.ethz.iks.r_osgi.remote"/>
<plugin id="ch.ethz.iks.slp"/>
- <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"/>
@@ -34,17 +34,20 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer"/>
<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.console"/>
<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.remoteservice"/>
+ <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
<plugin id="org.eclipse.ecf.sharedobject"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,generic).product
index 4bb1c6113..0949783ef 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,generic).product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Generic Hello Consumer Zookeeper Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.zookeeper.generic" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="Generic Hello Consumer Zookeeper Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.zookeeper.generic" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
@@ -9,18 +9,20 @@
<launcherArgs>
<programArgs>-console
-consoleLog
--containerType ecf.generic.client</programArgs>
+-containerType ecf.generic.client
+ </programArgs>
<vmArgs>-Dzoodiscovery.autoStart=true;
-Dzoodiscovery.flavor=zoodiscovery.flavor.standalone=localhost:2001;clientPort=2002
-Xms40m
--Xmx512m</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+-Xmx512m
+ </vmArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<windowImages/>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -30,7 +32,6 @@
</vm>
<plugins>
- <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"/>
@@ -40,17 +41,20 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer"/>
<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.console"/>
<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.provider.zookeeper"/>
- <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.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,r-osgi).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,r-osgi).product
index 300633f97..6d8d7b120 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,r-osgi).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/products/Hello Service Consumer (zookeeper,r-osgi).product
@@ -1,24 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="R-OSGi Hello Consumer Zookeeper Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.zookeeper.rosgi" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="R-OSGi Hello Consumer Zookeeper Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.consumer.zookeeper.rosgi" application="org.eclipse.ecf.examples.remoteservices.hello.consumer.HelloConsumer" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
<launcherArgs>
- <programArgs>-console -consoleLog</programArgs>
+ <programArgs>-console -consoleLog
+ </programArgs>
<vmArgs>-Dzoodiscovery.autoStart=true;
-Dzoodiscovery.flavor=zoodiscovery.flavor.standalone=localhost:2001;clientPort=2002
-Xms40m
--Xmx512m</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+-Xmx512m
+ </vmArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<windowImages/>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -29,7 +31,6 @@
<plugins>
<plugin id="ch.ethz.iks.r_osgi.remote"/>
- <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"/>
@@ -39,17 +40,20 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer"/>
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.r_osgi"/>
<plugin id="org.eclipse.ecf.provider.zookeeper"/>
- <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.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/products/Hello Service Consumer DS (zeroconf,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/products/Hello Service Consumer DS (zeroconf,generic).product
index cff17d4eb..dfcdc56bc 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/products/Hello Service Consumer DS (zeroconf,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/products/Hello Service Consumer DS (zeroconf,generic).product
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="ECF Remote Services Example Hello DS" uid="org.eclipse.ecf.examples.remoteservices.hello.ds.consumer.product" application="org.eclipse.ecf.examples.remoteservices.hello.ds.consumer.HelloConsumerDS" version="3.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="ECF Remote Services Example Hello DS" uid="org.eclipse.ecf.examples.remoteservices.hello.ds.consumer.product" application="org.eclipse.ecf.examples.remoteservices.hello.ds.consumer.HelloConsumerDS" version="3.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
<launcherArgs>
- <programArgs>-console -consoleLog</programArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ <programArgs>-console -consoleLog
+ </programArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -22,7 +23,6 @@
</vm>
<plugins>
- <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"/>
@@ -30,17 +30,20 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.ds.consumer"/>
<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.console"/>
<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"/>
+ <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
<plugin id="org.eclipse.ecf.sharedobject"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product
index eb2a11f7f..7332726f5 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="ECF Remote Service Example DS Host" uid="org.eclipse.ecf.examples.remoteservices.hello.ds.host.product" application="org.eclipse.ecf.examples.remoteservices.hello.ds.host.HelloHostDS" version="2.1.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="ECF Remote Service Example DS Host" uid="org.eclipse.ecf.examples.remoteservices.hello.ds.host.product" application="org.eclipse.ecf.examples.remoteservices.hello.ds.host.HelloHostDS" version="2.2.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
@@ -16,7 +16,6 @@
<windowImages/>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -26,7 +25,6 @@
</vm>
<plugins>
- <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"/>
@@ -34,12 +32,14 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.ds.host"/>
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/products/Hello Service Host RS.product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/products/Hello Service Host RS.product
deleted file mode 100644
index 744a52b65..000000000
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/products/Hello Service Host RS.product
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product application="org.eclipse.ui.ide.workbench" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console</programArgs>
- <vmArgs>-Declipse.ignoreApp=true -Dosgi.noShutdown=true</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
- </launcherArgs>
-
- <launcher>
- <solaris/>
- <win useIco="false">
- <bmp/>
- </win>
- </launcher>
-
- <vm>
- </vm>
-
- <plugins>
- <plugin id="ch.ethz.iks.r_osgi.remote"/>
- <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.jobs"/>
- <plugin id="org.eclipse.ecf"/>
- <plugin id="org.eclipse.ecf.discovery"/>
- <plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
- <plugin id="org.eclipse.ecf.examples.remoteservices.hello.host.rs"/>
- <plugin id="org.eclipse.ecf.identity"/>
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
- <plugin id="org.eclipse.ecf.provider"/>
- <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.event"/>
- <plugin id="org.eclipse.equinox.registry"/>
- <plugin id="org.eclipse.osgi"/>
- <plugin id="org.eclipse.osgi.services"/>
- <plugin id="org.objectweb.asm"/>
- </plugins>
-
- <configurations>
- <plugin id="org.eclipse.ecf.examples.remoteservices.hello.host.rs" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
- </configurations>
-
-</product>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (edef,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (edef,generic).product
index 06140c47e..f16f5ab64 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (edef,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (edef,generic).product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Generic Hello Host EDEF Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.edef.generic" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="Generic Hello Host EDEF Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.edef.generic" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
@@ -9,12 +9,13 @@
<launcherArgs>
<programArgs>-containerType ecf.generic.server
-containerId ecftcp://localhost:3787/server
--consoleLog</programArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+-consoleLog
+ </programArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -24,7 +25,6 @@
</vm>
<plugins>
- <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"/>
@@ -32,16 +32,19 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.host"/>
<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.console"/>
<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.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product
index cef4d4224..59cd7717a 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,generic).product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Generic Hello Host Zeroconf Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.zeroconf.generic" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="Generic Hello Host Zeroconf Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.zeroconf.generic" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
@@ -10,12 +10,13 @@
<programArgs>-containerType ecf.generic.server
-containerId ecftcp://localhost:3787/server
-console
--consoleLog</programArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+-consoleLog
+ </programArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -25,7 +26,6 @@
</vm>
<plugins>
- <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"/>
@@ -33,17 +33,20 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.host"/>
<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.console"/>
<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"/>
+ <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
<plugin id="org.eclipse.ecf.sharedobject"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,rosgi).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,rosgi).product
index fc3acbcb9..af4cbf1b1 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,rosgi).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zeroconf,rosgi).product
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="R-OSGI Hello Host Zeroconf Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.zeroconf.rosgi" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="R-OSGI Hello Host Zeroconf Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.zeroconf.rosgi" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
<launcherArgs>
<programArgs>-console
--consoleLog</programArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+-consoleLog
+ </programArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -24,7 +25,6 @@
<plugins>
<plugin id="ch.ethz.iks.r_osgi.remote"/>
- <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"/>
@@ -32,17 +32,20 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.host"/>
<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.console"/>
<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.remoteservice"/>
+ <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
<plugin id="org.eclipse.ecf.sharedobject"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,generic).product
index 4a92d5493..2f07cbb32 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,generic).product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Generic Hello Host Zookeeper Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.zookeeper.generic" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="Generic Hello Host Zookeeper Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.zookeeper.generic" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
@@ -10,18 +10,20 @@
<programArgs>-console
-consoleLog
-containerType ecf.generic.server
--containerId ecftcp://localhost:3787/server</programArgs>
+-containerId ecftcp://localhost:3787/server
+ </programArgs>
<vmArgs>-Dzoodiscovery.dataDir=zookeeperdata2
-Dzoodiscovery.flavor=zoodiscovery.flavor.standalone=localhost:2002;clientPort=2001
-Xms40m
--Xmx512m</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+-Xmx512m
+ </vmArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<windowImages/>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -31,7 +33,6 @@
</vm>
<plugins>
- <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"/>
@@ -41,17 +42,20 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.host"/>
<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.console"/>
<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.provider.zookeeper"/>
- <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.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,rosgi).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,rosgi).product
index ddbb404c1..3ce73b091 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,rosgi).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/products/Hello Service Host (zookeeper,rosgi).product
@@ -1,24 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="R-OSGI Hello Host Zookeeper Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.zookeeper.rosgi" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="R-OSGI Hello Host Zookeeper Discovery" uid="org.eclipse.ecf.examples.remoteservices.hello.host.zookeeper.rosgi" application="org.eclipse.ecf.examples.remoteservices.hello.host.HelloHost" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
<launcherArgs>
- <programArgs>-console -consoleLog</programArgs>
+ <programArgs>-console -consoleLog
+ </programArgs>
<vmArgs>-Dzoodiscovery.dataDir=zookeeperdata2
-Dzoodiscovery.flavor=zoodiscovery.flavor.standalone=localhost:2002;clientPort=2001
-Xms40m
--Xmx512m</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+-Xmx512m
+ </vmArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<windowImages/>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -29,7 +31,6 @@
<plugins>
<plugin id="ch.ethz.iks.r_osgi.remote"/>
- <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"/>
@@ -39,17 +40,20 @@
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.console"/>
<plugin id="org.eclipse.ecf.discovery"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
<plugin id="org.eclipse.ecf.examples.remoteservices.hello.host"/>
<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.console"/>
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/>
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.r_osgi"/>
<plugin id="org.eclipse.ecf.provider.zookeeper"/>
- <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.app"/>
<plugin id="org.eclipse.equinox.common"/>
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
index e80c1fd1f..099220c25 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
@@ -2,16 +2,20 @@
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" immediate="true" name="org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand">
<property name="osgi.command.scope" value="ecf"/>
<property name="osgi.command.function">listexports
-lex
+lexps
listimports
-lim
-unexport
-une
-unimport
-uni
+limps
+unexportservice
+unexpsvc
+unimportservice
+unimpsvc
rsadebug
-rsexport
-rsimport
+exportservice
+expsvc
+importservice
+impsvc
+updateservice
+updsvc
</property>
<service>
<provide interface="org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand"/>
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java
index 439d553d1..adcd76031 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.command.Descriptor;
import org.apache.felix.service.command.Parameter;
import org.eclipse.ecf.console.AbstractCommand;
import org.eclipse.ecf.core.IContainerManager;
@@ -46,20 +47,30 @@ import org.osgi.service.component.annotations.Reference;
import org.osgi.service.remoteserviceadmin.RemoteConstants;
@Component(immediate = true, property = { "osgi.command.scope=ecf", "osgi.command.function=listexports",
- "osgi.command.function=lex", "osgi.command.function=listimports", "osgi.command.function=lim",
- "osgi.command.function=unexport", "osgi.command.function=une", "osgi.command.function=unimport",
- "osgi.command.function=uni",
- "osgi.command.function=rsadebug",
- "osgi.command.function=rsexport",
- "osgi.command.function=rsimport" }, service = { RSACommand.class, Converter.class })
+ "osgi.command.function=lexps", "osgi.command.function=listimports", "osgi.command.function=limps",
+ "osgi.command.function=unexportservice", "osgi.command.function=unexpsvc",
+ "osgi.command.function=unimportservice", "osgi.command.function=unimpsvc", "osgi.command.function=rsadebug",
+ "osgi.command.function=exportservice", "osgi.command.function=expsvc", "osgi.command.function=importservice",
+ "osgi.command.function=impsvc", "osgi.command.function=updateservice",
+ "osgi.command.function=updsvc" }, service = { RSACommand.class, Converter.class })
public class RSACommand extends AbstractCommand implements Converter {
- private static final boolean DEBUGON = Boolean
- .parseBoolean(System.getProperty("org.eclipse.ecf.osgi.services.remoteserviceadmin.debug", "true"));
+ private static final String DEFAULT_EXPORT_CONFIG = System.getProperty(
+ "org.eclipse.ecf.osgi.services.remoteserviceadmin.console.defaultconfig", "ecf.generic.server");
+
+ private static final boolean DEBUGON = Boolean.parseBoolean(
+ System.getProperty("org.eclipse.ecf.osgi.services.remoteserviceadmin.console.rsadebug", "true"));
+
+ private static final String EXPORT_LINE_FORMAT = System.getProperty(
+ "org.eclipse.ecf.osgi.services.remoteserviceadmin.console.exportlineformat", "%1$-37s|%2$-45s|%3$s");
+ private static final String IMPORT_LINE_FORMAT = System.getProperty(
+ "org.eclipse.ecf.osgi.services.remoteserviceadmin.console.importlineformat", "%1$-37s|%2$-45s|%3$s");
private IContainerManager containerManager;
private IIDFactory idFactory;
private RemoteServiceAdmin rsa;
+ private BundleContext context;
+ private ServiceRegistration<?> debugReg;
@Reference
void bindContainerManager(IContainerManager cm) {
@@ -102,6 +113,114 @@ public class RSACommand extends AbstractCommand implements Converter {
return this.rsa;
}
+ private List<RemoteServiceAdmin.ExportReference> getExports() {
+ List<RemoteServiceAdmin.ExportReference> results = new ArrayList<RemoteServiceAdmin.ExportReference>();
+ for (org.osgi.service.remoteserviceadmin.ExportReference er : getRSA().getExportedServices())
+ results.add((RemoteServiceAdmin.ExportReference) er);
+ return results;
+ }
+
+ private List<RemoteServiceAdmin.ImportReference> getImports() {
+ List<RemoteServiceAdmin.ImportReference> results = new ArrayList<RemoteServiceAdmin.ImportReference>();
+ for (org.osgi.service.remoteserviceadmin.ImportReference er : getRSA().getImportedEndpoints())
+ results.add((RemoteServiceAdmin.ImportReference) er);
+ return results;
+ }
+
+ public Object convert(Class<?> desiredType, Object in) throws Exception {
+ if (desiredType == RemoteServiceAdmin.ExportReference.class && in instanceof String)
+ return getExportReferenceForIdOrContainerId((String) in);
+ else if (desiredType == RemoteServiceAdmin.ExportReference.class && in instanceof Long)
+ return getExportReferenceForServiceId((Long) in);
+ else if (desiredType == RemoteServiceAdmin.ImportReference.class && in instanceof String)
+ return getImportReferenceForIdOrContainerId((String) in);
+ else if (desiredType == RemoteServiceAdmin.ExportReference.class && in instanceof Long)
+ return getImportReferenceForServiceId((Long) in);
+
+ return null;
+ }
+
+ private String formatExportReference(RemoteServiceAdmin.ExportReference er, int level, Converter escape) {
+ EndpointDescription ed = (EndpointDescription) er.getExportedEndpoint();
+ if (ed == null)
+ return null;
+ return formatReference(EXPORT_LINE_FORMAT, ed, ed.getContainerID().getName(), ed.getServiceId(), level, escape);
+ }
+
+ private String formatReference(String lineFormat, EndpointDescription ed, String containerId, long serviceId,
+ int level, Converter escape) {
+ if (ed == null)
+ return null;
+ switch (level) {
+ case Converter.PART:
+ return null;
+ case Converter.LINE:
+ return formatLine(lineFormat, ed.getId(), containerId, serviceId);
+ case Converter.INSPECT:
+ return formatEndpoint(ed);
+ default:
+ return null;
+ }
+ }
+
+ private String formatImportReference(RemoteServiceAdmin.ImportReference ir, int level, Converter escape) {
+ ID localContainerID = ir.getLocalContainerID();
+ if (localContainerID == null)
+ return null;
+ @SuppressWarnings("rawtypes")
+ ServiceReference ref = ir.getImportedService();
+ if (ref == null)
+ return null;
+ return formatReference(IMPORT_LINE_FORMAT, (EndpointDescription) ir.getImportedEndpoint(),
+ localContainerID.getName(), (Long) ref.getProperty(Constants.SERVICE_ID), level, escape);
+ }
+
+ private String formatEndpoint(EndpointDescription ed) {
+ EndpointDescriptionWriter edw = new EndpointDescriptionWriter();
+ StringWriter sw = new StringWriter();
+ try {
+ edw.writeEndpointDescription(sw, ed);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return null;
+ }
+ return formatLine("%s", sw.toString());
+ }
+
+ public String format(Object target, int level, Converter escape) {
+ if (target instanceof RemoteServiceAdmin.ExportReference)
+ return formatExportReference((RemoteServiceAdmin.ExportReference) target, level, escape);
+ else if (target instanceof RemoteServiceAdmin.ImportReference)
+ return formatImportReference((RemoteServiceAdmin.ImportReference) target, level, escape);
+ return null;
+ }
+
+ @Activate
+ void activate(BundleContext context) {
+ this.context = context;
+ if (DEBUGON)
+ debugOn();
+ }
+
+ @Deactivate
+ void deactivate() {
+ debugOff();
+ }
+
+ synchronized void debugOff() {
+ if (debugReg != null) {
+ debugReg.unregister();
+ debugReg = null;
+ }
+ }
+
+ synchronized void debugOn() {
+ if (debugReg == null)
+ debugReg = this.context.registerService(
+ org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener.class,
+ new DebugRemoteServiceAdminListener(), null);
+ }
+
private RemoteServiceAdmin.ExportReference getExportReferenceForIdOrContainerId(String exportRefId) {
for (RemoteServiceAdmin.ExportReference r : getExports()) {
EndpointDescription ed = (EndpointDescription) r.getExportedEndpoint();
@@ -162,44 +281,54 @@ public class RSACommand extends AbstractCommand implements Converter {
return null;
}
- public static final String EXPORT_LINE_FORMAT = "%1$-37s|%2$-45s|%3$s";
- public static final String IMPORT_LINE_FORMAT = "%1$-37s|%2$-45s|%3$s";
-
+ @Descriptor("List RSA exported services")
public List<RemoteServiceAdmin.ExportReference> listexports(CommandSession cs) {
consoleLine(cs, EXPORT_LINE_FORMAT, "Endpoint Id", "Exporting Container ID", "Exported Service Id\n");
return getExports();
}
- public List<RemoteServiceAdmin.ExportReference> lex(CommandSession cs) {
+ @Descriptor("List RSA exported services")
+ public List<RemoteServiceAdmin.ExportReference> lexps(CommandSession cs) {
return listexports(cs);
}
- public RemoteServiceAdmin.ExportReference listexports(RemoteServiceAdmin.ExportReference r) {
+ @Descriptor("Details about a single RSA exported service")
+ public RemoteServiceAdmin.ExportReference listexports(
+ @Descriptor("The Endpoint Id of the exported service") RemoteServiceAdmin.ExportReference r) {
return r;
}
- public RemoteServiceAdmin.ExportReference lex(RemoteServiceAdmin.ExportReference r) {
+ @Descriptor("Details about a single RSA exported service")
+ public RemoteServiceAdmin.ExportReference lexps(
+ @Descriptor("The Endpoint Id of the exported service") RemoteServiceAdmin.ExportReference r) {
return r;
}
+ @Descriptor("List RSA imported services")
public List<RemoteServiceAdmin.ImportReference> listimports(CommandSession cs) {
consoleLine(cs, IMPORT_LINE_FORMAT, "Endpoint Id", "Importing Container ID", "Imported Service Id\n");
return getImports();
}
- public List<RemoteServiceAdmin.ImportReference> lim(CommandSession cs) {
+ @Descriptor("List RSA imported services")
+ public List<RemoteServiceAdmin.ImportReference> limps(CommandSession cs) {
return listimports(cs);
}
- public RemoteServiceAdmin.ImportReference listimports(RemoteServiceAdmin.ImportReference r) {
+ @Descriptor("Details about a single RSA imported service")
+ public RemoteServiceAdmin.ImportReference listimports(
+ @Descriptor("The Endpoint Id of the exported service") RemoteServiceAdmin.ImportReference r) {
return r;
}
- public RemoteServiceAdmin.ImportReference lim(RemoteServiceAdmin.ImportReference r) {
+ @Descriptor("Details about a single RSA imported service")
+ public RemoteServiceAdmin.ImportReference limps(
+ @Descriptor("The Endpoint Id of the exported service") RemoteServiceAdmin.ImportReference r) {
return r;
}
- public String unexport(String endpointId) {
+ @Descriptor("Unexport an RSA exported service")
+ public String unexportservice(@Descriptor("The Endpoint Id of the exported service") String endpointId) {
RemoteServiceAdmin.ExportRegistration reg = getExportRegistrationForId(endpointId);
if (reg != null) {
reg.close();
@@ -208,11 +337,13 @@ public class RSACommand extends AbstractCommand implements Converter {
return endpointId + " not found";
}
- public String une(String endpointId) {
- return unexport(endpointId);
+ @Descriptor("Unexport an RSA exported service")
+ public String unexpsvc(@Descriptor("The Endpoint Id of the exported service") String endpointId) {
+ return unexportservice(endpointId);
}
- public String unimport(String endpointId) {
+ @Descriptor("Unimport an RSA imported service")
+ public String unimportservice(@Descriptor("The Endpoint Id of the imported service") String endpointId) {
RemoteServiceAdmin.ImportRegistration reg = getImportRegistrationForId(endpointId);
if (reg != null) {
reg.close();
@@ -221,173 +352,91 @@ public class RSACommand extends AbstractCommand implements Converter {
return endpointId + " not found";
}
- public String uni(String endpointId) {
- return unimport(endpointId);
+ @Descriptor("Unimport an RSA imported service")
+ public String unimpsvc(@Descriptor("The Endpoint Id of the imported service") String endpointId) {
+ return unimportservice(endpointId);
}
- private List<RemoteServiceAdmin.ExportReference> getExports() {
- List<RemoteServiceAdmin.ExportReference> results = new ArrayList<RemoteServiceAdmin.ExportReference>();
- for (org.osgi.service.remoteserviceadmin.ExportReference er : getRSA().getExportedServices())
- results.add((RemoteServiceAdmin.ExportReference) er);
- return results;
- }
-
- public List<RemoteServiceAdmin.ImportReference> getImports() {
- List<RemoteServiceAdmin.ImportReference> results = new ArrayList<RemoteServiceAdmin.ImportReference>();
- for (org.osgi.service.remoteserviceadmin.ImportReference er : getRSA().getImportedEndpoints())
- results.add((RemoteServiceAdmin.ImportReference) er);
- return results;
- }
-
- public Object convert(Class<?> desiredType, Object in) throws Exception {
- if (desiredType == RemoteServiceAdmin.ExportReference.class && in instanceof String)
- return getExportReferenceForIdOrContainerId((String) in);
- else if (desiredType == RemoteServiceAdmin.ExportReference.class && in instanceof Long)
- return getExportReferenceForServiceId((Long) in);
- else if (desiredType == RemoteServiceAdmin.ImportReference.class && in instanceof String)
- return getImportReferenceForIdOrContainerId((String) in);
- else if (desiredType == RemoteServiceAdmin.ExportReference.class && in instanceof Long)
- return getImportReferenceForServiceId((Long) in);
-
- return null;
- }
-
- private String formatExportReference(RemoteServiceAdmin.ExportReference er, int level, Converter escape) {
- EndpointDescription ed = (EndpointDescription) er.getExportedEndpoint();
- if (ed == null)
- return null;
- return formatReference(EXPORT_LINE_FORMAT, ed, ed.getContainerID().getName(), ed.getServiceId(), level, escape);
- }
-
- private String formatReference(String lineFormat, EndpointDescription ed, String containerId, long serviceId,
- int level, Converter escape) {
- if (ed == null)
- return null;
- switch (level) {
- case Converter.PART:
- return null;
- case Converter.LINE:
- return formatLine(lineFormat, ed.getId(), containerId, serviceId);
- case Converter.INSPECT:
- return formatEndpoint(ed);
- default:
- return null;
- }
- }
-
- private String formatImportReference(RemoteServiceAdmin.ImportReference ir, int level, Converter escape) {
- ID localContainerID = ir.getLocalContainerID();
- if (localContainerID == null)
- return null;
- @SuppressWarnings("rawtypes")
- ServiceReference ref = ir.getImportedService();
- if (ref == null)
- return null;
- return formatReference(IMPORT_LINE_FORMAT, (EndpointDescription) ir.getImportedEndpoint(),
- localContainerID.getName(), (Long) ref.getProperty(Constants.SERVICE_ID), level, escape);
- }
-
- private String formatEndpoint(EndpointDescription ed) {
- EndpointDescriptionWriter edw = new EndpointDescriptionWriter();
- StringWriter sw = new StringWriter();
- try {
- edw.writeEndpointDescription(sw, ed);
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
- return formatLine("%s", sw.toString());
- }
-
- public String format(Object target, int level, Converter escape) {
- if (target instanceof RemoteServiceAdmin.ExportReference)
- return formatExportReference((RemoteServiceAdmin.ExportReference) target, level, escape);
- else if (target instanceof RemoteServiceAdmin.ImportReference)
- return formatImportReference((RemoteServiceAdmin.ImportReference) target, level, escape);
- return null;
- }
-
- private BundleContext context;
- private ServiceRegistration<?> debugReg;
-
- @Activate
- void activate(BundleContext context) {
- this.context = context;
- if (DEBUGON)
- debugOn();
- }
-
- @Deactivate
- void deactivate() {
- debugOff();
- }
-
- synchronized void debugOff() {
- if (debugReg != null) {
- debugReg.unregister();
- debugReg = null;
+ @Descriptor("Toggle whether RSA debug output is output to console")
+ public String rsadebug() {
+ synchronized (this) {
+ return rsadebug(debugReg == null);
}
}
- synchronized void debugOn() {
- if (debugReg == null)
- debugReg = this.context.registerService(
- org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener.class,
- new DebugRemoteServiceAdminListener(), null);
- }
-
- public String rsadebug(boolean on) {
+ @Descriptor("Set whether RSA debug output is output to console")
+ public String rsadebug(@Descriptor("Whether to turn debug on or off") boolean on) {
String msg = null;
synchronized (this) {
if (debugReg == null) {
if (on) {
debugOn();
msg = "RSA debugging ON";
- } else
- msg = "RSA debugging already on";
+ } else
+ msg = "RSA debugging already off";
} else {
if (debugReg != null) {
debugOff();
msg = "RSA debugging OFF";
} else
- msg = "RSA debugging already off";
+ msg = "RSA debugging already on";
}
}
return msg;
}
- public RemoteServiceAdmin.ExportReference rsexport(CommandSession cs, @Parameter(names = { "-s", "--serviceid" }, absentValue = "") long serviceid,
- @Parameter(names = { "--properties", "-p" }, absentValue = "") Map<String,?> map) {
+ @Descriptor("Export a service via Remote Service Admin")
+ public RemoteServiceAdmin.ExportReference exportservice(CommandSession cs,
+ @Descriptor("service.id of service to export") long serviceid, @Parameter(names = {
+ "-props" }, absentValue = "") @Descriptor("Map of service properties for exporting the service") Map<String, ?> map) {
ServiceReference<?> ref = null;
try {
- ServiceReference<?>[] refs = context.getAllServiceReferences(null, "("+Constants.SERVICE_ID+"="+String.valueOf(serviceid)+")");
+ ServiceReference<?>[] refs = context.getAllServiceReferences(null,
+ "(" + Constants.SERVICE_ID + "=" + String.valueOf(serviceid) + ")");
if (refs == null || refs.length < 1)
- cs.getConsole().println("Cannot find service with id="+String.valueOf(serviceid));
+ cs.getConsole().println("Cannot find registered service with service.id=" + String.valueOf(serviceid));
ref = refs[0];
} catch (InvalidSyntaxException e) {
e.printStackTrace(cs.getConsole());
return null;
}
- Map<String,Object> op = new HashMap<String,Object>(map);
+ // Create map given map from console
+ Map<String, Object> op = (map == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(map);
if (!op.containsKey(RemoteConstants.SERVICE_EXPORTED_INTERFACES))
op.put(RemoteConstants.SERVICE_EXPORTED_INTERFACES, "*");
if (!op.containsKey(RemoteConstants.SERVICE_EXPORTED_CONFIGS))
- op.put(RemoteConstants.SERVICE_EXPORTED_CONFIGS, "ecf.generic.server");
+ op.put(RemoteConstants.SERVICE_EXPORTED_CONFIGS, DEFAULT_EXPORT_CONFIG);
+ // Now export service with reference and overriding properties
Collection<org.osgi.service.remoteserviceadmin.ExportRegistration> regs = getRSA().exportService(ref, op);
- for(org.osgi.service.remoteserviceadmin.ExportRegistration reg: regs) {
- Throwable t = reg.getException();
- if (t != null)
- t.printStackTrace(cs.getConsole());
- else {
- RemoteServiceAdmin.ExportReference er = (RemoteServiceAdmin.ExportReference) reg.getExportReference();
- if (er != null)
- return er;
+ // Should always return >= 1 registration
+ if (regs != null)
+ for (org.osgi.service.remoteserviceadmin.ExportRegistration reg : regs) {
+ Throwable t = reg.getException();
+ if (t != null)
+ t.printStackTrace(cs.getConsole());
+ else {
+ RemoteServiceAdmin.ExportReference er = (RemoteServiceAdmin.ExportReference) reg
+ .getExportReference();
+ if (er != null) {
+ cs.getConsole().println("Service.id=" + String.valueOf(serviceid)
+ + " successfully exported with endpoint description:");
+ return er;
+ }
+ }
}
- }
return null;
}
-
- public RemoteServiceAdmin.ImportReference rsimport(CommandSession cs, @Parameter(names = { "-e", "--endpointdescriptionurl" }, absentValue="") String endpointurl) {
+
+ @Descriptor("Export a service via Remote Service Admin")
+ public RemoteServiceAdmin.ExportReference expsvc(CommandSession cs,
+ @Descriptor("service.id of service to export") long serviceid) {
+ return exportservice(cs, serviceid, null);
+ }
+
+ @Descriptor("Import a remote service via Remote Service Admin. If -e is used, the given endpoint URL is read to read the EndpointDescription. If not used, an EndpointDescription is expected from the console input (e.g. copy and paste)")
+ public RemoteServiceAdmin.ImportReference importservice(CommandSession cs,
+ @Descriptor("Optional URL indicating location of an Endpoint Description (EDEF format)") @Parameter(names = {
+ "-e", "--endpointdescriptionurl" }, absentValue = "") String endpointurl) {
InputStream ins = null;
URL url = null;
if ("".equals(endpointurl)) {
@@ -417,18 +466,18 @@ public class RSACommand extends AbstractCommand implements Converter {
}
}
// Close the input stream if this was from a url
- if (url != null)
+ if (url != null)
try {
ins.close();
} catch (IOException e) {
e.printStackTrace(cs.getConsole());
}
-
+
ByteArrayInputStream bins = new ByteArrayInputStream(buf.toString().getBytes());
EndpointDescriptionReader r = new EndpointDescriptionReader();
org.osgi.service.remoteserviceadmin.EndpointDescription[] eds = null;
try {
- eds = r.readEndpointDescriptions(bins);
+ eds = r.readEndpointDescriptions(bins);
} catch (IOException e) {
e.printStackTrace(cs.getConsole());
return null;
@@ -444,11 +493,51 @@ public class RSACommand extends AbstractCommand implements Converter {
return null;
} else {
RemoteServiceAdmin.ImportReference ir = (RemoteServiceAdmin.ImportReference) reg.getImportReference();
- if (ir != null)
+ if (ir != null) {
+ EndpointDescription ed = (EndpointDescription) ir.getImportedEndpoint();
+ if (ed == null) {
+ cs.getConsole().println("Cannot get endpoint description for imported endpoint");
+ return null;
+ }
+ cs.getConsole().println("Endpoint id=" + ed.getId() + " with service.id="
+ + ir.getImportedService().getProperty(Constants.SERVICE_ID) + " successfully imported:");
return ir;
- else
+ } else
return null;
}
}
}
+
+ @Descriptor("Import a remote service via Remote Service Admin. If -e is used, the given endpoint URL is read to read the EndpointDescription. If not used, an EndpointDescription is expected from the console input (e.g. copy and paste)")
+ public RemoteServiceAdmin.ImportReference impsvc(CommandSession cs,
+ @Descriptor("Optional URL indicating location of an Endpoint Description (EDEF format)") @Parameter(names = {
+ "-e", "--endpointdescriptionurl" }, absentValue = "") String endpointurl) {
+ return importservice(cs, endpointurl);
+ }
+
+ @Descriptor("Update the properties of a remote service via Remote Service Admin")
+ public RemoteServiceAdmin.ExportReference updateservice(CommandSession cs,
+ @Descriptor("Endpoint Id of remote service to update") String endpointid,
+ @Descriptor("Map of properties for update") Map<String, ?> map) {
+ RemoteServiceAdmin.ExportRegistration ereg = getExportRegistrationForId(endpointid);
+ if (ereg == null) {
+ cs.getConsole().println("Cannot find export with endpointid=" + endpointid);
+ return null;
+ }
+ RemoteServiceAdmin.ExportReference eref = (RemoteServiceAdmin.ExportReference) ereg.getExportReference();
+ if (eref == null) {
+ cs.getConsole().println("The remote service with endpointid=" + endpointid + " has been closed");
+ return null;
+ }
+ ereg.update(map);
+ return eref;
+ }
+
+ @Descriptor("Update the properties of a remote service via Remote Service Admin")
+ public RemoteServiceAdmin.ExportReference updsvc(CommandSession cs,
+ @Descriptor("Endpoint Id of remote service to update") String endpointid,
+ @Descriptor("Map of properties for update") Map<String, ?> map) {
+ return updateservice(cs, endpointid, map);
+ }
+
}

Back to the top