activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6146
Date Thu, 28 Jan 2016 14:06:46 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x 481933692 -> e24e285c9


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

Fixing JSTL tags in the Webconsole

(cherry picked from commit d0f5c277851f260247c256c1d6cf56a31e744d31)


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

Branch: refs/heads/activemq-5.13.x
Commit: e24e285c9919a1ed7e415d45780d40a3136c30f9
Parents: 4819336
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Thu Jan 28 14:05:45 2016 +0000
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Thu Jan 28 14:06:33 2016 +0000

----------------------------------------------------------------------
 .../src/main/webapp/connection.jsp              |  4 +--
 .../src/main/webapp/message.jsp                 |  6 ++--
 .../src/main/webapp/xml/queues.jsp              |  6 ++--
 .../src/main/webapp/xml/subscribers.jsp         | 36 ++++++++++----------
 .../src/main/webapp/xml/topics.jsp              |  2 +-
 5 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/e24e285c/activemq-web-console/src/main/webapp/connection.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/connection.jsp b/activemq-web-console/src/main/webapp/connection.jsp
index a2f600f..474dadc 100644
--- a/activemq-web-console/src/main/webapp/connection.jsp
+++ b/activemq-web-console/src/main/webapp/connection.jsp
@@ -105,10 +105,10 @@ No connection could be found for ID <c:out value="${requestContext.connectionQue
 	<td>
 		<c:choose>
 			<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 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:otherwise>
 				<c:out value="${consumer.destinationName}" />

http://git-wip-us.apache.org/repos/asf/activemq/blob/e24e285c/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 babd967..40b78f7 100644
--- a/activemq-web-console/src/main/webapp/message.jsp
+++ b/activemq-web-console/src/main/webapp/message.jsp
@@ -132,7 +132,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
                 </thead>
                 <tbody>
                     <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>
                     <c:set var="queueName" value="${requestContext.messageQuery.JMSDestination}"/>
                     <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>
                     </c:if>
                     <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">
                             <select id="queue">
                                 <option value=""> -- Please select --</option>
@@ -172,7 +172,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
 
                     </tr>
                     <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>
                     </tr>
                 </tbody>

http://git-wip-us.apache.org/repos/asf/activemq/blob/e24e285c/activemq-web-console/src/main/webapp/xml/queues.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/xml/queues.jsp b/activemq-web-console/src/main/webapp/xml/queues.jsp
index 6a09e22..faa67ca 100644
--- a/activemq-web-console/src/main/webapp/xml/queues.jsp
+++ b/activemq-web-console/src/main/webapp/xml/queues.jsp
@@ -17,7 +17,7 @@
 --%>
 <queues>
 <c:forEach items="${requestContext.brokerQuery.queues}" var="row">
-<queue name="${row.name}">
+<queue name="<c:out value="${row.name}" />">
 
   <stats size="${row.queueSize}"
          consumerCount="${row.consumerCount}"
@@ -26,8 +26,8 @@
 
 
   <feed>
-    <atom><c:url 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>
+    <atom><c:out value="queueBrowse/${row.name}?view=rss&amp;feedType=atom_1.0"/></atom>
+    <rss><c:out value="queueBrowse/${row.name}?view=rss&amp;feedType=rss_2.0"/></rss>
   </feed>
 </queue>
 </c:forEach>

http://git-wip-us.apache.org/repos/asf/activemq/blob/e24e285c/activemq-web-console/src/main/webapp/xml/subscribers.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/xml/subscribers.jsp b/activemq-web-console/src/main/webapp/xml/subscribers.jsp
index dc2fe80..cc79795 100644
--- a/activemq-web-console/src/main/webapp/xml/subscribers.jsp
+++ b/activemq-web-console/src/main/webapp/xml/subscribers.jsp
@@ -17,33 +17,33 @@
 --%>
 <subscribers>
 <c:forEach items="${requestContext.brokerQuery.durableTopicSubscribers}" var="row">
-<subscriber clientId="${row.clientId}" 
-            subscriptionName="${row.subscriptionName}" 
-            connectionId="${row.connectionId}"
-            destinationName="${row.destinationName}" 
+<subscriber clientId="<c:out value="${row.clientId}"/>" 
+            subscriptionName="<c:out value="${row.subscriptionName}"/>" 
+            connectionId="<c:out value="${row.connectionId}"/>"
+            destinationName="<c:out value="${row.destinationName}"/>" 
             selector="<c:out value="${row.selector}"/>" 
             active="yes" >
-  <stats pendingQueueSize="${row.pendingQueueSize}"
-         dispatchedQueueSize="${row.dispatchedQueueSize}"
-         dispatchedCounter="${row.dispatchedCounter}"
-         enqueueCounter="${row.enqueueCounter}"
-         dequeueCounter="${row.dequeueCounter}"/>
+  <stats pendingQueueSize="<c:out value="${row.pendingQueueSize}"/>"
+         dispatchedQueueSize="<c:out value="${row.dispatchedQueueSize}"/>"
+         dispatchedCounter="<c:out value="${row.dispatchedCounter}"/>"
+         enqueueCounter="<c:out value="${row.enqueueCounter}"/>"
+         dequeueCounter="<c:out value="${row.dequeueCounter}"/>" />
 
 </subscriber>
 </c:forEach>
 
 <c:forEach items="${requestContext.brokerQuery.inactiveDurableTopicSubscribers}" var="row">
-<subscriber clientId="${row.clientId}" 
-            subscriptionName="${row.subscriptionName}" 
-            connectionId="${row.connectionId}"
-            destinationName="${row.destinationName}" 
+<subscriber clientId="<c:out value="${row.clientId}"/>" 
+            subscriptionName="<c:out value="${row.subscriptionName}"/>" 
+            connectionId="<c:out value="${row.connectionId}"/>"
+            destinationName="<c:out value="${row.destinationName}"/>" 
             selector="<c:out value="${row.selector}"/>" 
             active="no" >
-  <stats pendingQueueSize="${row.pendingQueueSize}"
-         dispatchedQueueSize="${row.dispatchedQueueSize}"
-         dispatchedCounter="${row.dispatchedCounter}"
-         enqueueCounter="${row.enqueueCounter}"
-         dequeueCounter="${row.dequeueCounter}"/>
+  <stats pendingQueueSize="<c:out value="${row.pendingQueueSize}"/>"
+         dispatchedQueueSize="<c:out value="${row.dispatchedQueueSize}"/>"
+         dispatchedCounter="<c:out value="${row.dispatchedCounter}"/>"
+         enqueueCounter="<c:out value="${row.enqueueCounter}"/>"
+         dequeueCounter="<c:out value="${row.dequeueCounter}"/>"/>
 
 </subscriber>
 </c:forEach>

http://git-wip-us.apache.org/repos/asf/activemq/blob/e24e285c/activemq-web-console/src/main/webapp/xml/topics.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/xml/topics.jsp b/activemq-web-console/src/main/webapp/xml/topics.jsp
index bb31a89..b3efc15 100644
--- a/activemq-web-console/src/main/webapp/xml/topics.jsp
+++ b/activemq-web-console/src/main/webapp/xml/topics.jsp
@@ -17,7 +17,7 @@
 --%>
 <topics>
 <c:forEach items="${requestContext.brokerQuery.topics}" var="row">
-<topic name="${row.name}">
+<topic name="<c:out value="${row.name}"/> ">
 
   <stats size="${row.queueSize}"
          consumerCount="${row.consumerCount}"


Mime
View raw message