dbus service : in callback serviceAdded(), return object instead of name

some code cleaning in server.html

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index 7e9d55c..ef9e343 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -141,10 +141,11 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName, successCB,
        function busServiceAddedSuccessCB(serviceName) {
                self.service = cloudeebusService;
                if (successCB)
-                       successCB(serviceName);
+                       successCB(cloudeebusService);
        }
        
        cloudeebusService.add(busServiceAddedSuccessCB, errorCB);
+       return cloudeebusService;
 };
 
 cloudeebus.BusConnection.prototype.removeService = function(serviceName, successCB, errorCB) {

diff --git a/doc/agent/server.html b/doc/agent/server.html
index 3d5e554..f7720c5 100644 (file)
--- a/doc/agent/server.html
+++ b/doc/agent/server.html
@@ -52,10 +52,11 @@ function releaseCalled() {
   cloudeebus.SessionBus().service.remove(logCB, errorCB);
 }
 
-function serviceAdded(servName) {
-  cloudeebus.SessionBus().service.registerMethod("org.cloudeebus.Sample#/org/cloudeebus/Sample#Add",addCalled);
-  cloudeebus.SessionBus().service.registerMethod("org.cloudeebus.Sample#/org/cloudeebus/Sample#Release",releaseCalled);
-  cloudeebus.SessionBus().service.addAgent("/org/cloudeebus/Sample", sampleXml, logCB, errorCB);
+function serviceAdded(service) {
+  var agentName = "/org/cloudeebus/Sample"; // = DBUS object name
+  cloudeebus.SessionBus().service.registerMethod(service.name + "#" + agentName + "#Add",addCalled);
+  cloudeebus.SessionBus().service.registerMethod(service.name + "#" + agentName + "#Release",releaseCalled);
+  cloudeebus.SessionBus().service.addAgent(agentName, sampleXml, logCB, errorCB);
 }
 
 function connectSuccess() {