diff --git a/web/about.html b/web/about.html index 3ca1295..60d19b9 100644 --- a/web/about.html +++ b/web/about.html @@ -2,7 +2,7 @@ -About Ocamlmsg +About Hop -
-Ocamlmsg
+Hop
-

About Ocamlmsg

+

About Hop

- Ocamlmsg is a prototype of a sensible recursive message broker. + Hop is a prototype of a sensible recursive message broker.

Homepage

@@ -43,7 +43,7 @@

Copyright & Licence

- Ocamlmsg is Copyright (C) 2012 Tony Garnock-Jones. + Hop is Copyright (C) 2012 Tony Garnock-Jones.

This program is free software: you can redistribute it and/or modify @@ -65,10 +65,10 @@

Warning - Ocamlmsg is alpha software! + Hop is alpha software!

- + diff --git a/web/bootstrap/template.xsl b/web/bootstrap/template.xsl index e669a3e..cc275c2 100644 --- a/web/bootstrap/template.xsl +++ b/web/bootstrap/template.xsl @@ -20,7 +20,7 @@ - + @@ -39,7 +39,7 @@ - Ocamlmsg + Hop
    @@ -65,7 +65,7 @@
- + diff --git a/web/bootstrap/templates/about.xml b/web/bootstrap/templates/about.xml index ace4c01..c807db6 100644 --- a/web/bootstrap/templates/about.xml +++ b/web/bootstrap/templates/about.xml @@ -1,10 +1,10 @@ - About Ocamlmsg + About Hop -

About Ocamlmsg

+

About Hop

- Ocamlmsg is a prototype of a sensible recursive message broker. + Hop is a prototype of a sensible recursive message broker.

Homepage

@@ -17,7 +17,7 @@

Copyright & Licence

- Ocamlmsg is Copyright (C) 2012 Tony Garnock-Jones. + Hop is Copyright (C) 2012 Tony Garnock-Jones.

This program is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@

Warning - Ocamlmsg is alpha software! + Hop is alpha software!

diff --git a/web/bootstrap/templates/index.xml b/web/bootstrap/templates/index.xml index 3432eea..78db637 100644 --- a/web/bootstrap/templates/index.xml +++ b/web/bootstrap/templates/index.xml @@ -1,5 +1,5 @@ - Ocamlmsg + Hop
main
index.js diff --git a/web/bootstrap/templates/nodes.xml b/web/bootstrap/templates/nodes.xml index ae9b849..ac8855f 100644 --- a/web/bootstrap/templates/nodes.xml +++ b/web/bootstrap/templates/nodes.xml @@ -1,5 +1,5 @@ - Ocamlmsg + Node Index
nodes
nodes.js diff --git a/web/global.js b/web/global.js index d5f155e..d0f9aea 100644 --- a/web/global.js +++ b/web/global.js @@ -9,6 +9,6 @@ $("#server_status_message").text("Connected"); } - Ocamlmsg.$open_hooks.push(server_connected); - Ocamlmsg.$close_hooks.push(server_disconnected); + Hop.$open_hooks.push(server_connected); + Hop.$close_hooks.push(server_disconnected); })(); diff --git a/web/gpl3.html b/web/gpl3.html index 35b00b3..5b573ba 100644 --- a/web/gpl3.html +++ b/web/gpl3.html @@ -10,14 +10,14 @@ } -
-Ocamlmsg
+Hop
- + diff --git a/web/ocamlmsg.js b/web/hop.js similarity index 53% rename from web/ocamlmsg.js rename to web/hop.js index 5fadf7b..4d69c6a 100644 --- a/web/ocamlmsg.js +++ b/web/hop.js @@ -1,4 +1,4 @@ -var Ocamlmsg = { +var Hop = { $tap: null, $args: null, @@ -7,19 +7,19 @@ var Ocamlmsg = { $close_hooks: [], run_open_hooks: function (event, stream) { - $.each(Ocamlmsg.$open_hooks, function (i, f) { f(event, stream); }); + $.each(Hop.$open_hooks, function (i, f) { f(event, stream); }); }, run_message_hooks: function (event, stream) { - $.each(Ocamlmsg.$message_hooks, function (i, f) { f(event, stream); }); + $.each(Hop.$message_hooks, function (i, f) { f(event, stream); }); }, run_close_hooks: function (event, stream) { - $.each(Ocamlmsg.$close_hooks, function (i, f) { f(event, stream); }); + $.each(Hop.$close_hooks, function (i, f) { f(event, stream); }); }, _send: function (msg) { - Ocamlmsg.$tap.send({data: JSON.stringify(msg)}); + Hop.$tap.send({data: JSON.stringify(msg)}); }, _post_msg: function (target, datum, token) { @@ -27,7 +27,7 @@ var Ocamlmsg = { }, post: function (target, datum, token) { - Ocamlmsg._send(Ocamlmsg._post_msg(target, datum, token)); + Hop._send(Hop._post_msg(target, datum, token)); }, _subscribe_msg: function (filter, sink, name, reply_sink, reply_name) { @@ -35,14 +35,14 @@ var Ocamlmsg = { }, _subscribe: function (source, filter, name, reply_name) { - return Ocamlmsg._post_msg(source, - Ocamlmsg._subscribe_msg(filter, Ocamlmsg.$tap.id, name, - reply_name ? Ocamlmsg.$tap.id : "", - reply_name)); + return Hop._post_msg(source, + Hop._subscribe_msg(filter, Hop.$tap.id, name, + reply_name ? Hop.$tap.id : "", + reply_name)); }, subscribe: function (source, filter, name, reply_name) { - Ocamlmsg._send(Ocamlmsg._subscribe(source, filter, name, reply_name)); + Hop._send(Hop._subscribe(source, filter, name, reply_name)); }, _unsubscribe_msg: function (token) { @@ -50,11 +50,11 @@ var Ocamlmsg = { }, _unsubscribe: function (source, token) { - return Ocamlmsg._post_msg(source, Ocamlmsg._unsubscribe_msg(token)); + return Hop._post_msg(source, Hop._unsubscribe_msg(token)); }, unsubscribe: function (source, token) { - Ocamlmsg._send(Ocamlmsg._unsubscribe(source, token)); + Hop._send(Hop._unsubscribe(source, token)); }, _create_msg: function (classname, arg, reply_sink, reply_name) { @@ -62,43 +62,43 @@ var Ocamlmsg = { }, _create: function (classname, arg, reply_name, factory) { - return Ocamlmsg._post_msg(factory || "factory", - Ocamlmsg._create_msg(classname, arg, - reply_name ? Ocamlmsg.$tap.id : "", - reply_name)); + return Hop._post_msg(factory || "factory", + Hop._create_msg(classname, arg, + reply_name ? Hop.$tap.id : "", + reply_name)); }, create: function (classname, arg, reply_name, factory) { - Ocamlmsg._send(Ocamlmsg._create(classname, arg, reply_name, factory)); + Hop._send(Hop._create(classname, arg, reply_name, factory)); }, _install_tap: function () { - Ocamlmsg.$tap = $.stream("/_/tap", { + Hop.$tap = $.stream("/_/tap", { type: "http", dataType: "json", enableXDR: true, - open: Ocamlmsg.run_open_hooks, - message: Ocamlmsg.run_message_hooks, - error: Ocamlmsg.run_close_hooks, - close: Ocamlmsg.run_close_hooks + open: Hop.run_open_hooks, + message: Hop.run_message_hooks, + error: Hop.run_close_hooks, + close: Hop.run_close_hooks }); }, install_tap: function (args) { - Ocamlmsg.$args = args; - Ocamlmsg._install_tap(); - setInterval(Ocamlmsg.check_connectivity, 5000); + Hop.$args = args; + Hop._install_tap(); + setInterval(Hop.check_connectivity, 5000); }, check_connectivity: function () { - switch (Ocamlmsg.$tap.readyState) { + switch (Hop.$tap.readyState) { case 0: // connecting case 1: // open case 2: // closing break; case 3: // closed - Ocamlmsg._install_tap(); + Hop._install_tap(); } } } diff --git a/web/index.html b/web/index.html index 7f3b82a..32b9bf3 100644 --- a/web/index.html +++ b/web/index.html @@ -2,7 +2,7 @@ -Ocamlmsg +Hop -
-Ocamlmsg
+Hop
- + diff --git a/web/index.js b/web/index.js index d999d51..deba8f3 100644 --- a/web/index.js +++ b/web/index.js @@ -36,15 +36,15 @@ function ui_main() { setInterval(bump_uptime, 1000); - Ocamlmsg.$open_hooks.push(function (event, stream) { + Hop.$open_hooks.push(function (event, stream) { refresh_server_stats(); - Ocamlmsg.post(stream.id, {"test":true}); - Ocamlmsg.create("fanout", ["system.log"], "completion1"); - Ocamlmsg.subscribe("meta", "system.log", "sub_messages", "completion2"); - Ocamlmsg.subscribe("system.log", "", "log_messages", "completion3"); + Hop.post(stream.id, {"test":true}); + Hop.create("fanout", ["system.log"], "completion1"); + Hop.subscribe("meta", "system.log", "sub_messages", "completion2"); + Hop.subscribe("system.log", "", "log_messages", "completion3"); }); - Ocamlmsg.$close_hooks.push(server_disconnected); - Ocamlmsg.$message_hooks.push(function (event, stream) { + Hop.$close_hooks.push(server_disconnected); + Hop.$message_hooks.push(function (event, stream) { if (!refresh_pending) { refresh_pending = true; setTimeout(refresh_server_stats, 1000); diff --git a/web/nodes.html b/web/nodes.html index 0f4187b..0db8a54 100644 --- a/web/nodes.html +++ b/web/nodes.html @@ -2,7 +2,7 @@ -Ocamlmsg +Node Index -
-Ocamlmsg
+Hop
- + diff --git a/web/nodes.js b/web/nodes.js index 47e578f..4270d28 100644 --- a/web/nodes.js +++ b/web/nodes.js @@ -26,5 +26,5 @@ function refresh_node_list() { } function nodes_main() { - Ocamlmsg.$open_hooks.push(refresh_node_list); + Hop.$open_hooks.push(refresh_node_list); }