Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x 4fc16630e -> f83bfef6e


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

Fixing JSTL tags in JSP pages

(cherry picked from commit c1157fe1f007ee2344a7f0badefa0794c98817cd)


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

Branch: refs/heads/activemq-5.13.x
Commit: e16ed242b2319523608f6ff7e572668b36e6c813
Parents: 4fc1663
Author: Christopher L. Shannon (cshannon) <[email protected]>
Authored: Mon Oct 17 08:38:50 2016 -0400
Committer: Daniel Kulp <[email protected]>
Committed: Wed Dec 14 10:33:26 2016 -0500

----------------------------------------------------------------------
 activemq-web-console/src/main/webapp/queueConsumers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queueProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/subscribers.jsp      | 6 +++---
 activemq-web-console/src/main/webapp/topicProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/topicSubscribers.jsp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/e16ed242/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 5ba581f..ccefb89 100644
--- a/activemq-web-console/src/main/webapp/queueConsumers.jsp
+++ b/activemq-web-console/src/main/webapp/queueConsumers.jsp
@@ -63,7 +63,7 @@
                 <a href="network.jsp">${row.clientId}</a><br/>
             </c:when>
             <c:otherwise>
-                <a href="<c:url 
value="connection.jsp?connectionID=${row.clientId}"/>"><c:out 
value="${row.clientId}" /></a><br/>
+                <a href="<c:out 
value="connection.jsp?connectionID=${row.clientId}"/>"><c:out 
value="${row.clientId}" /></a><br/>
             </c:otherwise>
         </c:choose>
             <c:out value="${row.connectionId}" />

http://git-wip-us.apache.org/repos/asf/activemq/blob/e16ed242/activemq-web-console/src/main/webapp/queueProducers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/queueProducers.jsp 
b/activemq-web-console/src/main/webapp/queueProducers.jsp
index 724a76c..9953669 100644
--- a/activemq-web-console/src/main/webapp/queueProducers.jsp
+++ b/activemq-web-console/src/main/webapp/queueProducers.jsp
@@ -49,7 +49,7 @@
 <c:forEach items="${requestContext.queueProducerQuery.producers}" var="row">
 <tr>
        <td>
-        <a href="<c:url 
value="connection.jsp?connectionID=${row.clientId}"/>"><c:out 
value="${row.clientId}" /></a><br/>
+        <a href="<c:out 
value="connection.jsp?connectionID=${row.clientId}"/>"><c:out 
value="${row.clientId}" /></a><br/>
         <br>
         <c:out value="${row.connectionId}" />
     </td>

http://git-wip-us.apache.org/repos/asf/activemq/blob/e16ed242/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 1dfbbd7..f2b62df 100644
--- a/activemq-web-console/src/main/webapp/subscribers.jsp
+++ b/activemq-web-console/src/main/webapp/subscribers.jsp
@@ -97,7 +97,7 @@
 <c:forEach items="${requestContext.brokerQuery.durableTopicSubscribers}" 
var="row">
 <tr>
 <td>
-<a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>">
+<a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>">
 <form:tooltip text="${row.clientId}" length="10"/>
 </a>
 </td>
@@ -145,7 +145,7 @@
 <c:forEach 
items="${requestContext.brokerQuery.inactiveDurableTopicSubscribers}" var="row">
 <tr>
 <td>
-<a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>">
+<a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>">
 <form:tooltip text="${row.clientId}" length="10"/>
 </a>
 </td>
@@ -194,7 +194,7 @@
 <c:forEach items="${requestContext.brokerQuery.nonDurableTopicSubscribers}" 
var="row">
 <tr>
 <td>
-<a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>">
+<a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>">
 <form:tooltip text="${row.clientId}" length="10"/>
 </a>
 </td>

http://git-wip-us.apache.org/repos/asf/activemq/blob/e16ed242/activemq-web-console/src/main/webapp/topicProducers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/topicProducers.jsp 
b/activemq-web-console/src/main/webapp/topicProducers.jsp
index 2a14077..5cefc9b 100644
--- a/activemq-web-console/src/main/webapp/topicProducers.jsp
+++ b/activemq-web-console/src/main/webapp/topicProducers.jsp
@@ -49,7 +49,7 @@
 <c:forEach items="${requestContext.topicProducerQuery.producers}" var="row">
 <tr>
        <td>
-        <a href="<c:url 
value="connection.jsp?connectionID=${row.clientId}"/>"><c:out 
value="${row.clientId}" /></a><br/>
+        <a href="<c:out 
value="connection.jsp?connectionID=${row.clientId}"/>"><c:out 
value="${row.clientId}" /></a><br/>
         <br>
         <c:out value="${row.connectionId}" />
     </td>

http://git-wip-us.apache.org/repos/asf/activemq/blob/e16ed242/activemq-web-console/src/main/webapp/topicSubscribers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/topicSubscribers.jsp 
b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
index 7f2e9c9..7b83834 100644
--- a/activemq-web-console/src/main/webapp/topicSubscribers.jsp
+++ b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
@@ -53,7 +53,7 @@
 <c:forEach items="${requestContext.topicSubscriberQuery.subscribers}" 
var="row">
 <tr>
        <td>
-        <a href="<c:url 
value="connection.jsp?connectionID=${row.clientId}"/>"><c:out 
value="${row.clientId}" /></a><br/>
+        <a href="<c:out 
value="connection.jsp?connectionID=${row.clientId}"/>"><c:out 
value="${row.clientId}" /></a><br/>
         <br>
         <c:out value="${row.connectionId}" />
     </td>

Reply via email to