svn commit: r1683567 - /qpid/trunk/qpid/tools/src/py/qpid-route

2015-06-04 Thread eallen
Author: eallen
Date: Thu Jun  4 14:55:37 2015
New Revision: 1683567

URL: http://svn.apache.org/r1683567
Log:
QPID-6571: remove socket.gethostbyname call

Modified:
qpid/trunk/qpid/tools/src/py/qpid-route

Modified: qpid/trunk/qpid/tools/src/py/qpid-route
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-route?rev=1683567&r1=1683566&r2=1683567&view=diff
==
--- qpid/trunk/qpid/tools/src/py/qpid-route (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-route Thu Jun  4 14:55:37 2015
@@ -21,7 +21,6 @@
 
 from optparse import OptionParser, OptionGroup, IndentedHelpFormatter
 import sys
-import socket
 import os
 import locale
 from qmf.console import Session, BrokerURL
@@ -521,11 +520,7 @@ def main(argv=None):
 return(-1)
 
 if nargs == 2:
-try:
-socket.gethostbyname(socket.gethostname())
-localBroker = socket.gethostname()
-except socket.gaierror:
-localBroker = "localhost"
+localBroker = "localhost"
 else:
 if config._srclocal:
 localBroker = args[3]



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



svn commit: r1684716 - in /qpid/trunk/qpid: cpp/src/qpid/broker/SessionManager.cpp python/qpid/messaging/driver.py

2015-06-10 Thread eallen
Author: eallen
Date: Wed Jun 10 17:11:49 2015
New Revision: 1684716

URL: http://svn.apache.org/r1684716
Log:
QPID-6297: Python client should reconnect after network glitch

Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/SessionManager.cpp
qpid/trunk/qpid/python/qpid/messaging/driver.py

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionManager.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionManager.cpp?rev=1684716&r1=1684715&r2=1684716&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionManager.cpp Wed Jun 10 17:11:49 
2015
@@ -47,11 +47,11 @@ SessionManager::~SessionManager() {
 detached.clear();   // Must clear before destructor as session 
dtor will call forget()
 }
 
-std::auto_ptr  SessionManager::attach(SessionHandler& h, const 
SessionId& id, bool/*force*/) {
+std::auto_ptr  SessionManager::attach(SessionHandler& h, const 
SessionId& id, bool force) {
 Mutex::ScopedLock l(lock);
 eraseExpired(); // Clean up expired table
 std::pair insert = attached.insert(id);
-if (!insert.second)
+if (!insert.second && !force)
 throw SessionBusyException(QPID_MSG("Session already attached: " << 
id));
 Detached::iterator i = std::find(detached.begin(), detached.end(), id);
 std::auto_ptr state;
@@ -62,7 +62,6 @@ std::auto_ptr  SessionMana
 state->attach(h);
 }
 return state;
-// FIXME aconway 2008-04-29: implement force 
 }
 
 void  SessionManager::detach(std::auto_ptr session) {

Modified: qpid/trunk/qpid/python/qpid/messaging/driver.py
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging/driver.py?rev=1684716&r1=1684715&r2=1684716&view=diff
==
--- qpid/trunk/qpid/python/qpid/messaging/driver.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging/driver.py Wed Jun 10 17:11:49 2015
@@ -591,6 +591,7 @@ class Engine:
 self.log_id = "%x" % id(self.connection)
 self._closing = False
 self._connected = False
+self._reconnecting = bool(connection.sessions)
 self._attachments = {}
 
 self._in = LinkIn()
@@ -874,8 +875,9 @@ class Engine:
   else:
 raise RuntimeError("all channels used")
   sst = SessionState(self, ssn, ssn.name, ch)
-  sst.write_op(SessionAttach(name=ssn.name))
+  sst.write_op(SessionAttach(name=ssn.name, force=self._reconnecting))
   sst.write_op(SessionCommandPoint(sst.sent, 0))
+  self._reconnecting = False
   sst.outgoing_idx = 0
   sst.acked = []
   sst.acked_idx = 0



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



svn commit: r1685116 - in /qpid/trunk/qpid/python/qpid: messaging/driver.py tests/messaging/endpoints.py

2015-06-12 Thread eallen
Author: eallen
Date: Fri Jun 12 16:01:05 2015
New Revision: 1685116

URL: http://svn.apache.org/r1685116
Log:
QPID-6326 Don't automatically search for exchanges and queues with each request

Modified:
qpid/trunk/qpid/python/qpid/messaging/driver.py
qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py

Modified: qpid/trunk/qpid/python/qpid/messaging/driver.py
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging/driver.py?rev=1685116&r1=1685115&r2=1685116&view=diff
==
--- qpid/trunk/qpid/python/qpid/messaging/driver.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging/driver.py Fri Jun 12 16:01:05 2015
@@ -122,9 +122,9 @@ class SessionState:
 
 self.destinations = {}
 
-  def write_query(self, query, handler):
+  def write_query(self, query, handler, obj):
 id = self.sent
-self.write_cmd(query, lambda: handler(self.results.pop(id)))
+self.write_cmd(query, lambda: handler(self.results.pop(id), obj))
 
   def apply_overrides(self, cmd, overrides):
 for k, v in overrides.items():
@@ -1011,7 +1011,7 @@ class Engine:
 return
 self.resolve(sst, lnk.name, do_resolved, node_type=requested_type, 
force=declare)
 
-  def resolve(self, sst, name, action, force=False, node_type=None):
+  def resolve(self, sst, name, action, force=False, node_type=None, 
delete=False):
 if not force and not node_type:
   try:
 type, subtype = self.address_cache[name]
@@ -1020,35 +1020,50 @@ class Engine:
   except KeyError:
 pass
 
-args = []
-def do_result(r):
-  args.append(r)
-def do_action(r):
-  do_result(r)
-  er, qr = args
-  if node_type == "topic" and not er.not_found:
+args = { "topic":None, "queue":None }
+def do_result(r, obj):
+  args[obj] = r
+def do_action():
+  er = args["topic"]
+  qr = args["queue"]
+  if node_type == "topic" and er and not er.not_found:
 type, subtype = "topic", er.type
-  elif node_type == "queue" and qr.queue:
+  elif node_type == "queue" and qr and qr.queue:
 type, subtype = "queue", None
-  elif er.not_found and not qr.queue:
+  elif (er and er.not_found) and qr and not qr.queue:
 type, subtype = None, None
-  elif qr.queue:
+  elif (qr and qr.queue):
 if node_type == "topic" and force:
   type, subtype = None, None
 else:
   type, subtype = "queue", None
-  elif not er.not_found:
+  elif (er and not er.not_found):
 if node_type == "queue" and force:
   type, subtype = None, None
 else:
   type, subtype = "topic", er.type
+  elif er:
+if er.not_found:
+  type, subtype = None, None
+else:
+  type, subtype = "topic", er.type
   else:
-type, subtype = "topic", er.type
+type, subtype = None, None
   if type is not None:
 self.address_cache[name] = (type, subtype)
   action(type, subtype)
-sst.write_query(ExchangeQuery(name), do_result)
-sst.write_query(QueueQuery(name), do_action)
+def do_result_and_action(r, obj):
+  do_result(r, obj)
+  do_action()
+if (node_type is None): # we don't know the type, let check broker
+  sst.write_query(ExchangeQuery(name), do_result, "topic")
+  sst.write_query(QueueQuery(name), do_result_and_action, "queue")
+elif force and not delete: # we forcefully declare known type, dont ask 
broker
+  do_action()
+elif node_type == "topic":
+  sst.write_query(ExchangeQuery(name), do_result_and_action, "topic")
+else:
+  sst.write_query(QueueQuery(name), do_result_and_action, "queue")
 
   def declare(self, sst, lnk, action, create_node):
 name = lnk.name
@@ -1102,7 +1117,7 @@ class Engine:
 action()
   else:
 raise ValueError(type)
-self.resolve(sst, name, do_delete, force=True, node_type=node_type)
+self.resolve(sst, name, do_delete, force=True, node_type=node_type, 
delete=True)
 
   def process(self, ssn):
 if ssn.closed or ssn.closing: return

Modified: qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py?rev=1685116&r1=1685115&r2=1685116&view=diff
==
--- qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py (original)
+++ qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py Fri Jun 12 
16:01:05 2015
@@ -1230,6 +1230,8 @@ test-link-bindings-queue; {
   assert 0, "assertion failed to trigger"
 except AssertionFailed, e:
   pass
+exc

svn commit: r1690130 - in /qpid/dispatch/trunk/python: qpid_dispatch/management/qdrouter.json qpid_dispatch_internal/management/schema.py

2015-07-09 Thread eallen
Author: eallen
Date: Thu Jul  9 17:51:13 2015
New Revision: 1690130

URL: http://svn.apache.org/r1690130
Log:
DISPATCH-150 Adding graph property to schema

Modified:
qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
qpid/dispatch/trunk/python/qpid_dispatch_internal/management/schema.py

Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
URL: 
http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json?rev=1690130&r1=1690129&r2=1690130&view=diff
==
--- qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json Thu Jul  
9 17:51:13 2015
@@ -547,15 +547,18 @@
 },
"addrCount": {
 "type":
-"integer", "description":"Number of addresses known to the 
router."
+"integer", "description":"Number of addresses known to the 
router.",
+"graph": true
 },
"linkCount": {
 "type": "integer",
-"description":"Number of links attached to the router 
node."
-},
+"description":"Number of links attached to the router 
node.",
+ "graph": true
+   },
"nodeCount": {
 "type": "integer",
-"description":"Number of known peer router nodes."
+"description":"Number of known peer router nodes.",
+"graph": true
 }
 }
 },
@@ -775,8 +778,8 @@
 "linkType": {"type": ["endpoint", "waypoint", "inter-router", 
"inter-area"]},
 "linkDir": {"type": ["in", "out"]},
 "owningAddr": {"type": "string"},
-"eventFifoDepth": {"type": "integer"},
-"msgFifoDepth": {"type": "integer"},
+"eventFifoDepth": {"type": "integer", "graph": true},
+"msgFifoDepth": {"type": "integer", "graph": true},
 "remoteContainer": {"type": "string"}
 }
 },
@@ -786,13 +789,13 @@
 "extends": "operationalEntity",
 "attributes": {
 "inProcess": {"type": "boolean"},
-"subscriberCount": {"type": "integer"},
-"remoteCount": {"type": "integer"},
-"deliveriesIngress": {"type": "integer"},
-"deliveriesEgress": {"type": "integer"},
-"deliveriesTransit": {"type": "integer"},
-"deliveriesToContainer": {"type": "integer"},
-"deliveriesFromContainer": {"type": "integer"},
+"subscriberCount": {"type": "integer", "graph": true},
+"remoteCount": {"type": "integer", "graph": true},
+"deliveriesIngress": {"type": "integer", "graph": true},
+"deliveriesEgress": {"type": "integer", "graph": true},
+"deliveriesTransit": {"type": "integer", "graph": true},
+"deliveriesToContainer": {"type": "integer", "graph": true},
+"deliveriesFromContainer": {"type": "integer", "graph": true},
 "key": {
 "description": "Internal unique (to this router) key to 
identify the address",
 "type": "string"
@@ -874,13 +877,13 @@
 "typeName": {"type": "string"},
 "typeSize": {"type": "integer"},
 "transferBatchSize": {

svn commit: r1692877 - in /qpid/dispatch/trunk/python: qpid_dispatch/management/qdrouter.json qpid_dispatch_internal/management/agent.py

2015-07-27 Thread eallen
Author: eallen
Date: Mon Jul 27 13:02:29 2015
New Revision: 1692877

URL: http://svn.apache.org/r1692877
Log:
DISPATCH-151: Add console entity to run a proxy/web server

Modified:
qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py

Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
URL: 
http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json?rev=1692877&r1=1692876&r2=1692877&view=diff
==
--- qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json Mon Jul 
27 13:02:29 2015
@@ -887,6 +887,20 @@
 }
 },
 
+"console": {
+"description": "Start a websocket/tcp proxy and http file server 
to serve the web console",
+"extends": "configurationEntity",
+"singleton": true,
+"attributes": { 
+"listener": {"type": "string", "description": "The name of the 
listener to send the proxied tcp traffic to."},
+"wsport": {"type": "integer", "description": "port on which to 
listen for websocket traffic", "default": 5673},
+"proxy": {"type": "string", "description": "The full path to 
the proxy program to run."},
+"home": {"type": "string", "description": "The full path to 
the html/css/js files for the console."},
+"args": {"type": "string", "description": "Optional args to 
pass the proxy program for logging, authentication, etc."}  
+
+}
+},
+
 "dummy": {
 "description": "Dummy entity for test purposes.",
 "extends": "entity",

Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py
URL: 
http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py?rev=1692877&r1=1692876&r2=1692877&view=diff
==
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py 
(original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/management/agent.py Mon 
Jul 27 13:02:29 2015
@@ -72,6 +72,7 @@ from threading import Lock
 from cProfile import Profile
 from cStringIO import StringIO
 from ctypes import c_void_p, py_object, c_long
+from subprocess import Popen
 from ..dispatch import IoAdapter, LogAdapter, LOG_INFO, LOG_DEBUG, LOG_ERROR
 from qpid_dispatch.management.error import ManagementError, OK, CREATED, 
NO_CONTENT, STATUS_TEXT, \
 BadRequestStatus, InternalServerErrorStatus, NotImplementedStatus, 
NotFoundStatus
@@ -300,6 +301,38 @@ class LinkRoutePatternEntity(EntityAdapt
 def create(self):
 self._qd.qd_dispatch_configure_lrp(self._dispatch, self)
 
+class ConsoleEntity(EntityAdapter):
+def create(self):
+# if a named listener is present, use its addr:port 
+name = self.attributes.get('listener')
+if name:
+listeners = self._agent.find_entity_by_type("listener")
+for listener in listeners:
+if listener.name == name:
+try:
+#required
+host   = listener.attributes['addr']
+port   = listener.attributes['port']
+wsport = self.attributes['wsport']
+#optional
+home   = self.attributes.get('home')
+args   = self.attributes.get('args')
+
+pargs = []
+pargs.append(self.attributes['proxy'])
+pargs.append(str(self.attributes['wsport']))
+pargs.append("%s:%s" % (host, port))
+if home:
+pargs.append("--web")
+pargs.append(self.attributes['home'])
+if args:
+pargs.append(args)
+
+#run the external program
+Popen(pargs)
+except:
+self._agent.log(LOG_ERROR, "Can't parse console 
entity: %s" % (format_exc()))
+break
 
 class DummyEntity(EntityAdapter):
 def callme(self, request):



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



svn commit: r1651102 - in /qpid/trunk/qpid/python/qpid: codec010.py sasl.py

2015-01-12 Thread eallen
Author: eallen
Date: Mon Jan 12 14:21:34 2015
New Revision: 1651102

URL: http://svn.apache.org/r1651102
Log:
QPID-6197: Allow unicode values in connection response field

Modified:
qpid/trunk/qpid/python/qpid/codec010.py
qpid/trunk/qpid/python/qpid/sasl.py

Modified: qpid/trunk/qpid/python/qpid/codec010.py
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/codec010.py?rev=1651102&r1=1651101&r2=1651102&view=diff
==
--- qpid/trunk/qpid/python/qpid/codec010.py (original)
+++ qpid/trunk/qpid/python/qpid/codec010.py Mon Jan 12 14:21:34 2015
@@ -225,6 +225,9 @@ class Codec(Packer):
   def write_vbin32(self, b):
 if isinstance(b, buffer):
   b = str(b)
+# Allow unicode values in connection 'response' field
+if isinstance(b, unicode):
+  b = b.encode('utf8')
 self.write_uint32(len(b))
 self.write(b)
 

Modified: qpid/trunk/qpid/python/qpid/sasl.py
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/sasl.py?rev=1651102&r1=1651101&r2=1651102&view=diff
==
--- qpid/trunk/qpid/python/qpid/sasl.py (original)
+++ qpid/trunk/qpid/python/qpid/sasl.py Mon Jan 12 14:21:34 2015
@@ -28,6 +28,9 @@ class WrapperClient:
 self._cli = _Client()
 
   def setAttr(self, name, value):
+# Allow unicode user names and passwords
+if isinstance(value, unicode):
+  value = value.encode('utf8')
 status = self._cli.setAttr(str(name), str(value))
 if status and name == 'username':
   status = self._cli.setAttr('externaluser', str(value))



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



svn commit: r1651216 - /qpid/trunk/qpid/tools/src/py/qpid-route

2015-01-12 Thread eallen
Author: eallen
Date: Mon Jan 12 22:18:34 2015
New Revision: 1651216

URL: http://svn.apache.org/r1651216
Log:
QPID-6013 qpid-route should warn when a federation link was not created 
successfully

Modified:
qpid/trunk/qpid/tools/src/py/qpid-route

Modified: qpid/trunk/qpid/tools/src/py/qpid-route
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-route?rev=1651216&r1=1651215&r2=1651216&view=diff
==
--- qpid/trunk/qpid/tools/src/py/qpid-route (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-route Mon Jan 12 22:18:34 2015
@@ -25,6 +25,7 @@ import socket
 import os
 import locale
 from qmf.console import Session, BrokerURL
+from time import sleep
 
 usage = """
 Usage:  qpid-route [OPTIONS] dynamic add
[tag] [exclude-list] [mechanism]
@@ -184,6 +185,21 @@ class RouteManager:
 return link
 return None
 
+def checkLink(self, link):
+retry = 3
+while link is None or (link.state in ("Waiting", "Connecting", 
"Closing") and retry > 0):
+sleep(1)
+link = self.getLink()
+retry -= 1
+
+if link == None:
+raise Exception("Link failed to create")
+
+if link.state == "Failed":
+raise Exception("Link failed to create %s" % (link.lastError or 
""))
+elif config._verbose:
+print "Link state is", link.state
+
 def addLink(self, remoteBroker, interbroker_mechanism=""):
 self.remote = BrokerURL(remoteBroker)
 if self.local.match(self.remote.host, self.remote.port):
@@ -196,8 +212,6 @@ class RouteManager:
 res = broker.connect(self.remote.host, self.remote.port, 
config._durable,
  interbroker_mechanism, self.remote.authName 
or "", self.remote.authPass or "",
  config._transport)
-if config._verbose:
-print "Connect method returned:", res.status, res.text
 
 def delLink(self, remoteBroker):
 self.remote = BrokerURL(remoteBroker)
@@ -321,8 +335,7 @@ class RouteManager:
 
 self.addLink(remoteBroker, interbroker_mechanism)
 link = self.getLink()
-if link == None:
-raise Exception("Link failed to create")
+self.checkLink(link)
 
 bridges = self.agent.getObjects(_class="bridge")
 for bridge in bridges:
@@ -345,8 +358,7 @@ class RouteManager:
 def addQueueRoute(self, remoteBroker, interbroker_mechanism, exchange, 
queue ):
 self.addLink(remoteBroker, interbroker_mechanism)
 link = self.getLink()
-if link == None:
-raise Exception("Link failed to create")
+self.checkLink(link)
 
 bridges = self.agent.getObjects(_class="bridge")
 for bridge in bridges:
@@ -537,6 +549,7 @@ def main(argv=None):
 interbroker_mechanism = ""
 if nargs > 4: interbroker_mechanism = args[4]
 rm.addLink(remoteBroker, interbroker_mechanism)
+rm.checkLink(rm.getLink())
 elif cmd == "del":
 if nargs != 4:
 Usage()



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-201 Updates for dispatch 0.6.0

2016-03-29 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 8475aca8f -> 96ce4a6c8


DISPATCH-201 Updates for dispatch 0.6.0


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/96ce4a6c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/96ce4a6c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/96ce4a6c

Branch: refs/heads/master
Commit: 96ce4a6c869c7caa1d8d762c9227da23fb98ca04
Parents: 8475aca
Author: Ernest Allen 
Authored: Tue Mar 29 10:42:05 2016 -0400
Committer: Ernest Allen 
Committed: Tue Mar 29 10:42:05 2016 -0400

--
 .../src/main/webapp/plugin/css/brokers.ttf  | Bin 0 -> 2272 bytes
 .../src/main/webapp/plugin/css/plugin.css   | 106 +++-
 .../src/main/webapp/plugin/css/qdrTopology.css  |  76 ++-
 .../src/main/webapp/plugin/html/qdrList.html|  54 +-
 .../main/webapp/plugin/html/qdrOverview.html|   2 +-
 .../main/webapp/plugin/html/qdrTopology.html|  16 +-
 .../src/main/webapp/plugin/js/dispatchPlugin.js |  21 +-
 .../hawtio/src/main/webapp/plugin/js/navbar.js  |   4 +-
 .../hawtio/src/main/webapp/plugin/js/qdrList.js | 260 --
 .../src/main/webapp/plugin/js/qdrOverview.js|  54 +-
 .../src/main/webapp/plugin/js/qdrService.js | 208 +---
 .../src/main/webapp/plugin/js/qdrTopology.js| 492 ---
 12 files changed, 979 insertions(+), 314 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/96ce4a6c/console/hawtio/src/main/webapp/plugin/css/brokers.ttf
--
diff --git a/console/hawtio/src/main/webapp/plugin/css/brokers.ttf 
b/console/hawtio/src/main/webapp/plugin/css/brokers.ttf
new file mode 100644
index 000..ae83968
Binary files /dev/null and 
b/console/hawtio/src/main/webapp/plugin/css/brokers.ttf differ

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/96ce4a6c/console/hawtio/src/main/webapp/plugin/css/plugin.css
--
diff --git a/console/hawtio/src/main/webapp/plugin/css/plugin.css 
b/console/hawtio/src/main/webapp/plugin/css/plugin.css
index c6f5cc1..889bf72 100644
--- a/console/hawtio/src/main/webapp/plugin/css/plugin.css
+++ b/console/hawtio/src/main/webapp/plugin/css/plugin.css
@@ -279,10 +279,13 @@ div.qdrList li.active, ul.qdrListNodes li.active {
 div.qdr-attributes span.dynatree-selected a {
 background-color: #e0e0ff;
 }
-div.qdr-attributes.pane {
+div.qdr-attributes.pane, div.qdr-topology.pane {
position: absolute;
margin-left: 10px;
 }
+div.qdr-topology.pane.left {
+   width: auto;
+}
 
 /* the selected row in the name table */
 div#main.qdr div.qdrList div.selected {
@@ -428,8 +431,8 @@ ul.qdrTopoModes {
background:#e0e0ff;
 }
 
-.qdr-overview.pane.left, .qdr-attributes.pane.left {
-   top: 100px;
+.qdr-overview.pane.left, .qdr-attributes.pane.left, .qdr-topology.pane.left {
+   top: 104px;
 }
 .qdr-overview.pane.left {
left: 10px;
@@ -723,3 +726,100 @@ span:not(.dynatree-has-children).allocator 
.dynatree-icon:before {
 .changed {
 color: #339933;
 }
+
+div.dispatch-router div.help {
+width: auto;
+padding: 1em;
+background-color: lavender;
+border-radius: 6px;
+margin-top: 1em;
+text-align: center;
+}
+
+div.operations tr:nth-child(even) {
+   background: #f3f3f3;
+}
+div.operations tr:nth-child(odd), div.operations tr:last-child {
+   background: #fff;
+}
+
+div.operations tr input {
+   margin: 0;
+   padding: 3px 6px;
+}
+div.operations table {
+width: 100%;
+}
+div.operations th {
+width: 50%;
+border-bottom: 1px solid #cc;
+text-align: left;
+}
+div.operations td:nth-child(odd), div.operations th:nth-child(odd) {
+   border-right: 1px solid #cc;
+}
+div.operations td:nth-child(odd) {
+   padding-left: 0;
+}
+div.operations td:nth-child(even), div.operations th:nth-child(even) {
+   padding-left: 5px;
+}
+div.operations th {
+   padding: 5px;
+}
+div.operations .tab-pane.active {
+padding: 12px 12px 12px 0;
+}
+div.operations label {
+padding-top: 4px;
+margin-bottom: 4px;
+}
+.qdrListActions .ngGrid {
+   /*min-height: 40em;
+   height: 100%; */
+}
+div.qdrListActions .ngViewport {
+height: initial !important;
+}
+
+div.operations .boolean {
+padding-bottom: 0;
+}
+
+table.log-entry {
+margin-bottom: 1em;
+border-top: 1px solid black;
+}
+
+table.log-entry pre {
+background-color: #f5f5f5;
+color: inherit;
+margin: 0;
+}
+
+circle.node.normal.console {
+fill: lightcyan;
+}
+
+text.console, text.on-demand, text.normal {
+   font-family: FontAwesome;
+   font-weight: normal;
+   font-size: 16px;
+}
+
+@font-face {
+font

qpid-dispatch git commit: DISPATCH-201: Implemented DELETE. Removed jsonFormatter. Prevent occational error on loading ui-slider

2016-03-30 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master aea968659 -> d49adbdb1


DISPATCH-201: Implemented DELETE. Removed jsonFormatter. Prevent occational 
error on loading ui-slider


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/d49adbdb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/d49adbdb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/d49adbdb

Branch: refs/heads/master
Commit: d49adbdb1b4e2e350e94ecb56b9b9b67257e466a
Parents: aea9686
Author: Ernest Allen 
Authored: Wed Mar 30 15:47:29 2016 -0400
Committer: Ernest Allen 
Committed: Wed Mar 30 15:47:29 2016 -0400

--
 .../src/main/webapp/plugin/css/plugin.css   | 13 ++
 .../src/main/webapp/plugin/html/qdrList.html|  9 +++-
 .../src/main/webapp/plugin/html/qdrSchema.html  |  2 +-
 .../src/main/webapp/plugin/js/dispatchPlugin.js | 25 --
 .../hawtio/src/main/webapp/plugin/js/qdrList.js | 48 ++--
 .../src/main/webapp/plugin/js/qdrSchema.js  | 34 +-
 .../src/main/webapp/plugin/js/qdrService.js |  7 ++-
 7 files changed, 104 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/d49adbdb/console/hawtio/src/main/webapp/plugin/css/plugin.css
--
diff --git a/console/hawtio/src/main/webapp/plugin/css/plugin.css 
b/console/hawtio/src/main/webapp/plugin/css/plugin.css
index 889bf72..6ea72be 100644
--- a/console/hawtio/src/main/webapp/plugin/css/plugin.css
+++ b/console/hawtio/src/main/webapp/plugin/css/plugin.css
@@ -823,3 +823,16 @@ text.qpid-cpp.on-demand {
 font-size: 18px;
 font-weight: bold;
 }
+
+i.red {
+   color: red;
+}
+
+.qdrListActions div.delete {
+width: 20em;
+margin: auto;
+border: 1px solid #eaeaea;
+height: 5em;
+padding: 4em;
+background-color: #fcfcfc;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/d49adbdb/console/hawtio/src/main/webapp/plugin/html/qdrList.html
--
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrList.html 
b/console/hawtio/src/main/webapp/plugin/html/qdrList.html
index d07d3ca..41b2b0e 100644
--- a/console/hawtio/src/main/webapp/plugin/html/qdrList.html
+++ b/console/hawtio/src/main/webapp/plugin/html/qdrList.html
@@ -34,8 +34,15 @@ under the License.
 There are no {{selectedEntity}}s
 
 
+
+
+Delete {{selectedRecordName}}
+
+
+There are no {{selectedEntity}}s
+
+
 
-
 
 
 

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/d49adbdb/console/hawtio/src/main/webapp/plugin/html/qdrSchema.html
--
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrSchema.html 
b/console/hawtio/src/main/webapp/plugin/html/qdrSchema.html
index 15ebb46..6661baf 100644
--- a/console/hawtio/src/main/webapp/plugin/html/qdrSchema.html
+++ b/console/hawtio/src/main/webapp/plugin/html/qdrSchema.html
@@ -17,5 +17,5 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
+
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/d49adbdb/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js 
b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
index 5061317..ce52092 100644
--- a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
+++ b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
@@ -5,6 +5,9 @@
  * The main entry point for the QDR module
  *
  */
+$.getScript('https://cdn.rawgit.com/angular-ui/ui-slider/master/src/slider.js',
 function() {
+   hawtioPluginLoader.addModule('ui.slider');
+});
 var QDR = (function(QDR) {
 
   /**
@@ -52,7 +55,7 @@ var QDR = (function(QDR) {
* workspace, viewRegistry and layoutFull used by the
* run function
*/
-  QDR.module = angular.module('dispatch_plugin', ['bootstrap', 
'jsonFormatter', 'hawtio-ui', 'hawtio-forms', 'ui.bootstrap.dialog', 
'hawtioCore'])
+  QDR.module = angular.module('dispatch_plugin', ['bootstrap', 'hawtio-ui', 
'hawtio-forms', 'ui.bootstrap.dialog', 'hawtioCore'])
   .config(function($routeProvider) {
 /**
  * Here we define the route for our plugin.  One note is
@@ -88,12 +91,9 @@ var QDR = (function(QDR) {

$compileProvider.urlSanitizationWhitelis

qpid-dispatch git commit: DISPATCH-271 When GET-MGMT-NODES returns an empty list, use receiver's source address to derive the current router ID

2016-04-13 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 8b1b7b979 -> d281644e7


DISPATCH-271 When GET-MGMT-NODES returns an empty list, use receiver's source 
address to derive the current router ID


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/d281644e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/d281644e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/d281644e

Branch: refs/heads/master
Commit: d281644e74565ae61b0366e8d3f557ed0ceb2705
Parents: 8b1b7b9
Author: Ernest Allen 
Authored: Wed Apr 13 14:04:48 2016 -0400
Committer: Ernest Allen 
Committed: Wed Apr 13 14:04:48 2016 -0400

--
 .../hawtio/src/main/webapp/plugin/js/qdrList.js | 13 +++---
 .../src/main/webapp/plugin/js/qdrService.js | 42 +---
 2 files changed, 19 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/d281644e/console/hawtio/src/main/webapp/plugin/js/qdrList.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrList.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
index 2c69a1c..601acf5 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrList.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
@@ -97,11 +97,6 @@ var QDR = (function(QDR) {
$scope.selectMode = function (mode) {
$scope.currentMode = mode;
if (mode.id === 'log') {
-   var ops = lookupOperations();
-   if (ops.indexOf("LOG") == -1) {
-   $scope.currentMode = $scope.modes[0]
-   return;
-   }
$scope.logResults = "getting recent log 
entries...";
QDRService.sendMethod($scope.currentNode.id, 
$scope.selectedEntity, {}, $scope.currentMode.op, function (nodeName, entity, 
response, context) {
$scope.logResults = response.filter( 
function (entry) {
@@ -407,7 +402,15 @@ var QDR = (function(QDR) {
 
$scope.tableRows = [];
var selectedRowIndex = 0;
+
+   /* Called periodically to refresh the data on the page */
var updateTableData = function (entity, expand) {
+   if (!QDRService.connected) {
+   // we are no longer connected. bail back to the 
connect page
+   $location.path("/dispatch_plugin/connect")
+   $location.search('org', "list");
+   return;
+   }
// don't update the data when on the operations tab
if ($scope.currentMode.id === 'operations') {
return;

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/d281644e/console/hawtio/src/main/webapp/plugin/js/qdrService.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrService.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
index d944d92..c46e7ad 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrService.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
@@ -288,10 +288,18 @@ var QDR = (function(QDR) {
 
 // get the list of nodes to query.
 // once this completes, we will get the info for each node returned
-self.getRemoteNodeInfo( function (response) {
+self.getRemoteNodeInfo( function (response, context) {
 //QDR.log.debug("got remote node list of ");
 //console.dump(response);
 if( Object.prototype.toString.call( response ) === '[object 
Array]' ) {
+   if (response.length === 0) {
+   // there is only one router, 
get its node id from the reeciiver
+   
//"amqp:/_topo/0/Router.A/temp.aSO3+WGaoNUgGVx"
+   var address = 
context.receiver.remote.attach.source.address;
+   var addrParts = 
address.split('/')
+   
addrParts.splice(addrParts.length-1, 1, '$management')
+   response = [addrParts.join('/')]
+   }
 // we expect a response for each of these nodes
 self.topology.wait(self.timeout);
 for (var i

qpid-dispatch git commit: DISPATCH-275: Initialize grid variables before redirecting to connect page

2016-04-18 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 08d69ce0e -> b175a1d27


DISPATCH-275: Initialize grid variables before redirecting to connect page


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/b175a1d2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/b175a1d2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/b175a1d2

Branch: refs/heads/master
Commit: b175a1d2725290343054f15f47c979b11bc983f4
Parents: 08d69ce
Author: Ernest Allen 
Authored: Mon Apr 18 12:54:23 2016 -0400
Committer: Ernest Allen 
Committed: Mon Apr 18 12:54:23 2016 -0400

--
 .../hawtio/src/main/webapp/plugin/js/qdrList.js |  2 +-
 .../src/main/webapp/plugin/js/qdrOverview.js| 33 ++-
 .../src/main/webapp/plugin/js/qdrTopology.js| 59 +---
 3 files changed, 34 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b175a1d2/console/hawtio/src/main/webapp/plugin/js/qdrList.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrList.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
index 601acf5..5e22b3c 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrList.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
@@ -31,7 +31,7 @@ var QDR = (function(QDR) {
QDR.module.controller("QDR.ListController", ['$scope', '$location', 
'$dialog', '$filter', 'localStorage', 'QDRService', 'QDRChartService',
function ($scope, $location, $dialog, $filter, localStorage, 
QDRService, QDRChartService) {
 
-   $scope.details = [];
+   $scope.details = {};
if (!QDRService.connected) {
// we are not connected. we probably got here from a 
bookmark or manual page reload
$location.path("/dispatch_plugin/connect")

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b175a1d2/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
index bf75ffd..f25df04 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
@@ -39,11 +39,6 @@ var QDR = (function (QDR) {
 
console.log("QDR.OverviewControll started with location of " + 
$location.path() + " and connection of  " + QDRService.connected);
 
-   if (!QDRService.connected) {
-   // we are not connected. we probably got here from a 
bookmark or manual page reload
-   $location.path("/dispatch_plugin/connect")
-   return;
-   }
// we want attributes to be listed first, so add it at index 0
$scope.subLevelTabs = [{
content: ' Attributes',
@@ -444,28 +439,6 @@ var QDR = (function (QDR) {
 }
 }
 };
-/*
-   $scope.allConnectionGrid = {
-   data: 'allConnectionFields',
-   columnDefs: allConnectionCols,
-   enableHorizontalScrollbar: 
uiGridConstants.scrollbars.NEVER,
-   enableVerticalScrollbar: uiGridConstants.scrollbars.NEVER,
-   enableColumnResize: true,
-   multiSelect: false,
-   enableRowHeaderSelection: false,
-   noUnselect: true,
-   enableSelectAll: false,
-   enableRowSelection: true,
-   onRegisterApi: function (gridApi) {
-   
gridApi.selection.on.rowSelectionChanged($scope, function(row) {
-   if (row.isSelected) {
-   var host = 
row.entity.host;
-   
$("#overtree").fancytree("getTree").activateKey(host);
-   }
-   });
-   }
-   }
-*/
connections.children.forEach( function (connection) {

$scope.allConnectionFields.push(connection.fields)
})
@@ -567,6 +540,12 @@ var QDR = (function (QDR) {
}
 $scope.template = $scope.templates[0];
 
+   if (!QDRService.connected) {
+ 

[1/3] qpid-dispatch git commit: DISPATCH-282: Defer topology updates when adding a new node on topology page

2016-04-20 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 1c46b7c68 -> c2ee7cb56


DISPATCH-282: Defer topology updates when adding a new node on topology page


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/fcd0bdf4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/fcd0bdf4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/fcd0bdf4

Branch: refs/heads/master
Commit: fcd0bdf4c63c23203aef72f3960aa3cc246a51ca
Parents: b175a1d
Author: Ernest Allen 
Authored: Mon Apr 18 13:34:34 2016 -0400
Committer: Ernest Allen 
Committed: Mon Apr 18 13:34:34 2016 -0400

--
 .../hawtio/src/main/webapp/plugin/js/qdrTopology.js | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fcd0bdf4/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index dbdc8e3..3416f97 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -590,7 +590,7 @@ var QDR = (function (QDR) {
 
$scope.$broadcast('showEntityForm', {entity: 
entity, attributes: attributes})
}
-   $scope.$apply();
+   if (!$scope.$$phase) $scope.$apply()
}
 
 function getContainerIndex(_id) {
@@ -1067,7 +1067,7 @@ var QDR = (function (QDR) {
// add a link from the clicked 
node to the new node
getLink(d.id, nodes.length-1, 
"in", "temp");
$scope.addingNode.hasLink = 
true;
-   $scope.$apply();
+   if (!$scope.$$phase) 
$scope.$apply()
// add new elements to the svg
force.links(links).start();
restart();
@@ -1088,7 +1088,7 @@ var QDR = (function (QDR) {
 links[i]['highlighted'] = false;
 }
mousedown_node = null;
-$scope.$apply();
+   if (!$scope.$$phase) $scope.$apply()
 restart(false);
 
})
@@ -1099,14 +1099,14 @@ var QDR = (function (QDR) {
}
if (QDRService.nameFromId(d.key) == '__internal__') {
editNode();
-   $scope.$apply();
+   if (!$scope.$$phase) 
$scope.$apply()
}
})
.on("contextmenu", function(d) {
$(document).click();
 d3.event.preventDefault();
$scope.contextNode = d;
-   $scope.$apply();// we just changed a scope valiable 
during an async event
+   if (!$scope.$$phase) $scope.$apply()
 // we just changed a scope valiable during an async event
 d3.select('#node_context_menu')
   .style('left', (mouseX + $(document).scrollLeft()) + 
"px")
   .style('top', (mouseY + $(document).scrollTop()) + "px")
@@ -1126,7 +1126,7 @@ var QDR = (function (QDR) {
 d.normals.forEach( function (n) {
 $scope.multiData.push(n)
 })
-$scope.$apply();
+   if (!$scope.$$phase) $scope.$apply()
 d3.select('#multiple_details')
 .style({
 display: 'block',
@@ -1301,6 +1301,10 @@ var QDR = (function (QDR) {
 });
 
function hasChanged () {
+   // Don't update the underlying topology diagram if we 
are adding a new node.
+   // Once adding is completed, the topology will update 
automatically if it has changed
+   if ($scope.addingNode.step > 0)
+   return false;
var nodeInfo = QDRService.topology.nodeInfo();
if (Object.keys(nodeInfo).length != 
Object.keys(savedKeys).length)
return true;


-
To unsubscribe

[3/3] qpid-dispatch git commit: DISPATCH-282: Don't update topology when in 'Add' mode

2016-04-20 Thread eallen
DISPATCH-282: Don't update topology when in 'Add' mode


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c2ee7cb5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c2ee7cb5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c2ee7cb5

Branch: refs/heads/master
Commit: c2ee7cb56b4424c2b675996815eaa31207366ef2
Parents: ea31572
Author: Ernest Allen 
Authored: Wed Apr 20 13:59:19 2016 -0400
Committer: Ernest Allen 
Committed: Wed Apr 20 13:59:19 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c2ee7cb5/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index 3416f97..787c51d 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -1304,7 +1304,7 @@ var QDR = (function (QDR) {
// Don't update the underlying topology diagram if we 
are adding a new node.
// Once adding is completed, the topology will update 
automatically if it has changed
if ($scope.addingNode.step > 0)
-   return false;
+   return false; 
var nodeInfo = QDRService.topology.nodeInfo();
if (Object.keys(nodeInfo).length != 
Object.keys(savedKeys).length)
return true;


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



[2/3] qpid-dispatch git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/qpid-dispatch

2016-04-20 Thread eallen
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/qpid-dispatch


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/ea315721
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/ea315721
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/ea315721

Branch: refs/heads/master
Commit: ea3157215764a2eba19f6de410731f55daa713dc
Parents: fcd0bdf 1c46b7c
Author: Ernest Allen 
Authored: Wed Apr 20 13:44:00 2016 -0400
Committer: Ernest Allen 
Committed: Wed Apr 20 13:44:00 2016 -0400

--
 include/qpid/dispatch/connection_manager.h|  60 -
 python/qpid_dispatch/management/qdrouter.json |   5 +
 src/connection_manager.c  | 122 -
 src/container.c   |   5 -
 src/iterator.c|  23 ++--
 src/policy.c  |   2 -
 src/router_core/agent_config_link_route.c |   7 +
 src/router_core/agent_config_link_route.h |   2 +-
 src/router_core/connections.c |   2 +-
 src/router_core/route_control.c   |   4 +
 src/router_core/router_core_private.h |   1 +
 src/server.c  |   5 +
 src/server_private.h  |   6 +
 tests/field_test.c|  70 ++
 tests/system_tests_link_routes.py |  21 ---
 tests/system_tests_sasl_plain.py  | 147 +
 tools/qdmanage|   3 +
 tools/qdstat  |   2 +
 18 files changed, 259 insertions(+), 228 deletions(-)
--



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-283: Fix typo that was preventing router nodes from being expanded in the tree

2016-04-20 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master c2ee7cb56 -> 20a43f75c


DISPATCH-283: Fix typo that was preventing router nodes from being expanded in 
the tree


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/20a43f75
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/20a43f75
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/20a43f75

Branch: refs/heads/master
Commit: 20a43f75c0a7226a4439aca3af9a0955ee353728
Parents: c2ee7cb
Author: Ernest Allen 
Authored: Wed Apr 20 14:24:57 2016 -0400
Committer: Ernest Allen 
Committed: Wed Apr 20 14:24:57 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/qdrOverview.js | 2 +-
 console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/20a43f75/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
index f25df04..2f01645 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js
@@ -556,7 +556,7 @@ var QDR = (function (QDR) {
routers.type = "Routers"
routers.info = allRouterInfo
routers.focus = true
-   routers.expanded = true
+   routers.expand = true
routers.key = "Routers"
routers.addClass = "routers"
topLevelChildren.push(routers)

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/20a43f75/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index 787c51d..7acbe0f 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -1126,7 +1126,7 @@ var QDR = (function (QDR) {
 d.normals.forEach( function (n) {
 $scope.multiData.push(n)
 })
-   if (!$scope.$$phase) $scope.$apply()
+$scope.$apply();
 d3.select('#multiple_details')
 .style({
 display: 'block',
@@ -1304,7 +1304,7 @@ var QDR = (function (QDR) {
// Don't update the underlying topology diagram if we 
are adding a new node.
// Once adding is completed, the topology will update 
automatically if it has changed
if ($scope.addingNode.step > 0)
-   return false; 
+   return false;
var nodeInfo = QDRService.topology.nodeInfo();
if (Object.keys(nodeInfo).length != 
Object.keys(savedKeys).length)
return true;


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-292: Add graph to some router.link attributes

2016-04-21 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 1d258301c -> 8aa2ea2b1


DISPATCH-292: Add graph to some router.link attributes


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/8aa2ea2b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/8aa2ea2b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/8aa2ea2b

Branch: refs/heads/master
Commit: 8aa2ea2b142c090f53fbcd99a1decc17da5a6032
Parents: 1d25830
Author: Ernest Allen 
Authored: Thu Apr 21 17:45:24 2016 -0400
Committer: Ernest Allen 
Committed: Thu Apr 21 17:45:24 2016 -0400

--
 python/qpid_dispatch/management/qdrouter.json | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/8aa2ea2b/python/qpid_dispatch/management/qdrouter.json
--
diff --git a/python/qpid_dispatch/management/qdrouter.json 
b/python/qpid_dispatch/management/qdrouter.json
index 8fb40ba..69d5192 100644
--- a/python/qpid_dispatch/management/qdrouter.json
+++ b/python/qpid_dispatch/management/qdrouter.json
@@ -1051,14 +1051,17 @@
 },
 "undeliveredCount": {
 "type": "integer",
+"graph": true,
 "description": "The number of undelivered messages pending 
for the link."
 },
 "unsettledCount": {
 "type": "integer",
+"graph": true,
 "description": "The number of unsettled deliveries 
awaiting settlement on the link"
 },
 "deliveryCount": {
 "type": "integer",
+"graph": true,
 "description": "The total number of deliveries that have 
traversed this link."
 }
 }


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-273: Force a window reflow event to get table to draw

2016-04-22 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master fe485cdca -> 279c1b4c6


DISPATCH-273: Force a window reflow event to get table to draw


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/279c1b4c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/279c1b4c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/279c1b4c

Branch: refs/heads/master
Commit: 279c1b4c6354dd7ba1ccfb6f471c0957548dc1e1
Parents: fe485cd
Author: Ernest Allen 
Authored: Fri Apr 22 13:56:18 2016 -0400
Committer: Ernest Allen 
Committed: Fri Apr 22 13:56:18 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/qdrList.js | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/279c1b4c/console/hawtio/src/main/webapp/plugin/js/qdrList.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrList.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
index 5e22b3c..8e64dc2 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrList.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
@@ -363,9 +363,15 @@ var QDR = (function(QDR) {
})
$scope.detailsObject[attr] = row[attr].value;
})
+   setTimeout(applyDetails, 1, details)
+   }
+
+   var applyDetails = function (details) {
$scope.detailFields = details;
aggregateColumn();
$scope.$apply();
+   // ng-grid bug? the entire table doesn't always draw 
unless a reflow is triggered;
+   $(window).trigger('resize');
}
 
var restartUpdate = function () {


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: No JIRA: bring stand-alone console up to date

2016-04-26 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master fc392d7cc -> 387044be4


No JIRA: bring stand-alone console up to date


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/387044be
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/387044be
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/387044be

Branch: refs/heads/master
Commit: 387044be4916c47b4499d2f567c9241ca77cc53d
Parents: fc392d7
Author: Ernest Allen 
Authored: Tue Apr 26 12:29:09 2016 -0400
Committer: Ernest Allen 
Committed: Tue Apr 26 12:29:09 2016 -0400

--
 console/stand-alone/plugin/css/brokers.ttf  | Bin 0 -> 2272 bytes
 console/stand-alone/plugin/css/plugin.css   |  26 +
 console/stand-alone/plugin/css/qdrTopology.css  |  90 ++-
 .../stand-alone/plugin/html/qdrTopology.html|  18 +-
 console/stand-alone/plugin/js/qdrService.js | 265 +---
 console/stand-alone/plugin/js/qdrTopology.js| 602 ---
 6 files changed, 654 insertions(+), 347 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/387044be/console/stand-alone/plugin/css/brokers.ttf
--
diff --git a/console/stand-alone/plugin/css/brokers.ttf 
b/console/stand-alone/plugin/css/brokers.ttf
new file mode 100644
index 000..ae83968
Binary files /dev/null and b/console/stand-alone/plugin/css/brokers.ttf differ

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/387044be/console/stand-alone/plugin/css/plugin.css
--
diff --git a/console/stand-alone/plugin/css/plugin.css 
b/console/stand-alone/plugin/css/plugin.css
index 5097d64..ef8d2e1 100644
--- a/console/stand-alone/plugin/css/plugin.css
+++ b/console/stand-alone/plugin/css/plugin.css
@@ -656,3 +656,29 @@ div.login.container {
   opacity:1;
 }
 
+circle.node.normal.console {
+fill: lightcyan;
+}
+
+text.console, text.on-demand, text.normal {
+   font-family: FontAwesome;
+   font-weight: normal;
+   font-size: 16px;
+}
+
+@font-face {
+font-family:"Brokers";
+src: url("brokers.ttf") /* TTF file for CSS3 browsers */
+}
+
+text.artemis.on-demand {
+font-family: Brokers;
+font-size: 20px;
+font-weight: bold;
+}
+
+text.qpid-cpp.on-demand {
+font-family: Brokers;
+font-size: 18px;
+font-weight: bold;
+}

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/387044be/console/stand-alone/plugin/css/qdrTopology.css
--
diff --git a/console/stand-alone/plugin/css/qdrTopology.css 
b/console/stand-alone/plugin/css/qdrTopology.css
index e1cf239..f8cffed 100644
--- a/console/stand-alone/plugin/css/qdrTopology.css
+++ b/console/stand-alone/plugin/css/qdrTopology.css
@@ -97,7 +97,11 @@ circle.node.normal {
 fill: #F0F000;
 }
 circle.node.on-demand {
-fill: #00F000;
+fill: #C0FFC0;
+}
+circle.node.on-demand.artemis {
+   fill: #FCC;
+   /*opacity: 0.2; */
 }
 
 circle.node.fixed {
@@ -148,6 +152,11 @@ text.id {
   font-weight: bold;
 }
 
+text.label {
+  text-anchor: start;
+  font-weight: bold;
+}
+
 .row-fluid.tertiary {
   position: relative;
   left: 20px;
@@ -159,7 +168,26 @@ text.id {
 
 .row-fluid.tertiary.panel {
   width: 410px;
-  height: 100%;
+  /*height: 100%; */
+}
+
+/*, div.qdrTopology div#multiple_details .ngViewport*/
+div#topologyForm .ngViewport, div#topologyForm .gridStyle {
+height: inherit !important;
+   min-height: initial !important;
+   overflow: initial;
+}
+
+div#multiple_details {
+   height: 300px;
+   width: 500px;
+   display: none;
+   padding: 1em;
+border: 1px solid;
+   position: absolute;
+   background-color: white;
+   max-height: 330px !important;
+overflow: hidden;
 }
 
 .panel-adjacent {
@@ -170,10 +198,13 @@ text.id {
   border: 1px solid red;
 }
 #topologyForm {
-  border: 1px solid white;
-  padding: 2px;
-  position: relative;
-  top: -8px;
+border: 1px solid white;
+padding: 2px;
+/* position: relative; */
+/* top: -8px; */
+}
+div.qdr-topology.pane.left .ngViewport {
+/* border: 1px solid lightgray; */
 }
 
 #topologyForm > div {
@@ -249,6 +280,7 @@ li.currentStep {
 }
 */
 
+/*
 .ui-tabs.ui-tabs-vertical {
 padding: 0;
 width: 48em;
@@ -307,6 +339,7 @@ li.currentStep {
 .ui-tabs li i.ui-icon {
 display: inline-block;
 }
+*/
 .ui-tabs .ui-tabs-panel {
 /* padding-top: 0 !important; */
 }
@@ -371,17 +404,18 @@ li.currentStep {
   overflow-x: hidden;
 }
 
-.entity-fields div.boolean label:first-child {
+div.boolean label:first-child {
 float: left;
 margin-right: 1em;
 }
-.entity-fields div.boolean {
+div.boolean {
 pa

qpid-dispatch git commit: DISPATCH-272: Use the connectionId attribute to associate links with connections

2016-04-27 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 159444b28 -> 0441ea300


DISPATCH-272: Use the connectionId attribute to associate links with connections


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/0441ea30
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/0441ea30
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/0441ea30

Branch: refs/heads/master
Commit: 0441ea300ab2376baf3745c1ca897201c8dbe844
Parents: 159444b
Author: Ernest Allen 
Authored: Wed Apr 27 13:57:03 2016 -0400
Committer: Ernest Allen 
Committed: Wed Apr 27 13:57:03 2016 -0400

--
 .../simpleplugin/PluginContextListener.java | 37 
 .../qpid/dispatch/PluginContextListener.java| 37 
 .../hawtio/src/main/resources/WEB-INF/web.xml   |  2 +-
 .../src/main/webapp/plugin/js/qdrTopology.js| 11 --
 console/stand-alone/index.html  |  2 ++
 console/stand-alone/plugin/js/qdrTopology.js| 12 ---
 6 files changed, 56 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0441ea30/console/hawtio/src/main/java/io/hawt/example/simpleplugin/PluginContextListener.java
--
diff --git 
a/console/hawtio/src/main/java/io/hawt/example/simpleplugin/PluginContextListener.java
 
b/console/hawtio/src/main/java/io/hawt/example/simpleplugin/PluginContextListener.java
deleted file mode 100644
index a417786..000
--- 
a/console/hawtio/src/main/java/io/hawt/example/simpleplugin/PluginContextListener.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.hawt.dispatch;
-
-import io.hawt.web.plugin.HawtioPlugin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-public class PluginContextListener implements ServletContextListener {
-
-  private static final Logger LOG = 
LoggerFactory.getLogger(PluginContextListener.class);
-
-  HawtioPlugin plugin = null;
-
-  @Override
-  public void contextInitialized(ServletContextEvent servletContextEvent) {
-
-ServletContext context = servletContextEvent.getServletContext();
-
-plugin = new HawtioPlugin();
-plugin.setContext((String)context.getInitParameter("plugin-context"));
-plugin.setName(context.getInitParameter("plugin-name"));
-plugin.setScripts(context.getInitParameter("plugin-scripts"));
-plugin.setDomain(null);
-plugin.init();
-
-LOG.info("Initialized {} plugin", plugin.getName());
-  }
-
-  @Override
-  public void contextDestroyed(ServletContextEvent servletContextEvent) {
-plugin.destroy();
-LOG.info("Destroyed {} plugin", plugin.getName());
-  }
-}

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0441ea30/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
--
diff --git 
a/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
 
b/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
new file mode 100644
index 000..7905ac0
--- /dev/null
+++ 
b/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
@@ -0,0 +1,37 @@
+package org.apache.qpid.dispatch;
+
+import io.hawt.web.plugin.HawtioPlugin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+public class PluginContextListener implements ServletContextListener {
+
+  private static final Logger LOG = 
LoggerFactory.getLogger(PluginContextListener.class);
+
+  HawtioPlugin plugin = null;
+
+  @Override
+  public void contextInitialized(ServletContextEvent servletContextEvent) {
+
+ServletContext context = servletContextEvent.getServletContext();
+
+plugin = new HawtioPlugin();
+plugin.setContext((String)context.getInitParameter("plugin-context"));
+plugin.setName(context.getInitParameter("plugin-name"));
+plugin.setScripts(context.getInitParameter("plugin-scripts"));
+plugin.setDomain(null);
+plugin.init();
+
+LOG.info("Initialized {} plugin", plugin.getName());
+  }
+
+  @Override
+  public void contextDestroyed(ServletContextEvent servletContextEvent) {
+plugin.destroy();
+LOG.info("Destroyed {} plugin", plugin.getName());
+  }
+}

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0441ea30/console/hawtio/src/main/resources/WEB-INF/web.xml
--
diff --git a/console/hawtio/src/main/resources/WEB-INF/web.xml 
b/console/

svn commit: r1666447 - /qpid/trunk/qpid/python/qpid/messaging/endpoints.py

2015-03-13 Thread eallen
Author: eallen
Date: Fri Mar 13 13:41:10 2015
New Revision: 1666447

URL: http://svn.apache.org/r1666447
Log:
QPID-6445: Revert the error checking code to *not* close, as this was causing 
the recursion problem

Modified:
qpid/trunk/qpid/python/qpid/messaging/endpoints.py

Modified: qpid/trunk/qpid/python/qpid/messaging/endpoints.py
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging/endpoints.py?rev=1666447&r1=1666446&r2=1666447&view=diff
==
--- qpid/trunk/qpid/python/qpid/messaging/endpoints.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging/endpoints.py Fri Mar 13 13:41:10 2015
@@ -220,10 +220,6 @@ class Connection(Endpoint):
   raised this time but won't block future calls
   """
   self.error = None
-  raise e
-
-  if not self._unlinked():
-  self.close()
   raise e
 
   def get_error(self):



-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-302: Pass command line options to console proxy

2016-05-02 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 00b47f15b -> 2a0e82fcb


DISPATCH-302: Pass command line options to console proxy


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/2a0e82fc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/2a0e82fc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/2a0e82fc

Branch: refs/heads/master
Commit: 2a0e82fcb6f5527f1e6718c6152f3d8841994c17
Parents: 00b47f1
Author: Ernest Allen 
Authored: Mon May 2 15:29:08 2016 -0400
Committer: Ernest Allen 
Committed: Mon May 2 15:29:08 2016 -0400

--
 console/stand-alone/plugin/js/qdrPlugin.js|  2 +-
 python/qpid_dispatch_internal/management/agent.py | 17 ++---
 2 files changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2a0e82fc/console/stand-alone/plugin/js/qdrPlugin.js
--
diff --git a/console/stand-alone/plugin/js/qdrPlugin.js 
b/console/stand-alone/plugin/js/qdrPlugin.js
index 3d14f72..c287342 100644
--- a/console/stand-alone/plugin/js/qdrPlugin.js
+++ b/console/stand-alone/plugin/js/qdrPlugin.js
@@ -46,7 +46,7 @@ var QDR = (function(QDR) {
*
* The top level path to this plugin's partials
*/
-  QDR.srcBase = "../dispatch/plugin/";
+  QDR.srcBase = "plugin/";
   QDR.templatePath = QDR.srcBase + "html/";
   QDR.cssPath = QDR.srcBase + "css/";
 

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2a0e82fc/python/qpid_dispatch_internal/management/agent.py
--
diff --git a/python/qpid_dispatch_internal/management/agent.py 
b/python/qpid_dispatch_internal/management/agent.py
index 1c91dc3..3c1dbc2 100644
--- a/python/qpid_dispatch_internal/management/agent.py
+++ b/python/qpid_dispatch_internal/management/agent.py
@@ -414,20 +414,23 @@ class ConsoleEntity(EntityAdapter):
 #required
 host   = listener.attributes['addr']
 port   = listener.attributes['port']
-wsport = self.attributes['wsport']
 #optional
+wsport = self.attributes.get('wsport')
 home   = self.attributes.get('home')
 args   = self.attributes.get('args')
 
 pargs = []
 pargs.append(self.attributes['proxy'])
-pargs.append(str(self.attributes['wsport']))
-pargs.append("%s:%s" % (host, port))
-if home:
-pargs.append("--web")
-pargs.append(self.attributes['home'])
 if args:
-pargs.append(args)
+# Replace any $port|$host|$wsport|$home
+dargs = {'$port': port, '$host': host}
+if wsport:
+dargs['$wsport'] = wsport
+if home:
+dargs['$home'] = home
+for k,v in dargs.iteritems():
+args = args.replace(k,str(v))
+pargs += args.split()
 
 #run the external program
 Popen(pargs)


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-201: changed parent, version, and some properties in pom.xml. Updated README.md build/install instructions

2016-05-04 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master b5370187e -> 71947c2c8


DISPATCH-201: changed parent, version, and some properties in pom.xml. Updated 
README.md build/install instructions


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/71947c2c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/71947c2c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/71947c2c

Branch: refs/heads/master
Commit: 71947c2c8a42e1b724b57b9583f30ea8a96bdd17
Parents: b537018
Author: Ernest Allen 
Authored: Wed May 4 15:15:53 2016 -0400
Committer: Ernest Allen 
Committed: Wed May 4 15:15:53 2016 -0400

--
 console/hawtio/README.md | 37 ++---
 console/hawtio/pom.xml   | 63 ---
 2 files changed, 50 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71947c2c/console/hawtio/README.md
--
diff --git a/console/hawtio/README.md b/console/hawtio/README.md
index 206400c..ffc255d 100644
--- a/console/hawtio/README.md
+++ b/console/hawtio/README.md
@@ -11,29 +11,11 @@ The fastest way to use the console is to run the [docker 
image](https://hub.dock
 ## Building
 The dispatch-plugin.war file is pre-built and can be installed alongside the 
hawtio.war on any system with a modern java installation. If you want to build 
the dispatch-plugin.war from source:
 
-- clone the hawtio git repo
-
-$ git clone https://github.com/hawtio/hawtio.git
-
-- build hawtio
-
-$ cd hawtio
-
-$ mvn clean install
-
-If you encounter any errors when building hawtio, visit [the hawtio build 
page](http://hawt.io/building/index.html) for help.
-
-- create a dispatch dir under the hawtio dir and copy the source code
-
-$ mkdir dispatch
-
-$ cp -r {dir where this file is located}/dispatch/* dispatch/
-
 - do a maven build of dispatch
 
-$ cd dispach
+$ cd console/hawtio
 
-$ mvn package
+$ mvn clean install
 
 The dispatch-plugin-1.4.60.war file should now be in the target directory.
 
@@ -51,16 +33,15 @@ On the Dispatch Router's console page, select the Connect 
sub tab. Enter the add
 
 ### Websockts to tcp proxy
 
-The console communicates to a router using Qpid Proton's 
[rhea](https://github.com/grs/rhea) javascript binding. When run from a 
browser, it uses websockets. 
-The router communicates using tcp. Therefore a websockts/tcp proxy is required.
+The console communicates to a router using websockets. 
+The router listens for tcp. Therefore a websockts/tcp proxy is required.
 
  Manually running a python websockets/tcp proxy
 
 A popular python based proxy is 
[websockify](https://github.com/kanaka/websockify). To use it:
 
-$ git clone https://github.com/kanaka/websockify.git
-$ cd websockify
-$ ./run 5673 0.0.0.0:20009 &
+$ yum install python-websockify
+$ websockify 5673 0.0.0.0:20009 &
 
 In the above, websockify is listening for ws traffic on port 5673 and will 
proxy it to 0.0.0.0:20009. One of the routers will need a listener on the 
proxied port. An example router .conf file entry is:
 
@@ -78,9 +59,7 @@ You can automatically start the proxy program when a router 
starts. Add the list
 
 console {
 listener: ProxyListener
-proxy:/pathToWebsockify/run
-wsport:   5673
+proxy:wobsockify
+args: $host:5673 $host:$port
 }
 
-The value for proxy: can be any program that has execute permission. The 
router will execute it and pass   as arguments.
-

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71947c2c/console/hawtio/pom.xml
--
diff --git a/console/hawtio/pom.xml b/console/hawtio/pom.xml
index effdfb4..dce200d 100644
--- a/console/hawtio/pom.xml
+++ b/console/hawtio/pom.xml
@@ -1,25 +1,28 @@
 
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+
   
-io.hawt
-project
-1.4.60
-  
-
   4.0.0
+
+  org.apache.qpid
   dispatch-plugin
+  0.6.0-SNAPSHOT
+  war
   ${project.artifactId}
-  hawtio :: hawtio Dispatch plugin
+  2016
+  https://qpid.apache.org
 
-  
-  war
+  
+hawtio :: hawtio Dispatch plugin
+  
+
+  
+3.0.4
+  
 
   
 
 
 
+
+1.4.60
+
+2.5
+1.7.13
+1.7
+2.6
+2.3.7
+2.1.1
+${project.artifactId}-${project.version}
+${basedir}/target/${webapp-dir}
+
 
-
+
   javax.servlet,
   *;resolution:=optional
-
+
   
 
   
@@ -52,7 +67,7 @@
 
   io.hawt
   hawtio-plugin-mbean
-

qpid-dispatch git commit: DISPATCH-310: Use router.id in place of container.containerName

2016-05-05 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 532c89741 -> c7f2bda7a


DISPATCH-310: Use router.id in place of container.containerName


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c7f2bda7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c7f2bda7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c7f2bda7

Branch: refs/heads/master
Commit: c7f2bda7a5973bf916a48a1e595b4e0ab3f5514f
Parents: 532c897
Author: Ernest Allen 
Authored: Thu May 5 19:20:01 2016 -0400
Committer: Ernest Allen 
Committed: Thu May 5 19:20:01 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 5 +++--
 console/stand-alone/plugin/js/qdrTopology.js| 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c7f2bda7/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index 4f0f3e7..7b02eb6 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -597,8 +597,9 @@ var QDR = (function (QDR) {
 var nodeIndex = 0;
 var nodeInfo = QDRService.topology.nodeInfo();
 for (var id in nodeInfo) {
-var node = nodeInfo[id];
-if (node['.container'].results[0][0] == _id)
+var node = nodeInfo[id]['.router'];
+// there should be only one router entity for each node
+if (QDRService.valFor( node.attributeNames, node.results[0], 
"id") === _id)
 return nodeIndex;
 nodeIndex++
 }

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c7f2bda7/console/stand-alone/plugin/js/qdrTopology.js
--
diff --git a/console/stand-alone/plugin/js/qdrTopology.js 
b/console/stand-alone/plugin/js/qdrTopology.js
index a410753..6e7ba47 100644
--- a/console/stand-alone/plugin/js/qdrTopology.js
+++ b/console/stand-alone/plugin/js/qdrTopology.js
@@ -827,8 +827,9 @@ var QDR = (function (QDR) {
 var nodeIndex = 0;
 var nodeInfo = QDRService.topology.nodeInfo();
 for (var id in nodeInfo) {
-var node = nodeInfo[id];
-if (node['.container'].results[0][0] == _id)
+var node = nodeInfo[id]['.router'];
+// there should be only one router entity for each node
+if (QDRService.valFor( node.attributeNames, node.results[0], 
"id") === _id)
 return nodeIndex;
 nodeIndex++
 }


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



[qpid-dispatch] Git Push Summary [forced push!] [Forced Update!]

2016-05-05 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master c7f2bda7a -> 532c89741 (forced update)

-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-307: Rename the artifact id to dispatch-hawtio-console for clarity

2016-05-10 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master e9f1dd495 -> c95bb8ae8


DISPATCH-307: Rename the artifact id to dispatch-hawtio-console for clarity


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c95bb8ae
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c95bb8ae
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c95bb8ae

Branch: refs/heads/master
Commit: c95bb8ae8849d5d040bfea582c94d5a1619d3949
Parents: e9f1dd4
Author: Ernest Allen 
Authored: Tue May 10 15:38:41 2016 -0400
Committer: Ernest Allen 
Committed: Tue May 10 15:38:41 2016 -0400

--
 console/hawtio/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c95bb8ae/console/hawtio/pom.xml
--
diff --git a/console/hawtio/pom.xml b/console/hawtio/pom.xml
index 27dd354..9d34ac4 100644
--- a/console/hawtio/pom.xml
+++ b/console/hawtio/pom.xml
@@ -9,7 +9,7 @@
   4.0.0
 
   org.apache.qpid
-  dispatch-plugin
+  dispatch-hawtio-console
   0.6.0-SNAPSHOT
   war
   2016


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-310: Use router.id, router.routerId, or container.containerName respectively to match connection.container.

2016-05-10 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master c95bb8ae8 -> 6422f523a


DISPATCH-310: Use router.id, router.routerId, or container.containerName 
respectively to match connection.container.


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/6422f523
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/6422f523
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/6422f523

Branch: refs/heads/master
Commit: 6422f523afd3378390c3bbb641a0f734ebe924d3
Parents: c95bb8a
Author: Ernest Allen 
Authored: Tue May 10 16:16:46 2016 -0400
Committer: Ernest Allen 
Committed: Tue May 10 16:16:46 2016 -0400

--
 .../src/main/webapp/plugin/js/qdrTopology.js| 35 +++-
 console/stand-alone/plugin/js/qdrService.js |  8 -
 console/stand-alone/plugin/js/qdrTopology.js| 30 +
 3 files changed, 56 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6422f523/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index 4f0f3e7..7e10547 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -314,18 +314,21 @@ var QDR = (function (QDR) {
 
var aNode = function (id, name, nodeType, nodeInfo, nodeIndex, 
x, y, resultIndex, fixed, properties) {
properties = properties || {};
-   var containerName;
+   var routerId;
if (nodeInfo) {
var node = nodeInfo[id];
if (node) {
-   containerName = 
node['.container'].results[0][0];
+   var router = node['.router'];
+   routerId = 
QDRService.valFor(router.attributeNames, router.results[0], 'id')
+   if (!routerId)
+   routerId = 
QDRService.valFor(router.attributeNames, router.results[0], 'routerId')
}
}
return {   key: id,
name: name,
nodeType: nodeType,
properties: properties,
-   containerName: containerName,
+   routerId: routerId,
x: x,
y: y,
id: nodeIndex,
@@ -597,11 +600,24 @@ var QDR = (function (QDR) {
 var nodeIndex = 0;
 var nodeInfo = QDRService.topology.nodeInfo();
 for (var id in nodeInfo) {
-var node = nodeInfo[id];
-if (node['.container'].results[0][0] == _id)
+var node = nodeInfo[id]['.router'];
+// there should be only one router entity for each node, so 
using results[0] should be fine
+if (QDRService.valFor( node.attributeNames, node.results[0], 
"id") === _id)
+return nodeIndex;
+if (QDRService.valFor( node.attributeNames, node.results[0], 
"routerId") === _id)
 return nodeIndex;
 nodeIndex++
 }
+   // there was no router.id that matched, check 
deprecated router.routerId
+nodeIndex = 0;
+for (var id in nodeInfo) {
+var node = nodeInfo[id]['.container'];
+   if (node) {
+   if (QDRService.valFor ( 
node.attributeNames, node.results[0], "containerName") === _id)
+   return nodeIndex;
+   }
+   nodeIndex++
+   }
 QDR.log.warn("unable to find containerIndex for " + _id);
 return -1;
 }
@@ -807,7 +823,7 @@ var QDR = (function (QDR) {
}
return;
  }
-   //QDR.log.debug("showing connections 
form");
+   //QDR.log.debug("showing connections form");
var resultIndex = 0; // the connection 
to use
 var left = d.left ? d.target : d.source;
// right is the node that the arrow

qpid-dispatch git commit: DISPATCH-329: Prevent javascript error when clicking on line between node and client

2016-05-12 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 3f5c33211 -> 6b89f2a9b


DISPATCH-329: Prevent javascript error when clicking on line between node and 
client


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/6b89f2a9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/6b89f2a9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/6b89f2a9

Branch: refs/heads/master
Commit: 6b89f2a9bf90f408979ff0222a7334fa7bdfef0b
Parents: 3f5c332
Author: Ernest Allen 
Authored: Thu May 12 13:25:13 2016 -0400
Committer: Ernest Allen 
Committed: Thu May 12 13:25:13 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 2 +-
 console/stand-alone/plugin/js/qdrTopology.js| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6b89f2a9/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index 7e10547..be945f7 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -929,7 +929,7 @@ var QDR = (function (QDR) {
|| linkTypeIndex < 0 || 
nameIndex < 0 || linkDirIndex < 0)
return;
links.results.forEach ( function (link) 
{
-   if (link[connectionIdIndex] == 
root.obj[identityIndex] && link[linkTypeIndex] == root.obj[roleIndex])
+   if (root.obj && 
link[connectionIdIndex] == root.obj[identityIndex] && link[linkTypeIndex] == 
root.obj[roleIndex])
root.children.push (
{ name: "(" + 
link[linkDirIndex] + ") " + link[nameIndex],
size: 100,

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6b89f2a9/console/stand-alone/plugin/js/qdrTopology.js
--
diff --git a/console/stand-alone/plugin/js/qdrTopology.js 
b/console/stand-alone/plugin/js/qdrTopology.js
index 13da88a..75b8b6e 100644
--- a/console/stand-alone/plugin/js/qdrTopology.js
+++ b/console/stand-alone/plugin/js/qdrTopology.js
@@ -1158,7 +1158,7 @@ var QDR = (function (QDR) {
|| linkTypeIndex < 0 || 
nameIndex < 0 || linkDirIndex < 0)
return;
links.results.forEach ( function (link) 
{
-   if (link[connectionIdIndex] == 
root.obj[identityIndex] && link[linkTypeIndex] == root.obj[roleIndex])
+   if (root.obj && 
link[connectionIdIndex] == root.obj[identityIndex] && link[linkTypeIndex] == 
root.obj[roleIndex])
root.children.push (
{ name: "(" + 
link[linkDirIndex] + ") " + link[nameIndex],
size: 100,


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-326: Fix missing sliders on chart edit dialog

2016-05-12 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master eb7cdb959 -> b5b470e14


DISPATCH-326: Fix missing sliders on chart edit dialog


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/b5b470e1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/b5b470e1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/b5b470e1

Branch: refs/heads/master
Commit: b5b470e146df21b8deb32d3d061ca7882c13c401
Parents: eb7cdb9
Author: Ernest Allen 
Authored: Thu May 12 14:54:31 2016 -0400
Committer: Ernest Allen 
Committed: Thu May 12 14:54:31 2016 -0400

--
 .../src/main/webapp/plugin/html/qdrCharts.html  |  5 +-
 .../src/main/webapp/plugin/js/dispatchPlugin.js |  3 -
 .../src/main/webapp/plugin/js/qdrCharts.js  | 75 +++-
 3 files changed, 46 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5b470e1/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
--
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html 
b/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
index 90df9b3..9f1319c 100644
--- a/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
+++ b/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
@@ -30,7 +30,7 @@
  Rate Chart
 
 Rate Window: {{rateWindow}} second{{rateWindow > 1 ? 
"s" : ""}}
-
+
 
  
 
@@ -47,7 +47,8 @@
 
 Chart duration
 
-Show data for past {{dialogChart.visibleDuration}} 
minute{{dialogChart.visibleDuration > 1 ? "s" : ""}} 
+Show data for past {{dialogChart.visibleDuration}} 
minute{{dialogChart.visibleDuration > 1 ? "s" : ""}}
+
 
  
 

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5b470e1/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js 
b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
index ce52092..0e71d2f 100644
--- a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
+++ b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
@@ -5,9 +5,6 @@
  * The main entry point for the QDR module
  *
  */
-$.getScript('https://cdn.rawgit.com/angular-ui/ui-slider/master/src/slider.js',
 function() {
-   hawtioPluginLoader.addModule('ui.slider');
-});
 var QDR = (function(QDR) {
 
   /**

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b5b470e1/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js
index 02b1d85..ea29e63 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrCharts.js
@@ -223,34 +223,48 @@ var QDR = (function (QDR) {
dialog.close();
};
 
-// initialize the rateWindow slider
-$scope.slider = {
-'options': {
-min: 1,
-max: 10,
-step: 1,
-tick: true,
-stop: function (event, ui) {
-$scope.dialogChart.rateWindow = ui.value * 1000;
-if (dialogSvgChart)
-dialogSvgChart.tick($scope.svgDivId);
-}
-}
-   };
-
-$scope.visibleDuration =
-$scope.duration = {
-'options': {
-min: 1,
-max: 10,
-step: 1,
-tick: true,
-stop: function (event, ui) {
-if (dialogSvgChart)
-dialogSvgChart.tick($scope.svgDivId);
-}
-}
-   };
+   var initRateSlider = function () {
+   if (document.getElementById('rateSlider')) {
+   $( "#rateSlider" ).slider({
+ value: $scope.rateWindow,
+ min: 1,
+ max: 10,
+ step: 1,
+ slide: function( event, ui ) {
+   $scope.rateWindow = ui.value;
+   $scope.dialogChart.rateWindow = 
ui.value * 1000;
+ 

qpid-dispatch git commit: DISPATCH-315: Don't load charts that are not in the current router network

2016-05-16 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 9e446e2a5 -> ded25e5dc


DISPATCH-315: Don't load charts that are not in the current router network


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/ded25e5d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/ded25e5d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/ded25e5d

Branch: refs/heads/master
Commit: ded25e5dc2feba47e12b5e025033d3a765c564de
Parents: 9e446e2
Author: Ernest Allen 
Authored: Mon May 16 14:52:01 2016 -0400
Committer: Ernest Allen 
Committed: Mon May 16 14:52:01 2016 -0400

--
 .../main/webapp/plugin/js/qdrChartService.js| 97 ++--
 console/stand-alone/plugin/css/site-base.css| 23 -
 .../stand-alone/plugin/js/qdrChartService.js| 41 +
 3 files changed, 113 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ded25e5d/console/hawtio/src/main/webapp/plugin/js/qdrChartService.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrChartService.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrChartService.js
index 560e656..6125061 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrChartService.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrChartService.js
@@ -410,6 +410,8 @@ var QDR = (function(QDR) {
 
// this is called when the response is received
var saveResponse = function (nodeId, entity, 
response) {
+   if (!response || 
!response.attributeNames)
+   return;
//QDR.log.debug("got chart results for " + nodeId + " " 
+ entity);
// records is an array that has data for all names
var records = response.results;
@@ -521,38 +523,73 @@ var QDR = (function(QDR) {
 loadCharts: function () {
 var charts = angular.fromJson(localStorage["QDRCharts"]);
 if (charts) {
+var nodeList = QDRService.nodeList().map( function (node) {
+return node.id;
+})
 charts.forEach(function (chart) {
-if (!angular.isDefined(chart.instance)) {
-chart.instance = ++instance;
+if (nodeList.indexOf(chart.nodeId) >= 0) {
+   if (!chart.interval)
+   chart.interval = 1000;
+   if (!chart.duration)
+   chart.duration = 10;
+   if (chart.nodeList)
+   chart.aggregate = true;
+   var newChart = self.registerChart(chart.nodeId, 
chart.entity, chart.name, chart.attr, chart.interval, true, chart.aggregate);
+   newChart.dashboard = true;  // we only save the 
dashboard charts
+   newChart.type = chart.type;
+   newChart.rateWindow = chart.rateWindow;
+   newChart.areaColor = chart.areaColor ? 
chart.areaColor : "#c0e0ff";
+   newChart.lineColor = chart.lineColor ? 
chart.lineColor : "#4682b4";
+   newChart.duration(chart.duration);
+   newChart.visibleDuration = 
chart.visibleDuration ? chart.visibleDuration : 10;
+   if (chart.userTitle)
+   newChart.title(chart.userTitle);
 }
-if (chart.instance >= instance)
-instance = chart.instance + 1;
-if (!chart.duration)
-chart.duration = 10;
-if (chart.nodeList)
-chart.aggregate = true;
-if (!chart.hdash)
-chart.hdash = false;
-if (!chart.dashboard)
-chart.dashboard = false;
-if (!chart.hdash && !chart.dashboard)
-chart.dashboard = true;
-   if (chart.hdash && 
chart.dashboard)
-   chart.dashboard = false;
-   chart.forceCreate = true;
-   chart.use_instance = true;
-var newChart = self.registerChart(chart); 
//chart.node

qpid-dispatch git commit: DISPATCH-307: Added licensing headers, included .war artifact, removed unused qdrGraphs.html

2016-05-19 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 0cc6b2ca6 -> 5f843abcc


DISPATCH-307: Added licensing headers, included .war artifact, removed unused 
qdrGraphs.html


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/5f843abc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/5f843abc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/5f843abc

Branch: refs/heads/master
Commit: 5f843abcc9d0ce028b2e5e005921d89d8dbdda1d
Parents: 0cc6b2c
Author: Ernest Allen 
Authored: Thu May 19 12:24:15 2016 -0400
Committer: Ernest Allen 
Committed: Thu May 19 12:24:15 2016 -0400

--
 .../qpid/dispatch/PluginContextListener.java| 20 
 .../hawtio/src/main/resources/WEB-INF/web.xml   | 14 ++
 .../hawtio/src/main/resources/log4j.properties  | 20 
 .../src/main/webapp/plugin/html/qdrCharts.html  | 18 ++
 .../src/main/webapp/plugin/html/qdrConnect.html | 18 ++
 .../src/main/webapp/plugin/html/qdrGraphs.html  | 15 ---
 .../src/main/webapp/plugin/js/dispatchPlugin.js | 18 ++
 console/stand-alone/plugin/html/qdrCharts.html  | 18 ++
 console/stand-alone/plugin/html/qdrConnect.html | 18 ++
 console/stand-alone/plugin/html/qdrGraphs.html  | 15 ---
 10 files changed, 144 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
--
diff --git 
a/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
 
b/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
index 7905ac0..806f7a0 100644
--- 
a/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
+++ 
b/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
@@ -1,3 +1,23 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
 package org.apache.qpid.dispatch;
 
 import io.hawt.web.plugin.HawtioPlugin;

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/resources/WEB-INF/web.xml
--
diff --git a/console/hawtio/src/main/resources/WEB-INF/web.xml 
b/console/hawtio/src/main/resources/WEB-INF/web.xml
index 66e8dba..ee81d02 100644
--- a/console/hawtio/src/main/resources/WEB-INF/web.xml
+++ b/console/hawtio/src/main/resources/WEB-INF/web.xml
@@ -1,4 +1,18 @@
 
+
 http://java.sun.com/xml/ns/j2ee";
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/resources/log4j.properties
--
diff --git a/console/hawtio/src/main/resources/log4j.properties 
b/console/hawtio/src/main/resources/log4j.properties
index a2ecc8d..2586145 100644
--- a/console/hawtio/src/main/resources/log4j.properties
+++ b/console/hawtio/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for 

qpid-dispatch git commit: DISPATCH-307: Adding artifact war file and updated pom.xml

2016-05-19 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 5f843abcc -> 08dd0644c


DISPATCH-307: Adding artifact war file and updated pom.xml


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/08dd0644
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/08dd0644
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/08dd0644

Branch: refs/heads/master
Commit: 08dd0644c317b8619bc99d10cb30629bc1329797
Parents: 5f843ab
Author: Ernest Allen 
Authored: Thu May 19 12:28:10 2016 -0400
Committer: Ernest Allen 
Committed: Thu May 19 12:28:10 2016 -0400

--
 console/hawtio/dispatch-hawtio-console-0.6.0.war | Bin 0 -> 607657 bytes
 console/hawtio/pom.xml   |  16 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/08dd0644/console/hawtio/dispatch-hawtio-console-0.6.0.war
--
diff --git a/console/hawtio/dispatch-hawtio-console-0.6.0.war 
b/console/hawtio/dispatch-hawtio-console-0.6.0.war
new file mode 100644
index 000..304dc28
Binary files /dev/null and b/console/hawtio/dispatch-hawtio-console-0.6.0.war 
differ

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/08dd0644/console/hawtio/pom.xml
--
diff --git a/console/hawtio/pom.xml b/console/hawtio/pom.xml
index 9d34ac4..6cc9a4c 100644
--- a/console/hawtio/pom.xml
+++ b/console/hawtio/pom.xml
@@ -1,4 +1,18 @@
 
+
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
   
@@ -10,7 +24,7 @@
 
   org.apache.qpid
   dispatch-hawtio-console
-  0.6.0-SNAPSHOT
+  0.6.0
   war
   2016
   https://qpid.apache.org


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-307: removing .war, fixing comments in log4j.properties

2016-05-19 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 08dd0644c -> 23cb56e50


DISPATCH-307: removing .war, fixing comments in log4j.properties


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/23cb56e5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/23cb56e5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/23cb56e5

Branch: refs/heads/master
Commit: 23cb56e506f980137c5d08e7739d5efab654ff01
Parents: 08dd064
Author: Ernest Allen 
Authored: Thu May 19 12:39:24 2016 -0400
Committer: Ernest Allen 
Committed: Thu May 19 12:39:24 2016 -0400

--
 .../hawtio/dispatch-hawtio-console-0.6.0.war| Bin 607657 -> 0 bytes
 .../hawtio/src/main/resources/log4j.properties  |  39 +--
 2 files changed, 19 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/23cb56e5/console/hawtio/dispatch-hawtio-console-0.6.0.war
--
diff --git a/console/hawtio/dispatch-hawtio-console-0.6.0.war 
b/console/hawtio/dispatch-hawtio-console-0.6.0.war
deleted file mode 100644
index 304dc28..000
Binary files a/console/hawtio/dispatch-hawtio-console-0.6.0.war and /dev/null 
differ

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/23cb56e5/console/hawtio/src/main/resources/log4j.properties
--
diff --git a/console/hawtio/src/main/resources/log4j.properties 
b/console/hawtio/src/main/resources/log4j.properties
index 2586145..e327212 100644
--- a/console/hawtio/src/main/resources/log4j.properties
+++ b/console/hawtio/src/main/resources/log4j.properties
@@ -1,23 +1,22 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 log4j.rootLogger=INFO, console
 
 log4j.appender.console=org.apache.log4j.ConsoleAppender


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-308: Used stand-alone console for screenshots, updated websockets/tcp instructions

2016-05-19 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 23cb56e50 -> 71194a7ae


DISPATCH-308: Used stand-alone console for screenshots, updated websockets/tcp 
instructions


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/71194a7a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/71194a7a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/71194a7a

Branch: refs/heads/master
Commit: 71194a7ae294fec45afbbbda00dd254dfad74be9
Parents: 23cb56e
Author: Ernest Allen 
Authored: Thu May 19 15:15:46 2016 -0400
Committer: Ernest Allen 
Committed: Thu May 19 15:15:46 2016 -0400

--
 console/stand-alone/plugin/css/plugin.css   |   5 +-
 console/stand-alone/plugin/css/site-base.css|  13 ++-
 console/stand-alone/plugin/html/qdrConnect.html | 104 +++
 doc/book/console.rst|   2 +-
 doc/book/console_charts.png | Bin 59466 -> 70070 bytes
 doc/book/console_entity.png | Bin 86855 -> 69319 bytes
 doc/book/console_installation.rst   |  18 +---
 doc/book/console_login.png  | Bin 41258 -> 39915 bytes
 doc/book/console_operation.rst  |  22 ++--
 doc/book/console_overview.png   | Bin 51563 -> 87960 bytes
 doc/book/console_overview.rst   |   2 -
 doc/book/console_schema.png | Bin 67664 -> 68025 bytes
 doc/book/console_topology.png   | Bin 77879 -> 67338 bytes
 13 files changed, 86 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/console/stand-alone/plugin/css/plugin.css
--
diff --git a/console/stand-alone/plugin/css/plugin.css 
b/console/stand-alone/plugin/css/plugin.css
index ef8d2e1..0d9f34d 100644
--- a/console/stand-alone/plugin/css/plugin.css
+++ b/console/stand-alone/plugin/css/plugin.css
@@ -183,7 +183,7 @@ div#main div ul.nav li.active a {
 }
 
 div#main.qdr {
-margin-top: 44px !important;
+margin-top: 56px !important;
 }
 
 div.charts-header {
@@ -600,7 +600,8 @@ input[type="text"], input[type="number"], 
input[type="password"] {
 }
 
 div.login.container {
-   width: 550px;
+/* width: 550px; */
+   margin-top: 4em;
 }
 
 #overtree .fancytree-container {

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/console/stand-alone/plugin/css/site-base.css
--
diff --git a/console/stand-alone/plugin/css/site-base.css 
b/console/stand-alone/plugin/css/site-base.css
index 6e05ddd..e22476b 100644
--- a/console/stand-alone/plugin/css/site-base.css
+++ b/console/stand-alone/plugin/css/site-base.css
@@ -19,8 +19,9 @@ under the License.
 * {
   outline: none;
 }
+
 * {
-font-family: OpenSans;
+font-family: sans-serif;
 }
 
 a:focus {
@@ -1999,6 +2000,8 @@ div#main div ul.nav li a.nav-primary .caret {
 
 #main-nav {
   max-height: 70px;
+  background-color: #F0f0f0;
+  font-size: 20px;
 }
 
 #main {
@@ -3657,7 +3660,7 @@ th > .indicator:before {
 .connect-column {
   display: inline-block;
   vertical-align: top;
-  width: 550px;
+  width: 34em;
 }
 
 .icon-spacer:before {
@@ -4274,9 +4277,9 @@ ul.dynatree-container {
 }
 
 .pane {
-  position: fixed;
+  position: absolute;
   bottom: 0;
-  top: 70px;
+  top: 100px;
   height: auto;
   width: 300px;
 }
@@ -4317,7 +4320,7 @@ ul.dynatree-container {
 }
 
 .pane.left {
-  left: 0;
+  /*left: 0; */
   z-index: 39;
 }
 

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/71194a7a/console/stand-alone/plugin/html/qdrConnect.html
--
diff --git a/console/stand-alone/plugin/html/qdrConnect.html 
b/console/stand-alone/plugin/html/qdrConnect.html
index e2cefde..f1fd0b8 100644
--- a/console/stand-alone/plugin/html/qdrConnect.html
+++ b/console/stand-alone/plugin/html/qdrConnect.html
@@ -18,54 +18,72 @@ under the License.
 -->
 
   
-  
-  
-  
-  
-  
-  
-  Address: 
-  
-  
-  
+  
+  
+  
+  
+  Enter the address and port of a http://qpid.apache.org/components/dispatch-router/"; target="_blank">Qpid 
Dispatch Router to connect..
+  
+
+  
+  The port should be a websockets <==> tcp proxy.
+  
+
+  
+  When Autostart is

[1/2] qpid-dispatch git commit: DISPATCH-346: rename qdrTopology.css to dispatch.css

2016-06-07 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master a2529d427 -> 6312cccb3


DISPATCH-346: rename qdrTopology.css to dispatch.css


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/ec700585
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/ec700585
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/ec700585

Branch: refs/heads/master
Commit: ec7005850c0d2383371949c8e59142c5a5523e18
Parents: a2529d4
Author: Ernest Allen 
Authored: Tue Jun 7 13:20:45 2016 -0400
Committer: Ernest Allen 
Committed: Tue Jun 7 13:20:45 2016 -0400

--
 .../src/main/webapp/plugin/css/dispatch.css | 555 +++
 .../src/main/webapp/plugin/css/qdrTopology.css  | 555 ---
 2 files changed, 555 insertions(+), 555 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ec700585/console/hawtio/src/main/webapp/plugin/css/dispatch.css
--
diff --git a/console/hawtio/src/main/webapp/plugin/css/dispatch.css 
b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
new file mode 100644
index 000..bc7ccfc
--- /dev/null
+++ b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
@@ -0,0 +1,555 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+svg {
+  background-color: transparent;
+  cursor: default;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+}
+
+svg:not(.active):not(.ctrl) {
+  cursor: crosshair;
+}
+#end-arrow-selected, #start-arrow-selected {
+   stroke: #00F;
+   fill: #00F;
+}
+
+path.link {
+  fill: none;
+  stroke: #000;
+  stroke-width: 4px;
+  cursor: default;
+}
+
+svg:not(.active):not(.ctrl) path.link {
+  cursor: pointer;
+}
+
+path.link.selected {
+  stroke-dasharray: 10,2;
+  stroke: #00F  !important;
+}
+
+
+path.link.highlighted {
+stroke: #0F0 !important;
+
+}
+
+path.link.temp {
+  opacity: 0.3;
+}
+path.link.temp.over {
+  opacity: 0.8;
+  stroke-dasharray: 10,2;
+}
+
+path.link.dragline {
+  pointer-events: none;
+}
+
+path.link.hidden {
+  stroke-width: 0;
+}
+
+
+circle.node {
+stroke-width: 1.5px;
+cursor: pointer;
+stroke: darkgray;
+fill: lightgray;
+}
+
+circle.node.reflexive {
+stroke: #F00 !important;
+stroke-width: 2.5px;
+}
+circle.node.selected {
+stroke: #F00 !important;
+stroke-width: 2px;
+fill: #e0e0ff !important;
+}
+circle.node.inter-router {
+fill: #EAEAEA;
+}
+circle.node.normal {
+fill: #F0F000;
+}
+circle.node.on-demand {
+fill: #C0FFC0;
+}
+circle.node.on-demand.artemis {
+   fill: #FCC;
+   /*opacity: 0.2; */
+}
+
+circle.node.fixed {
+stroke-dasharray: 10,2;
+}
+circle.node.temp {
+stroke: #f80;
+fill: #f0f0ff;
+}
+
+text {
+  font: 12px sans-serif;
+  pointer-events: none;
+  /*font-family: monospace;*/
+
+}
+
+.tooltipsy
+{
+padding: 10px;
+/*max-width: 320px;*/
+color: #303030;
+background-color: #fcfcfe;
+border: 1px solid #deca7e;
+border-radius: 5px;
+}
+
+.tiptable {
+
+}
+.tiptable tr {
+   border-bottom: 1px solid #ccc;
+}
+
+.tiptable tr:last-child {
+   border-bottom: 0px;
+}
+
+.tiptable tr:nth-child(even) {
+   background: #fcfcfe;
+}
+.tiptable tr:nth-child(odd) {
+   background: #FFF
+}
+
+text.id {
+  text-anchor: middle;
+  font-weight: bold;
+}
+
+text.label {
+  text-anchor: start;
+  font-weight: bold;
+}
+
+.row-fluid.tertiary {
+  position: relative;
+  left: 20px;
+}
+
+.row-fluid.tertiary.left {
+  float: left;
+}
+
+.row-fluid.tertiary.panel {
+  width: 410px;
+  /*height: 100%; */
+}
+
+/*, div.qdrTopology div#multiple_details .ngViewport*/
+div#topologyForm .ngViewport, div#topologyForm .gridStyle {
+height: inherit !important;
+   min-height: initial !important;
+   overflow: initial;
+}
+
+div#multiple_details {
+   height: 300px;
+   width: 500px;
+   display: none;
+   padding: 1em;
+border: 1px solid;
+   position: absolute;
+  

[2/2] qpid-dispatch git commit: DISPATCH-345: Auto select the 1st router if the saved node is not present

2016-06-07 Thread eallen
DISPATCH-345: Auto select the 1st router if the saved node is not present


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/6312cccb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/6312cccb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/6312cccb

Branch: refs/heads/master
Commit: 6312cccb38c6cdf08717bda0c9d84537047a867f
Parents: ec70058
Author: Ernest Allen 
Authored: Tue Jun 7 13:21:52 2016 -0400
Committer: Ernest Allen 
Committed: Tue Jun 7 13:21:52 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/qdrList.js | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/6312cccb/console/hawtio/src/main/webapp/plugin/js/qdrList.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrList.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
index 8e64dc2..e7df383 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrList.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
@@ -129,12 +129,18 @@ var QDR = (function(QDR) {
//QDR.log.debug("forcing selectedNode to " + 
$scope.selectedNode);
}
}
+   $scope.currentNode = undefined;
$scope.nodes.some( function (node, i) {
if (node.name === $scope.selectedNode) {
$scope.currentNode = $scope.nodes[i]
return true;
}
})
+   if ($scope.currentNode == undefined) {
+   $scope.selectedNode = $scope.nodes[0].name;
+   $scope.selectedNodeId = $scope.nodes[0].id;
+   $scope.currentNode = $scope.nodes[0];
+   }
 
var excludedEntities = ["management", "org.amqp.management", 
"operationalEntity", "entity", "configurationEntity", "dummy", "console"];
var aggregateEntities = ["router.address"];


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-346: remove call to load qdrTopology.css

2016-06-07 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 6312cccb3 -> 4612b70d6


DISPATCH-346: remove call to load qdrTopology.css


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/4612b70d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/4612b70d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/4612b70d

Branch: refs/heads/master
Commit: 4612b70d6d4936517c92072a762862078909281f
Parents: 6312ccc
Author: Ernest Allen 
Authored: Tue Jun 7 14:59:08 2016 -0400
Committer: Ernest Allen 
Committed: Tue Jun 7 14:59:08 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4612b70d/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js 
b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
index 7d7cbd8..99f6c47 100644
--- a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
+++ b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
@@ -18,7 +18,7 @@ under the License.
 */
 /**
  * @module QDR
- * @mail QDR
+ * @main QDR
  *
  * The main entry point for the QDR module
  *
@@ -154,7 +154,6 @@ var QDR = (function(QDR) {
   QDR.module.run(function(workspace, viewRegistry, layoutFull, $rootScope, 
$location, localStorage, QDRService, QDRChartService) {
QDR.log.info(QDR.pluginName, " loaded");
Core.addCSS(QDR.contextPath + "plugin/css/dispatch.css");
-   Core.addCSS(QDR.contextPath + "plugin/css/qdrTopology.css");
Core.addCSS(QDR.contextPath + "plugin/css/plugin.css");

//Core.addCSS("https://cdn.rawgit.com/mohsen1/json-formatter/master/dist/json-formatter.min.css";);

Core.addCSS("https://cdnjs.cloudflare.com/ajax/libs/jquery.tipsy/1.0.2/jquery.tipsy.css";);


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-317: Show a tooltip that contains the full value when mouse is over values on the left-hand table on topology page. Also show schema descriptions when mouse is over

2016-06-08 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 1f3eb8ed0 -> c953fb3b2


DISPATCH-317: Show a tooltip that contains the full value when mouse is over 
values on the left-hand table on topology page. Also show schema descriptions 
when mouse is over attribute names for the same table.


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c953fb3b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c953fb3b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c953fb3b

Branch: refs/heads/master
Commit: c953fb3b2775245010806a35f37489468589c543
Parents: 1f3eb8e
Author: Ernest Allen 
Authored: Wed Jun 8 13:19:07 2016 -0400
Committer: Ernest Allen 
Committed: Wed Jun 8 13:19:07 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c953fb3b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index be945f7..162af05 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -25,7 +25,8 @@ var QDR = (function (QDR) {
QDR.module.controller('QDR.TopologyFormController', function ($scope, 
QDRService) {
 
$scope.attributes = []
-var generalCellTemplate = '{{row.entity.attributeName}}';
+var nameTemplate = '{{row.entity.attributeName}}';
+var valueTemplate = '{{row.entity.attributeValue}}';
 $scope.topoGridOptions = {
 data: 'attributes',
enableColumnResize: true,
@@ -34,11 +35,12 @@ var QDR = (function (QDR) {
 {
 field: 'attributeName',
 displayName: 'Attribute',
-cellTemplate: generalCellTemplate
+cellTemplate: nameTemplate
 },
 {
 field: 'attributeValue',
-displayName: 'Value'
+displayName: 'Value',
+   cellTemplate: valueTemplate
 }
 ]
 };
@@ -588,7 +590,7 @@ var QDR = (function (QDR) {
})
// add as 2nd row
if (ports.length)
-   attributes.splice(1, 0, 
{attributeName: 'Listening on', attributeValue: ports});
+   attributes.splice(1, 0, 
{attributeName: 'Listening on', attributeValue: ports, description: 'The port 
on which this router is listening for connections'});
}
 
$scope.$broadcast('showEntityForm', {entity: 
entity, attributes: attributes})


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-375: Fix target .war file name in installation instructions

2016-06-09 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 7279a153b -> f30eccc44


DISPATCH-375: Fix target .war file name in installation instructions


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/f30eccc4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/f30eccc4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/f30eccc4

Branch: refs/heads/master
Commit: f30eccc44babf7f15368dd6e46b40168592fbe43
Parents: 7279a15
Author: Ernest Allen 
Authored: Thu Jun 9 10:05:05 2016 -0400
Committer: Ernest Allen 
Committed: Thu Jun 9 10:05:05 2016 -0400

--
 console/hawtio/README.md | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f30eccc4/console/hawtio/README.md
--
diff --git a/console/hawtio/README.md b/console/hawtio/README.md
index 4bfcd54..716eb21 100644
--- a/console/hawtio/README.md
+++ b/console/hawtio/README.md
@@ -23,7 +23,7 @@ The dispatch-hawtio-console-.war file should now be 
in the target direc
 
 Copy the dispatch-hawtio-console-.war file as the following name
 
-dispatch-hawtio-console.war
+dispatch-plugin.war
 to the deploy directory of Apache Tomcat or similar Java web container. Ensure 
the hawtio.war file is present in the same directory. Point a browser at 
http://\/hawtio
 Dispatch Router should be available as a tab in the console.
 
@@ -36,11 +36,12 @@ On the Dispatch Router's console page, select the Connect 
sub tab. Enter the add
 The console communicates to a router using websockets. 
 The router listens for tcp. Therefore a websockts/tcp proxy is required.
 
- Manually running a python websockets/tcp proxy
-
 A popular python based proxy is 
[websockify](https://github.com/kanaka/websockify). To use it:
 
 $ yum install python-websockify
+
+ Manually running a python websockets/tcp proxy
+
 $ websockify 5673 0.0.0.0:20009 &
 
 In the above, websockify is listening for ws traffic on port 5673 and will 
proxy it to 0.0.0.0:20009. One of the routers will need a listener on the 
proxied port. An example router .conf file entry is:


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-375: Change addr: to host: in sample config file entry

2016-06-09 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master f30eccc44 -> 4c5330a30


DISPATCH-375: Change addr: to host: in sample config file entry


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/4c5330a3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/4c5330a3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/4c5330a3

Branch: refs/heads/master
Commit: 4c5330a3047e2414ed23b60bd760214fd03b28de
Parents: f30eccc
Author: Ernest Allen 
Authored: Thu Jun 9 10:08:01 2016 -0400
Committer: Ernest Allen 
Committed: Thu Jun 9 10:08:01 2016 -0400

--
 console/hawtio/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4c5330a3/console/hawtio/README.md
--
diff --git a/console/hawtio/README.md b/console/hawtio/README.md
index 716eb21..e5d427b 100644
--- a/console/hawtio/README.md
+++ b/console/hawtio/README.md
@@ -49,7 +49,7 @@ In the above, websockify is listening for ws traffic on port 
5673 and will proxy
 listener {
 name: ProxyListener
 role: normal
-addr: 0.0.0.0
+host: 0.0.0.0
 port: 20009
 sasl-mechanisms: ANONYMOUS
 }


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-318: Prevent dragging nodes off edge of screen. Also minor visual fixes for displaying multiple client.

2016-06-10 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 06296ba31 -> 5240adc14


DISPATCH-318: Prevent dragging nodes off edge of screen. Also minor visual 
fixes for displaying multiple client.


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/5240adc1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/5240adc1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/5240adc1

Branch: refs/heads/master
Commit: 5240adc14e33533b56fc8a79af7fde036bdb5a26
Parents: 06296ba
Author: Ernest Allen 
Authored: Fri Jun 10 13:16:08 2016 -0400
Committer: Ernest Allen 
Committed: Fri Jun 10 13:16:08 2016 -0400

--
 .../src/main/webapp/plugin/css/dispatch.css |  2 +-
 .../src/main/webapp/plugin/js/qdrService.js | 38 +
 .../src/main/webapp/plugin/js/qdrTopology.js| 83 +---
 3 files changed, 92 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5240adc1/console/hawtio/src/main/webapp/plugin/css/dispatch.css
--
diff --git a/console/hawtio/src/main/webapp/plugin/css/dispatch.css 
b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
index bc7ccfc..4b6e159 100644
--- a/console/hawtio/src/main/webapp/plugin/css/dispatch.css
+++ b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
@@ -514,7 +514,7 @@ circle.subcircle {
 stroke-width: 1px;
 /* stroke-dasharray: 2; */
 fill-opacity: 0;
-stroke: black;
+stroke: darkgray;
 }
 
 .leaf circle {

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5240adc1/console/hawtio/src/main/webapp/plugin/js/qdrService.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrService.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
index c46e7ad..5dcd3f4 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrService.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
@@ -255,6 +255,44 @@ var QDR = (function(QDR) {
return d.nodeType ==='on-demand' && (d.properties && 
d.properties.product === 'qpid-cpp');
},
 
+   isAConsole: function (properties, connectionId, nodeType, key) {
+   return self.isConsole({properties: properties, 
connectionId: connectionId, nodeType: nodeType, key: key})
+   },
+   isConsole: function (d) {
+   // TODO: use connection properties when available
+   if (d.properties.console_identifier == 'Dispatch 
console')
+   return true;
+   // until connection properties can difinitively 
identify consoles:
+   var connid = d.connectionId;
+   if (connid && d.nodeType === 'normal') {
+   // find all the endpoint links for this router 
that have this connid
+   var linkInfo = 
self.topology.nodeInfo()[d.key]['.router.link']
+   var outs = 0, ins = 0;
+   var outaddr, inaddr;
+   linkInfo.results.forEach( function (link) {
+   if 
(self.valFor(linkInfo.attributeNames, link, 'connectionId') == connid &&
+   
self.valFor(linkInfo.attributeNames, link, 'linkType') == 'endpoint') {
+   if 
(self.valFor(linkInfo.attributeNames, link, 'linkDir') == 'in') {
+   ++ins;
+   inaddr = 
self.valFor(linkInfo.attributeNames, link, 'owningAddr')
+   }
+   if 
(self.valFor(linkInfo.attributeNames, link, 'linkDir') == 'out') {
+   ++outs;
+   outaddr = 
self.valFor(linkInfo.attributeNames, link, 'owningAddr')
+   }
+   return true;
+   }
+   })
+   // consoles have 1 out link with an address 
that starts with Ltemp. and
+   // 1 in link with no address
+   if (outs == 1 && ins == 1 &&
+   inaddr == null && 
outaddr.startsWith('Ltemp.')) {
+   return true;
+   }
+  

qpid-dispatch git commit: DISPATCH-392: Add router.config to the type for address, autoLink, and linkRoute

2016-06-16 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 0638cf52e -> 0a1ae2b93


DISPATCH-392: Add router.config to the type for address, autoLink, and linkRoute


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/0a1ae2b9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/0a1ae2b9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/0a1ae2b9

Branch: refs/heads/master
Commit: 0a1ae2b935002e19bbc4e29487e37f439e0203d8
Parents: 0638cf5
Author: Ernest Allen 
Authored: Thu Jun 16 10:15:03 2016 -0400
Committer: Ernest Allen 
Committed: Thu Jun 16 10:15:03 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/qdrService.js | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0a1ae2b9/console/hawtio/src/main/webapp/plugin/js/qdrService.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrService.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
index 5dcd3f4..55b2f71 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrService.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
@@ -680,8 +680,11 @@ var QDR = (function(QDR) {
 }
if (entity[0] === '.')
entity = entity.substr(1, entity.length-1)
-   //return self._send(body, fullAddr, operation, entity);
-   return self._send(body, fullAddr, operation, 
"org.apache.qpid.dispatch." + entity);
+   var prefix = "org.apache.qpid.dispatch."
+   var configs = ["address", "autoLink", "linkRoute"]
+   if (configs.indexOf(entity) > -1)
+   prefix += "router.config."
+   return self._send(body, fullAddr, operation, prefix + entity);
 },
 
 sendMgmtQuery: function (operation) {


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-394: Change from to for Firefox

2016-06-17 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 439d77891 -> 0afd215dd


DISPATCH-394: Change from  to  for 
Firefox


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/0afd215d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/0afd215d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/0afd215d

Branch: refs/heads/master
Commit: 0afd215ddd597ef71e8305b652f1c505ee8d28ac
Parents: 439d778
Author: Ernest Allen 
Authored: Fri Jun 17 10:11:55 2016 -0400
Committer: Ernest Allen 
Committed: Fri Jun 17 10:11:55 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/css/dispatch.css  | 6 +-
 console/hawtio/src/main/webapp/plugin/html/qdrList.html | 2 +-
 console/hawtio/src/main/webapp/plugin/js/qdrList.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0afd215d/console/hawtio/src/main/webapp/plugin/css/dispatch.css
--
diff --git a/console/hawtio/src/main/webapp/plugin/css/dispatch.css 
b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
index 4b6e159..4781b63 100644
--- a/console/hawtio/src/main/webapp/plugin/css/dispatch.css
+++ b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
@@ -552,4 +552,8 @@ circle.subcircle {
 
 #multiple_details .ngViewport {
 height: auto !important;
-}
\ No newline at end of file
+}
+
+div.hdash-button a {
+   color: white;
+}

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0afd215d/console/hawtio/src/main/webapp/plugin/html/qdrList.html
--
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrList.html 
b/console/hawtio/src/main/webapp/plugin/html/qdrList.html
index 41b2b0e..1d4eccf 100644
--- a/console/hawtio/src/main/webapp/plugin/html/qdrList.html
+++ b/console/hawtio/src/main/webapp/plugin/html/qdrList.html
@@ -103,7 +103,7 @@ under the License.
 
 
 
- Add this chart to 
a dashboard
+ Add this chart to a dashboard
 
 Close
 

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0afd215d/console/hawtio/src/main/webapp/plugin/js/qdrList.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrList.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
index e7df383..b3210d0 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrList.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
@@ -45,7 +45,7 @@ var QDR = (function(QDR) {
$scope.selectedRecordName = 
localStorage['QDRSelectedRecordName'];
 
$scope.modes = [{
-   content: ' Attriutes',
+   content: ' Attributes',
id: 'attributes',
op: 'READ',
title: "View router attributes",


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-393: For new router config - Remove Container section, use host instead of addr

2016-06-17 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 2cfb8e79f -> c7ff8612f


DISPATCH-393: For new router config - Remove Container section, use host 
instead of addr


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c7ff8612
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c7ff8612
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c7ff8612

Branch: refs/heads/master
Commit: c7ff8612f89e8df950d0d62f3a9b63fec7fd6343
Parents: 2cfb8e7
Author: Ernest Allen 
Authored: Fri Jun 17 11:52:42 2016 -0400
Committer: Ernest Allen 
Committed: Fri Jun 17 11:52:42 2016 -0400

--
 .../src/main/webapp/plugin/js/dispatchPlugin.js |  3 ++
 .../src/main/webapp/plugin/js/qdrTopology.js| 29 
 2 files changed, 14 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c7ff8612/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js 
b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
index 99f6c47..77ab7d5 100644
--- a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
+++ b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
@@ -248,6 +248,9 @@ 
$.getScript('https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.14/d3.min.js', functi
 
$.getScript('https://cdn.rawgit.com/jaz303/tipsy/master/src/javascripts/jquery.tipsy.js',
 function() {});
 // tooltips on the topology page
 
$.getScript('https://cdn.rawgit.com/briancray/tooltipsy/master/tooltipsy.min.js',
 function() {});
+// download string as file
+$.getScript('https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2014-11-29/FileSaver.min.js',
 function() {});
+
 
 // tell the hawtio plugin loader about our plugin so it can be
 // bootstrapped with the rest of angular

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c7ff8612/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
index e612df4..6542832 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js
@@ -1448,7 +1448,7 @@ var QDR = (function (QDR) {
 
   QDR.module.controller("QDR.NodeDialogController", function($scope, 
QDRService, dialog, newname) {
var schema = QDRService.schema;
-   var myEntities = ['container', 'router', 'log', 'listener' ];
+   var myEntities = ['router', 'log', 'listener' ];
var typeMap = {integer: 'number', string: 'text', path: 'text', 
boolean: 'boolean'};
var newLinks = $('path.temp').toArray();// jquery array of 
new links for the added router
var nodeInfo = QDRService.topology.nodeInfo();
@@ -1596,7 +1596,7 @@ var QDR = (function (QDR) {
ediv.attributes.filter(function (attr) { return 
attr.name == 'port'})[0].value = ++maxPort;
// connectors from other routers need to 
connect to this addr:port
myPort = maxPort;
-   myAddr = ediv.attributes.filter(function (attr) 
{ return attr.name == 'addr'})[0].value
+   myAddr = ediv.attributes.filter(function (attr) 
{ return attr.name == 'host'})[0].value
 
// override the role. 'normal' is the default, 
but we want inter-router
ediv.attributes.filter(function( attr ) { 
return attr.name == 'role'})[0].selected = 'inter-router';
@@ -1622,8 +1622,8 @@ var QDR = (function (QDR) {
var res = listener.results[i];
var role = QDRService.valFor(attrs, res, 
'role');
if (role == 'inter-router') {
-   ediv.attributes.filter(function( attr ) 
{ return attr.name == 'addr'})[0].value =
-   QDRService.valFor(attrs, res, 
'addr')
+   ediv.attributes.filter(function( attr ) 
{ return attr.name == 'host'})[0].value =
+   QDRService.valFor(attrs, res, 
'host')
ediv.attributes.filter(function( attr ) 
{ return attr.name == 'port'})[0].value =
QDRService.valFor(attrs, res, 
'port')
break;
@@ -1632,7 +1632,7 @@ var QDR = (function (QDR)

qpid-dispatch git commit: DISPATCH-397: Set the current router when a new router is chosen in the dropdown

2016-06-17 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master c7ff8612f -> cf2cacd98


DISPATCH-397: Set the current router when a new router is chosen in the dropdown


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/cf2cacd9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/cf2cacd9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/cf2cacd9

Branch: refs/heads/master
Commit: cf2cacd9875e8cc248401d18c9a896d29167c802
Parents: c7ff861
Author: Ernest Allen 
Authored: Fri Jun 17 13:32:21 2016 -0400
Committer: Ernest Allen 
Committed: Fri Jun 17 13:32:21 2016 -0400

--
 console/hawtio/src/main/webapp/plugin/js/qdrList.js | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/cf2cacd9/console/hawtio/src/main/webapp/plugin/js/qdrList.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrList.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
index b3210d0..39f2a33 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrList.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
@@ -130,12 +130,15 @@ var QDR = (function(QDR) {
}
}
$scope.currentNode = undefined;
-   $scope.nodes.some( function (node, i) {
-   if (node.name === $scope.selectedNode) {
-   $scope.currentNode = $scope.nodes[i]
-   return true;
-   }
-   })
+   var setCurrentNode = function () {
+   $scope.nodes.some( function (node, i) {
+   if (node.name === $scope.selectedNode) {
+   $scope.currentNode = $scope.nodes[i]
+   return true;
+   }
+   })
+   }
+   setCurrentNode();
if ($scope.currentNode == undefined) {
$scope.selectedNode = $scope.nodes[0].name;
$scope.selectedNodeId = $scope.nodes[0].id;
@@ -391,6 +394,7 @@ var QDR = (function(QDR) {
$scope.selectNode = function(node) {
$scope.selectedNode = node.name;
$scope.selectedNodeId = node.id;
+   setCurrentNode();
restartUpdate();
};
$scope.$watch('selectedEntity', function(newValue, oldValue) {


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-348: Use deprecated flag to filter out deprecated entities and attributes

2016-06-17 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master cf2cacd98 -> cca46e324


DISPATCH-348: Use deprecated flag to filter out deprecated entities and 
attributes


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/cca46e32
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/cca46e32
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/cca46e32

Branch: refs/heads/master
Commit: cca46e3244747c8a40c226dd0ef858fcaf4f80d5
Parents: cf2cacd
Author: Ernest Allen 
Authored: Fri Jun 17 13:37:13 2016 -0400
Committer: Ernest Allen 
Committed: Fri Jun 17 13:37:13 2016 -0400

--
 .../hawtio/src/main/webapp/plugin/js/qdrService.js  | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/cca46e32/console/hawtio/src/main/webapp/plugin/js/qdrService.js
--
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrService.js 
b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
index 55b2f71..0c4dc98 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrService.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrService.js
@@ -590,6 +590,22 @@ var QDR = (function(QDR) {
 ret = self.sendMgmtQuery('GET-SCHEMA')
 ).then(ret.id, function(response) {
 //QDR.log.debug("Got schema response");
+   // remove deprecated
+   for (var entityName in response.entityTypes) {
+   var entity = response.entityTypes[entityName]
+   if (entity.deprecated) {
+   // deprecated entity
+   delete response.entityTypes[entityName]
+   } else {
+   for (var attributeName in 
entity.attributes) {
+   var attribute = 
entity.attributes[attributeName]
+   if (attribute.deprecated) {
+   // deprecated attribute
+   delete 
response.entityTypes[entityName].attributes[attributeName]
+   }
+   }
+   }
+   }
self.schema = response;
 //self.schema = angular.copy(response);
 //self.topology.cleanUp(response);


-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org



qpid-dispatch git commit: DISPATCH-395: Added links tree nodes and links grids. Added ability to filter links

2016-06-17 Thread eallen
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master cca46e324 -> c9de16b45


DISPATCH-395: Added links tree nodes and links grids. Added ability to filter 
links


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c9de16b4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c9de16b4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c9de16b4

Branch: refs/heads/master
Commit: c9de16b454a28d06546d0a5b088de7e58f08dae8
Parents: cca46e3
Author: Ernest Allen 
Authored: Fri Jun 17 14:15:52 2016 -0400
Committer: Ernest Allen 
Committed: Fri Jun 17 14:15:52 2016 -0400

--
 .../src/main/webapp/plugin/css/dispatch.css |  39 ++
 .../main/webapp/plugin/html/qdrOverview.html|  41 +-
 .../src/main/webapp/plugin/js/qdrOverview.js| 531 +++
 .../src/main/webapp/plugin/js/qdrService.js |   6 +-
 4 files changed, 609 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c9de16b4/console/hawtio/src/main/webapp/plugin/css/dispatch.css
--
diff --git a/console/hawtio/src/main/webapp/plugin/css/dispatch.css 
b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
index 4781b63..d0d6ba2 100644
--- a/console/hawtio/src/main/webapp/plugin/css/dispatch.css
+++ b/console/hawtio/src/main/webapp/plugin/css/dispatch.css
@@ -554,6 +554,45 @@ circle.subcircle {
 height: auto !important;
 }
 
+#linkFilter {
+   display: none;
+   padding: 0.5em;
+   border: 1px solid grey;
+   background-color: #F0F0F0;
+   position: absolute;
+}
+
+span.filter-icon {
+   padding-left: 1em;
+}
+
+button.filter-close {
+width: 15px;
+height: 20px;
+padding: 0;
+position: absolute;
+right: 4px;
+top: 4px;
+}
+
+div.filter-title h6 {
+   margin: 0;
+}
+
+.links button.btn-filter {
+   padding: 0 1em 0 0;
+margin-left: 1em;
+font-size: 1em;
+}
+
+button.btn-filter {
+   visibility: hidden;
+}
+span.dynatree-expanded button.btn-filter,
+a.dynatree-title:hover button.btn-filter {
+   visibility: visible;
+}
+
 div.hdash-button a {
color: white;
 }

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c9de16b4/console/hawtio/src/main/webapp/plugin/html/qdrOverview.html
--
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrOverview.html 
b/console/hawtio/src/main/webapp/plugin/html/qdrOverview.html
index 2a66a94..8760bcc 100644
--- a/console/hawtio/src/main/webapp/plugin/html/qdrOverview.html
+++ b/console/hawtio/src/main/webapp/plugin/html/qdrOverview.html
@@ -33,6 +33,16 @@ under the License.
 
 
 
+
+
+Filter by link type
+x
+
+
+All link types
+Endpoints only
+
+
 
 
 
@@ -54,10 +64,10 @@ under the License.
 
 
 
-

Addresses

-
-
-
+

Addresses

+
+
+
@@ -66,6 +76,18 @@ under the License.