syndicate-lang
/
hop-2012
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename in web UI

This commit is contained in:
Tony Garnock-Jones 2012-05-01 17:32:01 -04:00
parent 460685c0ca
commit 477ba1eef5
12 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/about.html
View File

@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="utf-8">
<title>About Ocamlmsg</title>
<title>About Hop</title>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.css">
<style>
body {
@ -10,14 +10,14 @@
}
</style>
<link rel="stylesheet" type="text/css" href="ui.css">
<script type="text/javascript" src="jquery-1.7.2.min.js"></script><script type="text/javascript" src="jquery.stream-1.2.js"></script><script type="text/javascript" src="ocamlmsg.js"></script><script type="text/javascript" src="global.js"></script><!--[if lt IE 9]>
<script type="text/javascript" src="jquery-1.7.2.min.js"></script><script type="text/javascript" src="jquery.stream-1.2.js"></script><script type="text/javascript" src="hop.js"></script><script type="text/javascript" src="global.js"></script><!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]
-->
</head>
<body>
<div class="navbar navbar-fixed-top"><div class="navbar-inner"><div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="/">Ocamlmsg</a><div class="nav-collapse">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="/">Hop</a><div class="nav-collapse">
<ul class="nav">
<li><a href="/">Main</a></li>
<li><a href="/nodes.html">Nodes</a></li>
@ -30,9 +30,9 @@
</div></div></div>
<div class="container"><body>
<h1>About Ocamlmsg</h1>
<h1>About Hop</h1>
<p>
Ocamlmsg is a prototype of a sensible recursive message broker.
Hop is a prototype of a sensible recursive message broker.
</p>
<h2>Homepage</h2>
@ -43,7 +43,7 @@
<h2>Copyright &amp; Licence</h2>
<p>
Ocamlmsg is Copyright (C) 2012 Tony Garnock-Jones.
Hop is Copyright (C) 2012 Tony Garnock-Jones.
</p>
<p>
This program is free software: you can redistribute it and/or modify
@ -65,10 +65,10 @@
</p>
<p>
<span class="label label-warning">Warning</span>
Ocamlmsg is <em>alpha</em> software!
Hop is <em>alpha</em> software!
</p>
</body></div>
<script>Ocamlmsg.install_tap({});</script><script src="bootstrap/js/bootstrap-transition.js"></script><script src="bootstrap/js/bootstrap-alert.js"></script><script src="bootstrap/js/bootstrap-modal.js"></script><script src="bootstrap/js/bootstrap-dropdown.js"></script><script src="bootstrap/js/bootstrap-scrollspy.js"></script><script src="bootstrap/js/bootstrap-tab.js"></script><script src="bootstrap/js/bootstrap-tooltip.js"></script><script src="bootstrap/js/bootstrap-popover.js"></script><script src="bootstrap/js/bootstrap-button.js"></script><script src="bootstrap/js/bootstrap-collapse.js"></script><script src="bootstrap/js/bootstrap-carousel.js"></script><script src="bootstrap/js/bootstrap-typeahead.js"></script>
<script>Hop.install_tap({});</script><script src="bootstrap/js/bootstrap-transition.js"></script><script src="bootstrap/js/bootstrap-alert.js"></script><script src="bootstrap/js/bootstrap-modal.js"></script><script src="bootstrap/js/bootstrap-dropdown.js"></script><script src="bootstrap/js/bootstrap-scrollspy.js"></script><script src="bootstrap/js/bootstrap-tab.js"></script><script src="bootstrap/js/bootstrap-tooltip.js"></script><script src="bootstrap/js/bootstrap-popover.js"></script><script src="bootstrap/js/bootstrap-button.js"></script><script src="bootstrap/js/bootstrap-collapse.js"></script><script src="bootstrap/js/bootstrap-carousel.js"></script><script src="bootstrap/js/bootstrap-typeahead.js"></script>
</body>
</html>

6
web/bootstrap/template.xsl
View File

@ -20,7 +20,7 @@
<link rel="stylesheet" type="text/css" href="ui.css" />
<script type="text/javascript" src="jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="jquery.stream-1.2.js"></script>
<script type="text/javascript" src="ocamlmsg.js"></script>
<script type="text/javascript" src="hop.js"></script>
<script type="text/javascript" src="global.js"></script>
<xsl:for-each select="load">
<script type="text/javascript" src="{text()}"></script>
@ -39,7 +39,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="/">Ocamlmsg</a>
<a class="brand" href="/">Hop</a>
<div class="nav-collapse">
<ul class="nav">
<xsl:for-each select="document('nav.xml')/navitems/navitem">
@ -65,7 +65,7 @@
</div>
<xsl:copy-of select="script" />
<script>Ocamlmsg.install_tap({});</script>
<script>Hop.install_tap({});</script>
<script src="bootstrap/js/bootstrap-transition.js"></script>
<script src="bootstrap/js/bootstrap-alert.js"></script>

10
web/bootstrap/templates/about.xml
View File

@ -1,10 +1,10 @@
<page>
<title>About Ocamlmsg</title>
<title>About Hop</title>
<body>
<h1>About Ocamlmsg</h1>
<h1>About Hop</h1>
<p>
Ocamlmsg is a prototype of a sensible recursive message broker.
Hop is a prototype of a sensible recursive message broker.
</p>
<h2>Homepage</h2>
@ -17,7 +17,7 @@
<h2>Copyright &amp; Licence</h2>
<p>
Ocamlmsg is Copyright (C) 2012 Tony Garnock-Jones.
Hop is Copyright (C) 2012 Tony Garnock-Jones.
</p>
<p>
This program is free software: you can redistribute it and/or modify
@ -39,7 +39,7 @@
</p>
<p>
<span class="label label-warning">Warning</span>
Ocamlmsg is <em>alpha</em> software!
Hop is <em>alpha</em> software!
</p>
</body>

2
web/bootstrap/templates/index.xml
View File

@ -1,5 +1,5 @@
<page>
<title>Ocamlmsg</title>
<title>Hop</title>
<section>main</section>
<load>index.js</load>

2
web/bootstrap/templates/nodes.xml
View File

@ -1,5 +1,5 @@
<page>
<title>Ocamlmsg</title>
<title>Node Index</title>
<section>nodes</section>
<load>nodes.js</load>

4
web/global.js
View File

@ -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);
})();

6
web/gpl3.html
View File

@ -10,14 +10,14 @@
}
</style>
<link rel="stylesheet" type="text/css" href="ui.css">
<script type="text/javascript" src="jquery-1.7.2.min.js"></script><script type="text/javascript" src="jquery.stream-1.2.js"></script><script type="text/javascript" src="ocamlmsg.js"></script><script type="text/javascript" src="global.js"></script><!--[if lt IE 9]>
<script type="text/javascript" src="jquery-1.7.2.min.js"></script><script type="text/javascript" src="jquery.stream-1.2.js"></script><script type="text/javascript" src="hop.js"></script><script type="text/javascript" src="global.js"></script><!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]
-->
</head>
<body>
<div class="navbar navbar-fixed-top"><div class="navbar-inner"><div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="/">Ocamlmsg</a><div class="nav-collapse">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="/">Hop</a><div class="nav-collapse">
<ul class="nav">
<li><a href="/">Main</a></li>
<li><a href="/nodes.html">Nodes</a></li>
@ -737,6 +737,6 @@ Public License instead of this License. But first, please read
&lt;<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>&gt;.</p>
</body></div>
<script>Ocamlmsg.install_tap({});</script><script src="bootstrap/js/bootstrap-transition.js"></script><script src="bootstrap/js/bootstrap-alert.js"></script><script src="bootstrap/js/bootstrap-modal.js"></script><script src="bootstrap/js/bootstrap-dropdown.js"></script><script src="bootstrap/js/bootstrap-scrollspy.js"></script><script src="bootstrap/js/bootstrap-tab.js"></script><script src="bootstrap/js/bootstrap-tooltip.js"></script><script src="bootstrap/js/bootstrap-popover.js"></script><script src="bootstrap/js/bootstrap-button.js"></script><script src="bootstrap/js/bootstrap-collapse.js"></script><script src="bootstrap/js/bootstrap-carousel.js"></script><script src="bootstrap/js/bootstrap-typeahead.js"></script>
<script>Hop.install_tap({});</script><script src="bootstrap/js/bootstrap-transition.js"></script><script src="bootstrap/js/bootstrap-alert.js"></script><script src="bootstrap/js/bootstrap-modal.js"></script><script src="bootstrap/js/bootstrap-dropdown.js"></script><script src="bootstrap/js/bootstrap-scrollspy.js"></script><script src="bootstrap/js/bootstrap-tab.js"></script><script src="bootstrap/js/bootstrap-tooltip.js"></script><script src="bootstrap/js/bootstrap-popover.js"></script><script src="bootstrap/js/bootstrap-button.js"></script><script src="bootstrap/js/bootstrap-collapse.js"></script><script src="bootstrap/js/bootstrap-carousel.js"></script><script src="bootstrap/js/bootstrap-typeahead.js"></script>
</body>
</html>

56
web/ocamlmsg.js → web/hop.js
View File

@ -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();
}
}
}

8
web/index.html
View File

@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="utf-8">
<title>Ocamlmsg</title>
<title>Hop</title>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.css">
<style>
body {
@ -10,14 +10,14 @@
}
</style>
<link rel="stylesheet" type="text/css" href="ui.css">
<script type="text/javascript" src="jquery-1.7.2.min.js"></script><script type="text/javascript" src="jquery.stream-1.2.js"></script><script type="text/javascript" src="ocamlmsg.js"></script><script type="text/javascript" src="global.js"></script><script type="text/javascript" src="index.js"></script><!--[if lt IE 9]>
<script type="text/javascript" src="jquery-1.7.2.min.js"></script><script type="text/javascript" src="jquery.stream-1.2.js"></script><script type="text/javascript" src="hop.js"></script><script type="text/javascript" src="global.js"></script><script type="text/javascript" src="index.js"></script><!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]
-->
</head>
<body>
<div class="navbar navbar-fixed-top"><div class="navbar-inner"><div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="/">Ocamlmsg</a><div class="nav-collapse">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="/">Hop</a><div class="nav-collapse">
<ul class="nav">
<li class="active"><a href="/">Main</a></li>
<li><a href="/nodes.html">Nodes</a></li>
@ -51,6 +51,6 @@
<h2>Debug</h2>
<pre id="debug_container"></pre>
</body></div>
<script>$(document).ready(ui_main);</script><script>Ocamlmsg.install_tap({});</script><script src="bootstrap/js/bootstrap-transition.js"></script><script src="bootstrap/js/bootstrap-alert.js"></script><script src="bootstrap/js/bootstrap-modal.js"></script><script src="bootstrap/js/bootstrap-dropdown.js"></script><script src="bootstrap/js/bootstrap-scrollspy.js"></script><script src="bootstrap/js/bootstrap-tab.js"></script><script src="bootstrap/js/bootstrap-tooltip.js"></script><script src="bootstrap/js/bootstrap-popover.js"></script><script src="bootstrap/js/bootstrap-button.js"></script><script src="bootstrap/js/bootstrap-collapse.js"></script><script src="bootstrap/js/bootstrap-carousel.js"></script><script src="bootstrap/js/bootstrap-typeahead.js"></script>
<script>$(document).ready(ui_main);</script><script>Hop.install_tap({});</script><script src="bootstrap/js/bootstrap-transition.js"></script><script src="bootstrap/js/bootstrap-alert.js"></script><script src="bootstrap/js/bootstrap-modal.js"></script><script src="bootstrap/js/bootstrap-dropdown.js"></script><script src="bootstrap/js/bootstrap-scrollspy.js"></script><script src="bootstrap/js/bootstrap-tab.js"></script><script src="bootstrap/js/bootstrap-tooltip.js"></script><script src="bootstrap/js/bootstrap-popover.js"></script><script src="bootstrap/js/bootstrap-button.js"></script><script src="bootstrap/js/bootstrap-collapse.js"></script><script src="bootstrap/js/bootstrap-carousel.js"></script><script src="bootstrap/js/bootstrap-typeahead.js"></script>
</body>
</html>

14
web/index.js
View File

@ -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);

8
web/nodes.html
View File

@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="utf-8">
<title>Ocamlmsg</title>
<title>Node Index</title>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.css">
<style>
body {
@ -10,14 +10,14 @@
}
</style>
<link rel="stylesheet" type="text/css" href="ui.css">
<script type="text/javascript" src="jquery-1.7.2.min.js"></script><script type="text/javascript" src="jquery.stream-1.2.js"></script><script type="text/javascript" src="ocamlmsg.js"></script><script type="text/javascript" src="global.js"></script><script type="text/javascript" src="nodes.js"></script><!--[if lt IE 9]>
<script type="text/javascript" src="jquery-1.7.2.min.js"></script><script type="text/javascript" src="jquery.stream-1.2.js"></script><script type="text/javascript" src="hop.js"></script><script type="text/javascript" src="global.js"></script><script type="text/javascript" src="nodes.js"></script><!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]
-->
</head>
<body>
<div class="navbar navbar-fixed-top"><div class="navbar-inner"><div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="/">Ocamlmsg</a><div class="nav-collapse">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="/">Hop</a><div class="nav-collapse">
<ul class="nav">
<li><a href="/">Main</a></li>
<li class="active"><a href="/nodes.html">Nodes</a></li>
@ -49,6 +49,6 @@
</div>
</div>
</body></div>
<script>$(document).ready(nodes_main);</script><script>Ocamlmsg.install_tap({});</script><script src="bootstrap/js/bootstrap-transition.js"></script><script src="bootstrap/js/bootstrap-alert.js"></script><script src="bootstrap/js/bootstrap-modal.js"></script><script src="bootstrap/js/bootstrap-dropdown.js"></script><script src="bootstrap/js/bootstrap-scrollspy.js"></script><script src="bootstrap/js/bootstrap-tab.js"></script><script src="bootstrap/js/bootstrap-tooltip.js"></script><script src="bootstrap/js/bootstrap-popover.js"></script><script src="bootstrap/js/bootstrap-button.js"></script><script src="bootstrap/js/bootstrap-collapse.js"></script><script src="bootstrap/js/bootstrap-carousel.js"></script><script src="bootstrap/js/bootstrap-typeahead.js"></script>
<script>$(document).ready(nodes_main);</script><script>Hop.install_tap({});</script><script src="bootstrap/js/bootstrap-transition.js"></script><script src="bootstrap/js/bootstrap-alert.js"></script><script src="bootstrap/js/bootstrap-modal.js"></script><script src="bootstrap/js/bootstrap-dropdown.js"></script><script src="bootstrap/js/bootstrap-scrollspy.js"></script><script src="bootstrap/js/bootstrap-tab.js"></script><script src="bootstrap/js/bootstrap-tooltip.js"></script><script src="bootstrap/js/bootstrap-popover.js"></script><script src="bootstrap/js/bootstrap-button.js"></script><script src="bootstrap/js/bootstrap-collapse.js"></script><script src="bootstrap/js/bootstrap-carousel.js"></script><script src="bootstrap/js/bootstrap-typeahead.js"></script>
</body>
</html>

2
web/nodes.js
View File

@ -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);
}