activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1199259 - in /activemq/trunk/activemq-web-console/src/main/webapp: WEB-INF/tags/form/escape.tag queues.jsp subscribers.jsp topics.jsp
Date Tue, 08 Nov 2011 14:29:35 GMT
Author: dejanb
Date: Tue Nov  8 14:29:34 2011
New Revision: 1199259

URL: http://svn.apache.org/viewvc?rev=1199259&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3581 - web console escape url

Added:
    activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/escape.tag
Modified:
    activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp
    activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp
    activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp

Added: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/escape.tag
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/escape.tag?rev=1199259&view=auto
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/escape.tag (added)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/escape.tag Tue Nov
 8 14:29:34 2011
@@ -0,0 +1,20 @@
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+--%>
+<%@ attribute name="text" type="java.lang.String" required="true"  %>
+<%
+    out.println(java.net.URLEncoder.encode(text, "UTF-8"));
+%>
\ No newline at end of file

Modified: activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp?rev=1199259&r1=1199258&r2=1199259&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/queues.jsp Tue Nov  8 14:29:34 2011
@@ -51,21 +51,32 @@
 <c:forEach items="${requestContext.brokerQuery.queues}" var="row">
 
 <tr>
-<td><a href="browse.jsp?JMSDestination=<c:out value="${row.name}" />"><form:tooltip
text="${row.name}" length="50"/></a></td>
+<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>
-    <a href="browse.jsp?JMSDestination=<c:out value="${row.name}" />">Browse</a>
-	<a href="queueConsumers.jsp?JMSDestination=<c:out value="${row.name}" />">Active
Consumers</a><br/>
-    <a href="queueBrowse/<c:out value="${row.name}" />?view=rss&feedType=atom_1.0"
title="Atom 1.0"><img src="images/feed_atom.png"/></a>
-    <a href="queueBrowse/<c:out value="${row.name}" />?view=rss&feedType=rss_2.0"
title="RSS 2.0"><img src="images/feed_rss.png"/></a>
+    <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>
 </td>
 <td>
-    <a href="send.jsp?JMSDestination=<c:out value="${row.name}" />&JMSDestinationType=queue">Send
To</a>
-    <a href="purgeDestination.action?JMSDestination=<c:out value="${row.name}" />&JMSDestinationType=queue&secret=<c:out
value='${sessionScope["secret"]}'/>">Purge</a>
-    <a href="deleteDestination.action?JMSDestination=<c:out value="${row.name}" />&JMSDestinationType=queue&secret=<c:out
value='${sessionScope["secret"]}'/>">Delete</a>
+    <a href="<c:url value="send.jsp">
+                    <c:param name="JMSDestination" value="${row.name}" />
+                    <c:param name="JMSDestinationType" value="queue"/></c:url>">Send
To</a>
+    <a href="<c:url value="purgeDestination.action">
+                    <c:param name="JMSDestination" value="${row.name}" />
+                    <c:param name="JMSDestinationType" value="queue"   />
+                    <c:param name="secret" value='${sessionScope["secret"]}'/></c:url>">Purge</a>
+    <a href="<c:url value="deleteDestination.action">
+                    <c:param name="JMSDestination" value="${row.name}" />
+                    <c:param name="JMSDestinationType" value="queue"   />
+                    <c:param name="secret" value='${sessionScope["secret"]}'/></c:url>">Delete</a>
 </td>
 </tr>
 </c:forEach>

Modified: activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp?rev=1199259&r1=1199258&r2=1199259&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/subscribers.jsp Tue Nov  8 14:29:34
2011
@@ -103,7 +103,10 @@
 <td>${row.enqueueCounter}</td>
 <td>${row.dequeueCounter}</td>
 <td>
-    <a href="deleteSubscriber.action?clientId=${row.clientId}&subscriberName=${row.subscriptionName}&secret=<c:out
value='${sessionScope["secret"]}'/>">Delete</a>
+    <a href="<c:url value="deleteSubscriber.action">
+                    <c:param name="clientId" value="${row.clientId}"/>
+                    <c:param name="subscriberName" value="${row.subscriptionName}"/>
+                    <c:param name="secret" value='${sessionScope["secret"]}'/></c:url>">Delete</a>
 </td>
 </tr>
 </c:forEach>
@@ -144,7 +147,10 @@
 <td>${row.enqueueCounter}</td>
 <td>${row.dequeueCounter}</td>
 <td>
-    <a href="deleteSubscriber.action?clientId=${row.clientId}&subscriberName=${row.subscriptionName}&secret=<c:out
value='${sessionScope["secret"]}'/>">Delete</a>
+    <a href="<c:url value="deleteSubscriber.action">
+                    <c:param name="clientId" value="${row.clientId}"/>
+                    <c:param name="subscriberName" value="${row.subscriptionName}"/>
+                    <c:param name="secret" value='${sessionScope["secret"]}'/></c:url>">Delete</a>
 </td>
 </tr>
 </c:forEach>

Modified: activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp?rev=1199259&r1=1199258&r2=1199259&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/topics.jsp Tue Nov  8 14:29:34 2011
@@ -47,13 +47,20 @@
 <tbody>
 <c:forEach items="${requestContext.brokerQuery.topics}" var="row">
 <tr>
-<td><a href="send.jsp?JMSDestination=<c:out value="${row.name}" />&JMSDestinationType=topic"><form:tooltip
text="${row.name}" length="50"/></a></td>
+<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>
-    <a href="send.jsp?JMSDestination=<c:out value="${row.name}" />&JMSDestinationType=topic">Send
To</a>
-    <a href="deleteDestination.action?JMSDestination=<c:out value="${row.name}" />&JMSDestinationType=topic&secret=<c:out
value='${sessionScope["secret"]}'/>">Delete</a>
+    <a href="<c:url value="send.jsp">
+                        <c:param name="JMSDestination" value="${row.name}" />
+                        <c:param name="JMSDestinationType" value="topic"/></c:url>">Send
To</a>
+    <a href="<c:url value="deleteDestination.action">
+                   <c:param name="JMSDestination" value="${row.name}" />
+                   <c:param name="JMSDestinationType" value="topic"/>
+                   <c:param name="secret" value='${sessionScope["secret"]}'/></c:url>">Delete</a>
 </td>
 </tr>
 </c:forEach>



Mime
View raw message