fix agent constructor signature, bump version 0.5.100

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index 4d2ec54..3f72d00 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -29,8 +29,8 @@ var dbus = { // hook object for dbus types not translated by python-json
 /*****************************************************************************/
 
 var cloudeebus = window.cloudeebus = {
-               version: "0.5.99",
-               minVersion: "0.3.2"
+               version: "0.5.100",
+               minVersion: "0.5.100"
 };
 
 cloudeebus.reset = function() {
@@ -201,12 +201,10 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
 
 /*****************************************************************************/
 //Generic definition for an agent. An agent needs :
-//srvDbusName : the DBus parent service
 //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(srvName, objPath, jsHdl, xml) {
-       this.srvName = srvName;
+cloudeebus.Agent = function(objPath, jsHdl, xml) {
        this.xml = xml;
        this.objectPath = objPath;
        this.jsHdl = jsHdl;
@@ -372,7 +370,7 @@ cloudeebus.Service.prototype.addAgent = function(agent) {
                }
                
                var arglist = [
-                   agent.srvName,
+                   self.name,
                    agent.objectPath,
                    agent.xml
                    ];

diff --git a/cloudeebus/cloudeebus.py b/cloudeebus/cloudeebus.py
index 681d6f8..659de26 100755 (executable)
--- a/cloudeebus/cloudeebus.py
+++ b/cloudeebus/cloudeebus.py
@@ -51,7 +51,7 @@ from xml.etree.ElementTree import XMLParser
 
 ###############################################################################
 
-VERSION = "0.5.99"
+VERSION = "0.5.100"
 OPENDOOR = False
 CREDENTIALS = {}
 WHITELIST = []

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;

diff --git a/setup.py b/setup.py
index 74328d0..9e82bb0 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
 from setuptools import setup
 
 setup(name = "cloudeebus",
-       version = "0.5.99",
+       version = "0.5.100",
        description = "Javascript-DBus bridge",
        author = "Luc Yriarte, Christophe Guiraud, Frederic Paut",
        author_email = "luc.yriarte@intel.com, christophe.guiraud@intel.com, frederic.paut@intel.com",