Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6146 

Fixing JSTL tags in the Webconsole

(cherry picked from commit d0f5c27785)
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-01-28 14:05:45 +00:00
parent 4819336923
commit e24e285c99
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-web-console/src/main/webapp/connection.jsp
View File

@ -105,10 +105,10 @@ No connection could be found for ID <c:out value="${requestContext.connectionQue
<td> <td>
<c:choose> <c:choose>
<c:when test="${consumer.destinationQueue}"> <c:when test="${consumer.destinationQueue}">
Queue <a href="browse.jsp?JMSDestination=${consumer.destinationName}"><c:out value="${consumer.destinationName}" /></a> Queue <a href="browse.jsp?JMSDestination=<c:out value="${consumer.destinationName}" />"><c:out value="${consumer.destinationName}" /></a>
</c:when> </c:when>
<c:when test="${consumer.destinationTopic}"> <c:when test="${consumer.destinationTopic}">
Topic <a href="send.jsp?JMSDestination=${consumer.destinationName}"><c:out value="${consumer.destinationName}" /></a> Topic <a href="send.jsp?JMSDestination=<c:out value="${consumer.destinationName}" />"><c:out value="${consumer.destinationName}" /></a>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:out value="${consumer.destinationName}" /> <c:out value="${consumer.destinationName}" />

6
activemq-web-console/src/main/webapp/message.jsp
View File

@ -132,7 +132,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td colspan="2"><a href="<c:url value='deleteMessage.action?JMSDestination=${requestContext.messageQuery.JMSDestination}&messageId=${row.JMSMessageID}&secret=${sessionScope["secret"]}' />" onclick="return confirm('Are you sure you want to delete the message?')" >Delete</a></td> <td colspan="2"><a href="<c:out value='deleteMessage.action?JMSDestination=${requestContext.messageQuery.JMSDestination}&messageId=${row.JMSMessageID}&secret=${sessionScope["secret"]}' />" onclick="return confirm('Are you sure you want to delete the message?')" >Delete</a></td>
</tr> </tr>
<c:set var="queueName" value="${requestContext.messageQuery.JMSDestination}"/> <c:set var="queueName" value="${requestContext.messageQuery.JMSDestination}"/>
<c:set var="queueNameSubStr" value="${fn:substring(queueName, 0, 4)}" /> <c:set var="queueNameSubStr" value="${fn:substring(queueName, 0, 4)}" />
@ -158,7 +158,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</tr> </tr>
</c:if> </c:if>
<tr class="odd"> <tr class="odd">
<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><a href="<c:out 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"> <td rowspan="2">
<select id="queue"> <select id="queue">
<option value=""> -- Please select --</option> <option value=""> -- Please select --</option>
@ -172,7 +172,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</tr> </tr>
<tr class="odd"> <tr class="odd">
<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']}"/>')" <td><a href="<c:out value="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=${requestContext.messageQuery.JMSDestination}&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=${sessionScope['secret']}"/>')"
>Move</a></td> >Move</a></td>
</tr> </tr>
</tbody> </tbody>

6
activemq-web-console/src/main/webapp/xml/queues.jsp
View File

@ -17,7 +17,7 @@
--%> --%>
<queues> <queues>
<c:forEach items="${requestContext.brokerQuery.queues}" var="row"> <c:forEach items="${requestContext.brokerQuery.queues}" var="row">
<queue name="${row.name}"> <queue name="<c:out value="${row.name}" />">
<stats size="${row.queueSize}" <stats size="${row.queueSize}"
consumerCount="${row.consumerCount}" consumerCount="${row.consumerCount}"
@ -26,8 +26,8 @@
<feed> <feed>
<atom><c:url value="queueBrowse/${row.name}?view=rss&amp;feedType=atom_1.0"/></atom> <atom><c:out value="queueBrowse/${row.name}?view=rss&amp;feedType=atom_1.0"/></atom>
<rss><c:url value="queueBrowse/${row.name}?view=rss&amp;feedType=rss_2.0"/></rss> <rss><c:out value="queueBrowse/${row.name}?view=rss&amp;feedType=rss_2.0"/></rss>
</feed> </feed>
</queue> </queue>
</c:forEach> </c:forEach>

36
activemq-web-console/src/main/webapp/xml/subscribers.jsp
View File

@ -17,33 +17,33 @@
--%> --%>
<subscribers> <subscribers>
<c:forEach items="${requestContext.brokerQuery.durableTopicSubscribers}" var="row"> <c:forEach items="${requestContext.brokerQuery.durableTopicSubscribers}" var="row">
<subscriber clientId="${row.clientId}" <subscriber clientId="<c:out value="${row.clientId}"/>"
subscriptionName="${row.subscriptionName}" subscriptionName="<c:out value="${row.subscriptionName}"/>"
connectionId="${row.connectionId}" connectionId="<c:out value="${row.connectionId}"/>"
destinationName="${row.destinationName}" destinationName="<c:out value="${row.destinationName}"/>"
selector="<c:out value="${row.selector}"/>" selector="<c:out value="${row.selector}"/>"
active="yes" > active="yes" >
<stats pendingQueueSize="${row.pendingQueueSize}" <stats pendingQueueSize="<c:out value="${row.pendingQueueSize}"/>"
dispatchedQueueSize="${row.dispatchedQueueSize}" dispatchedQueueSize="<c:out value="${row.dispatchedQueueSize}"/>"
dispatchedCounter="${row.dispatchedCounter}" dispatchedCounter="<c:out value="${row.dispatchedCounter}"/>"
enqueueCounter="${row.enqueueCounter}" enqueueCounter="<c:out value="${row.enqueueCounter}"/>"
dequeueCounter="${row.dequeueCounter}"/> dequeueCounter="<c:out value="${row.dequeueCounter}"/>" />
</subscriber> </subscriber>
</c:forEach> </c:forEach>
<c:forEach items="${requestContext.brokerQuery.inactiveDurableTopicSubscribers}" var="row"> <c:forEach items="${requestContext.brokerQuery.inactiveDurableTopicSubscribers}" var="row">
<subscriber clientId="${row.clientId}" <subscriber clientId="<c:out value="${row.clientId}"/>"
subscriptionName="${row.subscriptionName}" subscriptionName="<c:out value="${row.subscriptionName}"/>"
connectionId="${row.connectionId}" connectionId="<c:out value="${row.connectionId}"/>"
destinationName="${row.destinationName}" destinationName="<c:out value="${row.destinationName}"/>"
selector="<c:out value="${row.selector}"/>" selector="<c:out value="${row.selector}"/>"
active="no" > active="no" >
<stats pendingQueueSize="${row.pendingQueueSize}" <stats pendingQueueSize="<c:out value="${row.pendingQueueSize}"/>"
dispatchedQueueSize="${row.dispatchedQueueSize}" dispatchedQueueSize="<c:out value="${row.dispatchedQueueSize}"/>"
dispatchedCounter="${row.dispatchedCounter}" dispatchedCounter="<c:out value="${row.dispatchedCounter}"/>"
enqueueCounter="${row.enqueueCounter}" enqueueCounter="<c:out value="${row.enqueueCounter}"/>"
dequeueCounter="${row.dequeueCounter}"/> dequeueCounter="<c:out value="${row.dequeueCounter}"/>"/>
</subscriber> </subscriber>
</c:forEach> </c:forEach>

2
activemq-web-console/src/main/webapp/xml/topics.jsp
View File

@ -17,7 +17,7 @@
--%> --%>
<topics> <topics>
<c:forEach items="${requestContext.brokerQuery.topics}" var="row"> <c:forEach items="${requestContext.brokerQuery.topics}" var="row">
<topic name="${row.name}"> <topic name="<c:out value="${row.name}"/> ">
<stats size="${row.queueSize}" <stats size="${row.queueSize}"
consumerCount="${row.consumerCount}" consumerCount="${row.consumerCount}"