dbus service: remove unused attribute of cloudeebus.Agent ('srvName')

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index 7a888a3..04faaa4 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -205,8 +205,8 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
 //objPath : a DBus path to access it
 //jsHdl : a Javascript handler to process methods, 
 //xml : the xml which describe interface/methods/signals...
-cloudeebus.Agent = function(srvDbusName, objPath, jsHdl, xml) {
-       this.srvName = srvDbusName;
+cloudeebus.Agent = function(objPath, jsHdl, xml) {
+//     this.srvName = srvDbusName;
        this.xml = xml;
        this.objectPath = objPath;
        this.jsHdl = jsHdl;

diff --git a/cloudeebus/cloudeebus.py b/cloudeebus/cloudeebus.py
index fade6fe..bc69429 100755 (executable)
--- a/cloudeebus/cloudeebus.py
+++ b/cloudeebus/cloudeebus.py
@@ -619,9 +619,9 @@ class CloudeebusService:
         '''
         arguments: objectPath, xmlTemplate
         '''
-        self.agentObjectPath = list[0]
+        agentObjectPath = list[0]
         xmlTemplate = list[1]
-        className = createClassName(self.agentObjectPath)
+        className = createClassName(agentObjectPath)
         if (self.dynDBusClasses.has_key(className) == False):
             self.dynDBusClasses[className] = DynDBusClass(className, self.globalCtx, self.localCtx)
             self.dynDBusClasses[className].createDBusServiceFromXML(xmlTemplate)
@@ -629,10 +629,10 @@ class CloudeebusService:
 
         ## Class already exist, instanciate it if not already instanciated
         if (self.serviceAgents.has_key(className) == False):
-            self.serviceAgents[className] = eval(className + "(self.bus, callback=self.srvCB, objPath=self.agentObjectPath, busName=self.srvName)", self.globalCtx, self.localCtx)
+            self.serviceAgents[className] = eval(className + "(self.bus, callback=self.srvCB, objPath=agentObjectPath, busName=self.srvName)", self.globalCtx, self.localCtx)
             
         self.serviceAgents[className].add_to_connection()
-        return (self.agentObjectPath)
+        return (agentObjectPath)
                     
     @exportRpc
     def serviceDelAgent(self, list):

diff --git a/doc/agent/server.html b/doc/agent/server.html
index 63ef99b..7952612 100644 (file)
--- a/doc/agent/server.html
+++ b/doc/agent/server.html
@@ -60,7 +60,7 @@ sampleObjectHandler = {
 
 function addAgent(service) {
   window.gService = service;
-  var agent = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample", sampleObjectHandler, sampleXml);
+  var agent = new cloudeebus.Agent("/org/cloudeebus/Sample", sampleObjectHandler, sampleXml);
   cloudeebus.log("Adding agent " + agent.objectPath + " on " + service.name + ", mapped on Javascript object: 'sampleObjectHandler");
   service.addAgent(agent).then(logCB, errorCB);
   window.gAgent = agent;