dbus service : removing the method cloudeebus.Service.add

(to avoid the confusion with cloudeebus.BusConnection.addService)

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index f147ac4..8bc0649 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -168,24 +168,32 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
        var promise = new cloudeebus.Promise(function (resolver) {
          cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
        
-         function busServiceAddedSuccessCB(service) {
-                 try {
-                         service.isCreated = true;
-                         var result = [cloudeebusService];
-                         resolver.fulfill(result[0], true);
-                 }
-                 catch (e) {
-                         var errorStr = cloudeebus.getError(e);
-                         cloudeebus.log("Method callback exception: " + errorStr);
-                         resolver.reject(errorStr, true);
-                 }             
-         }
-       
-         function busServiceErrorSuccessCB(error) {
-                 resolver.reject(cloudeebus.getError(error), true);
-         }
-       
-         cloudeebusService.add(this).then(busServiceAddedSuccessCB, busServiceErrorSuccessCB);
+               function ServiceAddedSuccessCB(serviceName) {
+                       try { // calling dbus hook object function for un-translated types
+                               cloudeebusService.isCreated = true;
+                               var result = [ cloudeebusService ];
+                               resolver.fulfill(result[0], true);
+                       }
+                       catch (e) {
+                               var errorStr = cloudeebus.getError(e);
+                               cloudeebus.log("Method callback exception: " + errorStr);
+                               resolver.reject(errorStr, true);
+                       }               
+               }
+               
+               function ServiceAddedErrorCB(error) {
+                       var errorStr = cloudeebus.getError(error);
+                       cloudeebus.log("Error adding service method: " + self.name + ", error: " + errorStr);
+                       self.promise.resolver.reject(errorStr, true);
+               }
+
+               var arglist = [
+                   self.name,
+                   serviceName
+                   ];
+
+               // call dbusSend with bus type, destination, object, message and arguments
+               self.wampSession.call("serviceAdd", arglist).then(ServiceAddedSuccessCB, ServiceAddedErrorCB);
        });
        
        return promise;
@@ -231,39 +239,6 @@ cloudeebus.Service = function(session, busConnection, name) {
        return this;
 };
 
-cloudeebus.Service.prototype.add = function(promise) {
-       var self = this;
-       self.promise = promise;
-       var resolver = self.promise.resolver;
-       
-       function ServiceAddedSuccessCB(serviceName) {
-               try { // calling dbus hook object function for un-translated types
-                       var result = [self];
-                       resolver.fulfill(result[0], true);
-               }
-               catch (e) {
-                       var errorStr = cloudeebus.getError(e);
-                       cloudeebus.log("Method callback exception: " + errorStr);
-                       resolver.reject(errorStr, true);
-               }               
-       }
-       
-       function ServiceAddedErrorCB(error) {
-               var errorStr = cloudeebus.getError(error);
-               cloudeebus.log("Error adding service method: " + self.name + ", error: " + errorStr);
-               self.promise.resolver.reject(errorStr, true);
-       }
-
-       var arglist = [
-           this.busConnection,
-           this.name
-           ];
-
-       // call dbusSend with bus type, destination, object, message and arguments
-       this.wampSession.call("serviceAdd", arglist).then(ServiceAddedSuccessCB, ServiceAddedErrorCB);
-       return promise;
-};
-
 cloudeebus.Service.prototype.remove = function(successCB, errorCB) {
        function ServiceRemovedSuccessCB(serviceName) {
                if (successCB) {

diff --git a/cloudeebus/cloudeebus.py b/cloudeebus/cloudeebus.py
index 5a3eb4d..4e046d7 100755 (executable)
--- a/cloudeebus/cloudeebus.py
+++ b/cloudeebus/cloudeebus.py
@@ -592,7 +592,7 @@ class CloudeebusService:
         arguments: busName, srvName
         '''
         busName = list[0]
-        self.bus =  cache.dbusConnexion( busName['name'] )
+        self.bus =  cache.dbusConnexion( busName )
         self.srvName = list[1]
         if (self.services.has_key(self.srvName) == False):            
             self.services[self.srvName] = dbus.service.BusName(name = self.srvName, bus = self.bus)

diff --git a/doc/agent/server.html b/doc/agent/server.html
index df81774..f3ea25f 100644 (file)
--- a/doc/agent/server.html
+++ b/doc/agent/server.html
@@ -81,11 +81,11 @@ sampleObjectHandler2 = {
 
 function addAgents(service) {
   var agent1 = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample", sampleObjectHandler, sampleXml);
-  cloudeebus.log("Adding agent " + agent1.name + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler");
+  cloudeebus.log("Adding agent " + agent1.objectPath + " on " + service.name + ", mapped on Javascript object: 'sampleObjectHandler");
   service.addAgent(agent1, logCB, errorCB);
   
   var agent2 = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample2", sampleObjectHandler2, sampleXml);
-  cloudeebus.log("Adding agent " + agent2.name + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler2");
+  cloudeebus.log("Adding agent " + agent2.objectPath + " on " + service.name + ", mapped on Javascript object: 'sampleObjectHandler2");
   service.addAgent(agent2, logCB, errorCB);
 }