summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-05-27 18:32:30 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-06-03 17:08:10 +0200
commit0b7219bd7c0ef0622ea7fcf07c9d27b9a99672b4 (patch)
tree3f538cbac6817f3533c9c39ab3696b8a0ea2df72
parent710973368d73dc177bb253674426a4a219ea9310 (diff)
downloadjson-dbus-bridge-0b7219bd7c0ef0622ea7fcf07c9d27b9a99672b4.tar.gz
json-dbus-bridge-0b7219bd7c0ef0622ea7fcf07c9d27b9a99672b4.tar.xz
[demo] rename com.pengutronix.devel.* -> com.pengutronix.jdb.*
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rwxr-xr-xdemo/dbus-python-service.py4
-rw-r--r--demo/dbus-simple-service/Makefile.am6
-rw-r--r--demo/dbus-simple-service/com_pengutronix_jdb_SystemInfo.xml (renamed from demo/dbus-simple-service/com_pengutronix_devel_SystemInfo.xml)2
-rw-r--r--demo/dbus-simple-service/dbus-simple-service.c2
-rw-r--r--demo/dbus-simple-service/systeminfo_skel.c6
-rw-r--r--demo/index.html16
-rwxr-xr-xdemo/simple-test.sh6
7 files changed, 21 insertions, 21 deletions
diff --git a/demo/dbus-python-service.py b/demo/dbus-python-service.py
index 3abedc1..fc93c14 100755
--- a/demo/dbus-python-service.py
+++ b/demo/dbus-python-service.py
@@ -29,7 +29,7 @@ class Service(dbus.service.Object):
self._state = 1
dbus.service.Object.__init__(self, None, "/", name)
- @dbus.service.method("com.pengutronix.devel.Data",
+ @dbus.service.method("com.pengutronix.jdb.Data",
in_signature='', out_signature='a{sai}')
def Dump(self):
return {"foo": [1, 2], "bar": [3, 4] }
@@ -38,7 +38,7 @@ if __name__ == '__main__':
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
session_bus = dbus.SessionBus()
- name = dbus.service.BusName("com.pengutronix.devel.demo1", session_bus)
+ name = dbus.service.BusName("com.pengutronix.jdb.demo1", session_bus)
object = Service(session_bus, name)
mainloop = gobject.MainLoop()
diff --git a/demo/dbus-simple-service/Makefile.am b/demo/dbus-simple-service/Makefile.am
index 8e10eb5..4f9414e 100644
--- a/demo/dbus-simple-service/Makefile.am
+++ b/demo/dbus-simple-service/Makefile.am
@@ -6,13 +6,13 @@ AM_CPPFLAGS = \
$(dbus_CFLAGS)
EXTRA_DIST = \
- com_pengutronix_devel_SystemInfo.xml
+ com_pengutronix_jdb_SystemInfo.xml
MAINTAINERCLEANFILES = \
Makefile.in
CLEANFILES = \
- com_pengutronix_devel_SystemInfo_xml.h
+ com_pengutronix_jdb_SystemInfo_xml.h
noinst_HEADERS = \
systeminfo_skel.h
@@ -33,7 +33,7 @@ dbus_simple_service_SOURCES = \
dbus-simple-service.c \
systeminfo_skel.c
-$(srcdir)/systeminfo_skel.c: com_pengutronix_devel_SystemInfo_xml.h
+$(srcdir)/systeminfo_skel.c: com_pengutronix_jdb_SystemInfo_xml.h
dbus_simple_service_LDADD = \
$(dbus_LIBS)
diff --git a/demo/dbus-simple-service/com_pengutronix_devel_SystemInfo.xml b/demo/dbus-simple-service/com_pengutronix_jdb_SystemInfo.xml
index cc5a4ea..7f761e4 100644
--- a/demo/dbus-simple-service/com_pengutronix_devel_SystemInfo.xml
+++ b/demo/dbus-simple-service/com_pengutronix_jdb_SystemInfo.xml
@@ -1,5 +1,5 @@
<node>
- <interface name="com.pengutronix.devel.SystemInfo">
+ <interface name="com.pengutronix.jdb.SystemInfo">
<method name="Date">
<arg type="u" direction="out"/>
</method>
diff --git a/demo/dbus-simple-service/dbus-simple-service.c b/demo/dbus-simple-service/dbus-simple-service.c
index 032328e..e6ed3f6 100644
--- a/demo/dbus-simple-service/dbus-simple-service.c
+++ b/demo/dbus-simple-service/dbus-simple-service.c
@@ -84,7 +84,7 @@ int main(void)
dbus_error_free(&err);
exit(1);
}
- if (dbus_bus_request_name(connection, "com.pengutronix.devel.simpleinfo",
+ if (dbus_bus_request_name(connection, "com.pengutronix.jdb.simpleinfo",
0, &err) < 0) {
fprintf(stderr, "couldn't connect to dbus: %s: %s\n",
err.name, err.message);
diff --git a/demo/dbus-simple-service/systeminfo_skel.c b/demo/dbus-simple-service/systeminfo_skel.c
index d105eba..6301c5a 100644
--- a/demo/dbus-simple-service/systeminfo_skel.c
+++ b/demo/dbus-simple-service/systeminfo_skel.c
@@ -23,14 +23,14 @@
#include <stdlib.h>
#include "systeminfo_skel.h"
-#include "com_pengutronix_devel_SystemInfo_xml.h"
+#include "com_pengutronix_jdb_SystemInfo_xml.h"
static const char *introspect_system_info = \
DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
-COM_PENGUTRONIX_DEVEL_SYSTEMINFO_XML \
+COM_PENGUTRONIX_JDB_SYSTEMINFO_XML \
;
-#define DBUS_INTERFACE_SYSTEMINFO "com.pengutronix.devel.SystemInfo"
+#define DBUS_INTERFACE_SYSTEMINFO "com.pengutronix.jdb.SystemInfo"
DBusMessage *_system_info_error(DBusMessage *message, int err)
{
diff --git a/demo/index.html b/demo/index.html
index 00847d9..7c585d0 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -9,17 +9,17 @@
<table border="1" cellpadding="5">
<tr><th>function</th><th>send</th><th>receive</><tr>
-<tr><td>com.pengutronix.devel.SystemInfo.Ping</td><td id="echo-send">foobar</td><td id="echo-receive"></td></tr>
-<tr><td>com.pengutronix.devel.SystemInfo.Date</td><td id="date-send"></td><td id="date-receive"></td></tr>
+<tr><td>com.pengutronix.jdb.SystemInfo.Ping</td><td id="echo-send">foobar</td><td id="echo-receive"></td></tr>
+<tr><td>com.pengutronix.jdb.SystemInfo.Date</td><td id="date-send"></td><td id="date-receive"></td></tr>
<tr><td>org.freedesktop.DBus.Introspectable.Introspect</td><td id="introspect-send"></td><td id="introspect-receive"></td></tr>
-<tr><td>com.pengutronix.devel.Data.Dump</td><td id="dump-send"></td><td id="dump-receive"></td></tr>
+<tr><td>com.pengutronix.jdb.Data.Dump</td><td id="dump-send"></td><td id="dump-receive"></td></tr>
</table>
<script>
-var rpc = new Rpc("http://localhost:8080/rpc","com.pengutronix.devel.simpleinfo|/");
+var rpc = new Rpc("http://localhost:8080/rpc","com.pengutronix.jdb.simpleinfo|/");
rpc.callAsync(
- "com.pengutronix.devel.SystemInfo.Ping",
+ "com.pengutronix.jdb.SystemInfo.Ping",
["s", $('#echo-send').text()],
function(id, data){
$('#echo-receive').html(data)
@@ -29,7 +29,7 @@ window.setInterval('tick()', 1000);
function tick() {
rpc.callAsync(
- "com.pengutronix.devel.SystemInfo.Date",
+ "com.pengutronix.jdb.SystemInfo.Date",
[],
function(id, data){
var d = new Date(data*1000);
@@ -56,10 +56,10 @@ rpc.callAsync(
$('#introspect-receive').html(txt);
});
-var rpc2 = new Rpc("http://localhost:8080/rpc","com.pengutronix.devel.demo1|/");
+var rpc2 = new Rpc("http://localhost:8080/rpc","com.pengutronix.jdb.demo1|/");
rpc2.callAsync(
- "com.pengutronix.devel.Data.Dump",
+ "com.pengutronix.jdb.Data.Dump",
[],
function(id, data){
var table = document.createElement("table");
diff --git a/demo/simple-test.sh b/demo/simple-test.sh
index 806c688..00b8aef 100755
--- a/demo/simple-test.sh
+++ b/demo/simple-test.sh
@@ -1,7 +1,7 @@
#!/bin/sh
url="http://localhost:8080/rpc"
-data='{"service":"com.pengutronix.devel.simpleinfo|/","method":"com.pengutronix.devel.SystemInfo.Ping","id":0,"params":["s", "foo"]}'
+data='{"service":"com.pengutronix.jdb.simpleinfo|/","method":"com.pengutronix.jdb.SystemInfo.Ping","id":0,"params":["s", "foo"]}'
dd=`wget -O - -q --header="Referer: $url" --post-data="$data" "$url"`
@@ -12,7 +12,7 @@ if [ $? -ne 0 ]; then
fi
if [ "x$dd" != 'x{ "id": 0, "error": null, "result": "foo" }' ]; then
- echo got wrong data from com.pengutronix.devel.simpleinfo
+ echo got wrong data from com.pengutronix.jdb.simpleinfo
echo expected:
echo '{ "id": 0, "error": null, "result": "foo" }'
echo got:
@@ -20,5 +20,5 @@ if [ "x$dd" != 'x{ "id": 0, "error": null, "result": "foo" }' ]; then
exit 1
fi
-echo Fetching data from com.pengutronix.devel.simpleinfo sucessful.
+echo Fetching data from com.pengutronix.jdb.simpleinfo sucessful.