Updated Branches: refs/heads/trunk afded924f -> 0c4790bb9
AMQ-5033: webconsole url and html encoding missing Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0c4790bb Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0c4790bb Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0c4790bb Branch: refs/heads/trunk Commit: 0c4790bb946127ebb9a153c1fba1e3140917aad6 Parents: afded92 Author: James Carman <jcar...@apache.org> Authored: Fri Feb 7 17:14:43 2014 -0500 Committer: artnaseef <a...@artnaseef.com> Committed: Sat Feb 8 21:21:40 2014 -0700 ---------------------------------------------------------------------- .../src/main/webapp/connections.jsp | 24 ++++++++++---------- activemq-web-console/src/main/webapp/graph.jsp | 18 +++++++-------- activemq-web-console/src/main/webapp/index.jsp | 18 +++++++-------- .../src/main/webapp/message.jsp | 6 ++--- .../src/main/webapp/network.jsp | 10 ++++---- .../src/main/webapp/queueConsumers.jsp | 24 ++++++++++---------- activemq-web-console/src/main/webapp/queues.jsp | 18 ++++++++++----- .../src/main/webapp/scheduled.jsp | 2 +- .../src/main/webapp/subscribers.jsp | 20 ++++++++-------- activemq-web-console/src/main/webapp/topics.jsp | 6 ++--- 10 files changed, 76 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/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 928fdac..1b852b6 100644 --- a/activemq-web-console/src/main/webapp/connections.jsp +++ b/activemq-web-console/src/main/webapp/connections.jsp @@ -29,7 +29,7 @@ <h2>Connections</h2> <c:forEach items="${requestContext.brokerQuery.connectors}" var="connectorName"> -<h3>Connector ${connectorName}</h3> +<h3>Connector <c:out value="${connectorName}" /></h3> <table id="connections" class="sortable autostripe"> <thead> @@ -44,10 +44,10 @@ <jms:forEachConnection broker="${requestContext.brokerQuery}" connectorName="${connectorName}" connection="con" connectionName="conName"> <tr> - <td><a href="connection.jsp?connectionID=${conName}">${conName}</a></td> - <td>${con.remoteAddress}</td> - <td>${con.active}</td> - <td>${con.slow}</td> + <td><a href="<c:url value='connection.jsp?connectionID=${conName}' />"><c:out value="${conName}" /></a></td> + <td><c:out value="${con.remoteAddress}" /></td> + <td><c:out value="${con.active}" /></td> + <td><c:out value="${con.slow}" /></td> </tr> </jms:forEachConnection> </tbody> @@ -73,13 +73,13 @@ <tbody> <c:forEach items="${requestContext.brokerQuery.networkConnectors}" var="nc"> <tr> - <td>${nc.name}</td> - <td>${nc.networkTTL}</td> - <td>${nc.dynamicOnly}</td> - <td>${nc.conduitSubscriptions}</td> - <td>${nc.bridgeTempDestinations}</td> - <td>${nc.decreaseNetworkConsumerPriority}</td> - <td>${nc.dispatchAsync}</td> + <td><c:out value="${nc.name}" /></td> + <td><c:out value="${nc.networkTTL}" /></td> + <td><c:out value="${nc.dynamicOnly}" /></td> + <td><c:out value="${nc.conduitSubscriptions}" /></td> + <td><c:out value="${nc.bridgeTempDestinations}" /></td> + <td><c:out value="${nc.decreaseNetworkConsumerPriority}" /></td> + <td><c:out value="${nc.dispatchAsync}" /></td> </tr> </c:forEach> </tbody> http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/activemq-web-console/src/main/webapp/graph.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/graph.jsp b/activemq-web-console/src/main/webapp/graph.jsp index 756d1fb..3f87f96 100644 --- a/activemq-web-console/src/main/webapp/graph.jsp +++ b/activemq-web-console/src/main/webapp/graph.jsp @@ -25,7 +25,7 @@ <%@include file="decorators/header.jsp" %> -<h2>Browse ${requestContext.queueBrowser.JMSDestination}</h2> +<h2>Browse <c:out value="${requestContext.queueBrowser.JMSDestination}" /></h2> <table id="messages" class="sortable autostripe"> <thead> @@ -47,16 +47,16 @@ ---%> <jms:forEachMessage queueBrowser="${requestContext.queueBrowser.browser}" var="row"> <tr> -<td><a href="message.jsp?id=${row.JMSMessageID}" title="${row.JMSDestination}">${row.JMSMessageID}</a></td> -<td>${row.JMSCorrelationID}</td> +<td><a href="<c:url value='message.jsp?id=${row.JMSMessageID}' />" title="<c:out value='${row.JMSDestination}' />"><c:out value="${row.JMSMessageID}" /></a></td> +<td><c:out value="${row.JMSCorrelationID}" /></td> <td><jms:persistent message="${row}"/></td> -<td>${row.JMSPriority}</td> -<td>${row.JMSRedelivered}</td> -<td>${row.JMSReplyTo}</td> -<td>${row.JMSTimestamp}</td> -<td>${row.JMSType}</td> +<td><c:out value="${row.JMSPriority}" /></td> +<td><c:out value="${row.JMSRedelivered}" /></td> +<td><c:out value="${row.JMSReplyTo}" /></td> +<td><c:out value="${row.JMSTimestamp}" /></td> +<td><c:out value="${row.JMSType}" /></td> <td> - <a href="deleteDestination.action?destination=${row.JMSMessageID}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a> + <a href="<c:url value='deleteDestination.action?destination=${row.JMSMessageID}&secret=${sessionScope["secret"]}'/>">Delete</a> </td> </tr> </jms:forEachMessage> http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/activemq-web-console/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/index.jsp b/activemq-web-console/src/main/webapp/index.jsp index bbb6fc2..8859147 100644 --- a/activemq-web-console/src/main/webapp/index.jsp +++ b/activemq-web-console/src/main/webapp/index.jsp @@ -27,11 +27,11 @@ <h2>Welcome!</h2> <p> -Welcome to the Apache ActiveMQ Console of <b>${requestContext.brokerQuery.brokerName}</b> (${requestContext.brokerQuery.brokerAdmin.brokerId}) +Welcome to the Apache ActiveMQ Console of <b><c:out value="${requestContext.brokerQuery.brokerName}" /></b> (<c:out value="${requestContext.brokerQuery.brokerAdmin.brokerId}" />) </p> <p> -You can find more information about Apache ActiveMQ on the <a href="http://activemq.apache.org/";>Apache ActiveMQ Site</a> +You can find more information about Apache ActiveMQ on the <a href="<c:url value="http://activemq.apache.org/"; />">Apache ActiveMQ Site</a> </p> <h2>Broker</h2> @@ -40,31 +40,31 @@ You can find more information about Apache ActiveMQ on the <a href="http://activ <table> <tr> <td>Name</td> - <td><b>${requestContext.brokerQuery.brokerAdmin.brokerName}</b></td> + <td><b><c:out value="${requestContext.brokerQuery.brokerAdmin.brokerName}" /></b></td> </tr> <tr> <td>Version</td> - <td><b>${requestContext.brokerQuery.brokerAdmin.brokerVersion}</b></td> + <td><b><c:out value="${requestContext.brokerQuery.brokerAdmin.brokerVersion}" /></b></td> </tr> <tr> <td>ID</td> - <td><b>${requestContext.brokerQuery.brokerAdmin.brokerId}</b></td> + <td><b><c:out value="${requestContext.brokerQuery.brokerAdmin.brokerId}" /></b></td> </tr> <tr> <td>Uptime</td> - <td><b>${requestContext.brokerQuery.brokerAdmin.uptime}</b></td> + <td><b><c:out value="${requestContext.brokerQuery.brokerAdmin.uptime}" /></b></td> </tr> <tr> <td>Store percent used</td> - <td><b>${requestContext.brokerQuery.brokerAdmin.storePercentUsage}</b></td> + <td><b><c:out value="${requestContext.brokerQuery.brokerAdmin.storePercentUsage}" /></b></td> </tr> <tr> <td>Memory percent used</td> - <td><b>${requestContext.brokerQuery.brokerAdmin.memoryPercentUsage}</b></td> + <td><b><c:out value="${requestContext.brokerQuery.brokerAdmin.memoryPercentUsage}" /></b></td> </tr> <tr> <td>Temp percent used</td> - <td><b>${requestContext.brokerQuery.brokerAdmin.tempPercentUsage}</b></td> + <td><b><c:out value="${requestContext.brokerQuery.brokerAdmin.tempPercentUsage}" /></b></td> </tr> </table> <%@include file="decorators/footer.jsp" %> http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/activemq-web-console/src/main/webapp/message.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/message.jsp b/activemq-web-console/src/main/webapp/message.jsp index cc5ff0c..22174a8 100644 --- a/activemq-web-console/src/main/webapp/message.jsp +++ b/activemq-web-console/src/main/webapp/message.jsp @@ -133,10 +133,10 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id} </thead> <tbody> <tr> - <td colspan="2"><a href="deleteMessage.action?JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a></td> + <td colspan="2"><a href="<c:url value="deleteMessage.action?JMSDestination=${requestContext.messageQuery.JMSDestination}&messageId=${row.JMSMessageID}&secret=${sessionScope['secret']}" />">Delete</a></td> </tr> <tr class="odd"> - <td><a href="javascript:confirmAction('queue', 'copyMessage.action?destination=%target%&JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Copy</a></td> + <td><a href="<c:url value="javascript:confirmAction('queue', 'copyMessage.action?destination=%target%&JMSDestination=${requestContext.messageQuery.JMSDestination}&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=${sessionScope['secret']}"/>')">Copy</a></td> <td rowspan="2"> <select id="queue"> <option value=""> -- Please select --</option> @@ -150,7 +150,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id} </tr> <tr class="odd"> - <td><a href="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Move</a></td> + <td><a href="<c:url value="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=${requestContext.messageQuery.JMSDestination}&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=${sessionScope['secret']}"/>')">Move</a></td> </tr> </tbody> </table> http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/activemq-web-console/src/main/webapp/network.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/network.jsp b/activemq-web-console/src/main/webapp/network.jsp index 9b9d503..f817829 100644 --- a/activemq-web-console/src/main/webapp/network.jsp +++ b/activemq-web-console/src/main/webapp/network.jsp @@ -39,11 +39,11 @@ <tbody> <c:forEach items="${requestContext.brokerQuery.networkBridges}" var="nb"> <tr> - <td>${nb.remoteBrokerName}</td> - <td>${nb.remoteAddress}</td> - <td>${nb.createdByDuplex}</td> - <td>${nb.enqueueCounter}</td> - <td>${nb.dequeueCounter}</td> + <td><c:out value="${nb.remoteBrokerName}" /></td> + <td><c:out value="${nb.remoteAddress}" /></td> + <td><c:out value="${nb.createdByDuplex}" /></td> + <td><c:out value="${nb.enqueueCounter}" /></td> + <td><c:out value="${nb.dequeueCounter}" /></td> </tr> </c:forEach> </tbody> http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/activemq-web-console/src/main/webapp/queueConsumers.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/queueConsumers.jsp b/activemq-web-console/src/main/webapp/queueConsumers.jsp index 47e3d91..5ba581f 100644 --- a/activemq-web-console/src/main/webapp/queueConsumers.jsp +++ b/activemq-web-console/src/main/webapp/queueConsumers.jsp @@ -63,24 +63,24 @@ <a href="network.jsp">${row.clientId}</a><br/> </c:when> <c:otherwise> - <a href="connection.jsp?connectionID=${row.clientId}">${row.clientId}</a><br/> + <a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>"><c:out value="${row.clientId}" /></a><br/> </c:otherwise> </c:choose> - ${row.connectionId}</a> + <c:out value="${row.connectionId}" /> </td> - <td>${row.sessionId}</td> - <td>${row.selector}</td> - <td>${row.enqueueCounter}</td> - <td>${row.dequeueCounter}</td> - <td>${row.dispatchedCounter}</td> - <td>${row.dispatchedQueueSize}</td> + <td><c:out value="${row.sessionId}" /></td> + <td><c:out value="${row.selector}" /></td> + <td><c:out value="${row.enqueueCounter}" /></td> + <td><c:out value="${row.dequeueCounter}" /></td> + <td><c:out value="${row.dispatchedCounter}" /></td> + <td><c:out value="${row.dispatchedQueueSize}" /></td> <td> - ${row.prefetchSize}<br/> - ${row.maximumPendingMessageLimit} + <c:out value="${row.prefetchSize}" /><br/> + <c:out value="${row.maximumPendingMessageLimit}" /> </td> <td> - ${row.exclusive}<br/> - ${row.retroactive} + <c:out value="${row.exclusive}" /><br/> + <c:out value="${row.retroactive}" /> </td> </tr> </c:forEach> http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/activemq-web-console/src/main/webapp/queues.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/queues.jsp b/activemq-web-console/src/main/webapp/queues.jsp index bdc8f6e..8b3a204 100644 --- a/activemq-web-console/src/main/webapp/queues.jsp +++ b/activemq-web-console/src/main/webapp/queues.jsp @@ -57,17 +57,23 @@ <tr> <td><a href="<c:url value="browse.jsp"> <c:param name="JMSDestination" value="${row.name}" /></c:url>"><form:tooltip text="${row.name}" length="50"/></a></td> -<td>${row.queueSize}</td> -<td>${row.consumerCount}</td> -<td>${row.enqueueCount}</td> -<td>${row.dequeueCount}</td> +<td><c:out value="${row.queueSize}" /></td> +<td><c:out value="${row.consumerCount}" /></td> +<td><c:out value="${row.enqueueCount}" /></td> +<td><c:out value="${row.dequeueCount}" /></td> <td> <a href="<c:url value="browse.jsp"> <c:param name="JMSDestination" value="${row.name}" /></c:url>">Browse</a> <a href="<c:url value="queueConsumers.jsp"> <c:param name="JMSDestination" value="${row.name}" /></c:url>">Active Consumers</a><br/> - <a href="queueBrowse/<form:escape text="${row.name}" />?view=rss&feedType=atom_1.0" title="Atom 1.0"><img src="images/feed_atom.png"/></a> - <a href="queueBrowse/<form:escape text="${row.name}" />?view=rss&feedType=rss_2.0" title="RSS 2.0"><img src="images/feed_rss.png"/></a> + <a href="<c:url value="queueBrowse/${row.name}"> + <c:param name="view" value="rss" /> + <c:param name="feedType" value="atom_1.0" /> + </c:url>" title="Atom 1.0"><img src="<c:url value="images/feed_atom.png" />" /></a> + <a href="<c:url value="queueBrowse/${row.name}"> + <c:param name="view" value="rss" /> + <c:param name="feedType" value="rss_2.0" /> + </c:url>" title="RSS 2.0"><img src="<c:url value="images/feed_rss.png" />" /></a> </td> <td> <a href="<c:url value="send.jsp"> http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/activemq-web-console/src/main/webapp/scheduled.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/scheduled.jsp b/activemq-web-console/src/main/webapp/scheduled.jsp index f7ed44c..e2c8c88 100644 --- a/activemq-web-console/src/main/webapp/scheduled.jsp +++ b/activemq-web-console/src/main/webapp/scheduled.jsp @@ -53,7 +53,7 @@ <td><c:out value="${row.period}"/></td> <td><c:out value="${row.repeat}"/></td> <td> - <a href="deleteJob.action?jobId=${row.jobId}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a> + <a href="<c:url value="deleteJob.action?jobId=${row.jobId}&secret=${sessionScope['secret']}"/>">Delete</a> </td> </tr> </c:forEach> http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/activemq-web-console/src/main/webapp/subscribers.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/subscribers.jsp b/activemq-web-console/src/main/webapp/subscribers.jsp index f222ca8..f876e49 100644 --- a/activemq-web-console/src/main/webapp/subscribers.jsp +++ b/activemq-web-console/src/main/webapp/subscribers.jsp @@ -101,11 +101,11 @@ <td><form:tooltip text="${row.connectionId}" length="10"/></td> <td><form:tooltip text="${row.destinationName}" length="10"/></td> <td><c:out value="${row.selector}"/></td> -<td>${row.pendingQueueSize}</td> -<td>${row.dispatchedQueueSize}</td> -<td>${row.dispatchedCounter}</td> -<td>${row.enqueueCounter}</td> -<td>${row.dequeueCounter}</td> +<td><c:out value="${row.pendingQueueSize}" /></td> +<td><c:out value="${row.dispatchedQueueSize}" /></td> +<td><c:out value="${row.dispatchedCounter}" /></td> +<td><c:out value="${row.enqueueCounter}" /></td> +<td><c:out value="${row.dequeueCounter}" /></td> <td> <a href="<c:url value="deleteSubscriber.action"> <c:param name="clientId" value="${row.clientId}"/> @@ -145,11 +145,11 @@ <td><form:tooltip text="${row.connectionId}" length="10"/></td> <td><form:tooltip text="${row.destinationName}" length="10"/></td> <td><c:out value="${row.selector}"/></td> -<td>${row.pendingQueueSize}</td> -<td>${row.dispatchedQueueSize}</td> -<td>${row.dispatchedCounter}</td> -<td>${row.enqueueCounter}</td> -<td>${row.dequeueCounter}</td> +<td><c:out value="${row.pendingQueueSize}"/></td> +<td><c:out value="${row.dispatchedQueueSize}"/></td> +<td><c:out value="${row.dispatchedCounter}"/></td> +<td><c:out value="${row.enqueueCounter}"/></td> +<td><c:out value="${row.dequeueCounter}"/></td> <td> <a href="<c:url value="deleteSubscriber.action"> <c:param name="clientId" value="${row.clientId}"/> http://git-wip-us.apache.org/repos/asf/activemq/blob/0c4790bb/activemq-web-console/src/main/webapp/topics.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/topics.jsp b/activemq-web-console/src/main/webapp/topics.jsp index e432b41..f964180 100644 --- a/activemq-web-console/src/main/webapp/topics.jsp +++ b/activemq-web-console/src/main/webapp/topics.jsp @@ -54,9 +54,9 @@ <td><a href="<c:url value="send.jsp"> <c:param name="JMSDestination" value="${row.name}" /> <c:param name="JMSDestinationType" value="topic"/></c:url>"><form:tooltip text="${row.name}" length="50"/></a></td> -<td>${row.consumerCount}</td> -<td>${row.enqueueCount}</td> -<td>${row.dequeueCount}</td> +<td><c:out value="${row.consumerCount}" /></td> +<td><c:out value="${row.enqueueCount}" /></td> +<td><c:out value="${row.dequeueCount}" /></td> <td> <a href="<c:url value="send.jsp"> <c:param name="JMSDestination" value="${row.name}" />
