[06/19] git commit: AMQ-4998: apply fix from Guilhem RAMBAL. Added use of c:out to propery html-encode the output.

2014-03-20 Thread hadrian 
AMQ-4998: apply fix from Guilhem RAMBAL.  Added use of c:out to propery 
html-encode the output.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/1341d673
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/1341d673
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/1341d673

Branch: refs/heads/activemq-5.9
Commit: 1341d6733c7040bd6fbb7de7e7bcdb1ec9f12c5c
Parents: 4542953
Author: artnaseef a...@artnaseef.com
Authored: Thu Feb 20 07:47:34 2014 -0700
Committer: Hadrian Zbarcea hadr...@apache.org
Committed: Thu Mar 20 15:14:20 2014 -0400

--
 activemq-web-console/src/main/webapp/connections.jsp | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/1341d673/activemq-web-console/src/main/webapp/connections.jsp
--
diff --git a/activemq-web-console/src/main/webapp/connections.jsp 
b/activemq-web-console/src/main/webapp/connections.jsp
index 1b852b6..c66f677 100644
--- a/activemq-web-console/src/main/webapp/connections.jsp
+++ b/activemq-web-console/src/main/webapp/connections.jsp
@@ -62,7 +62,8 @@
 thead
 tr
thName/th
-   thNetwork TTL/th
+   thMessage TTL/th
+   thConsumer TTL/th
thDynamic Only/th
thConduit Subscriptions/th
thBridge Temps/th
@@ -74,7 +75,8 @@
 c:forEach items=${requestContext.brokerQuery.networkConnectors} var=nc
 tr
tdc:out value=${nc.name} //td
-   tdc:out value=${nc.networkTTL} //td
+   tdc:out value=${nc.messageTTL} //td
+   tdc:out value=${nc.consumerTTL} //td
tdc:out value=${nc.dynamicOnly} //td
tdc:out value=${nc.conduitSubscriptions} //td
tdc:out value=${nc.bridgeTempDestinations} //td

git commit: AMQ-4998: apply fix from Guilhem RAMBAL. Added use of c:out to propery html-encode the output.

2014-02-20 Thread artnaseef 
Repository: activemq
Updated Branches:
  refs/heads/trunk 4ca5519e9 - dcbac84a8


AMQ-4998: apply fix from Guilhem RAMBAL.  Added use of c:out to propery 
html-encode the output.


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

Branch: refs/heads/trunk
Commit: dcbac84a8c4d9dabeb793081557d3bb5c6694d51
Parents: 4ca5519
Author: artnaseef a...@artnaseef.com
Authored: Thu Feb 20 07:47:34 2014 -0700
Committer: artnaseef a...@artnaseef.com
Committed: Thu Feb 20 07:47:34 2014 -0700

--
 activemq-web-console/src/main/webapp/connections.jsp | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/dcbac84a/activemq-web-console/src/main/webapp/connections.jsp
--
diff --git a/activemq-web-console/src/main/webapp/connections.jsp 
b/activemq-web-console/src/main/webapp/connections.jsp
index 1b852b6..c66f677 100644
--- a/activemq-web-console/src/main/webapp/connections.jsp
+++ b/activemq-web-console/src/main/webapp/connections.jsp
@@ -62,7 +62,8 @@
 thead
 tr
thName/th
-   thNetwork TTL/th
+   thMessage TTL/th
+   thConsumer TTL/th
thDynamic Only/th
thConduit Subscriptions/th
thBridge Temps/th
@@ -74,7 +75,8 @@
 c:forEach items=${requestContext.brokerQuery.networkConnectors} var=nc
 tr
tdc:out value=${nc.name} //td
-   tdc:out value=${nc.networkTTL} //td
+   tdc:out value=${nc.messageTTL} //td
+   tdc:out value=${nc.consumerTTL} //td
tdc:out value=${nc.dynamicOnly} //td
tdc:out value=${nc.conduitSubscriptions} //td
tdc:out value=${nc.bridgeTempDestinations} //td