You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2014/12/27 01:42:29 UTC
[1/2] activemq git commit: Minor cleanup to use a c:out to output the
data
Repository: activemq
Updated Branches:
refs/heads/activemq-5.10.x 52ba699fc -> f8b3de86d
Minor cleanup to use a c:out to output the data
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0fb1c736
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0fb1c736
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0fb1c736
Branch: refs/heads/activemq-5.10.x
Commit: 0fb1c736142eb792cceefc9e55d8b1d3ace24b02
Parents: 52ba699
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Aug 19 13:34:53 2014 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Fri Dec 26 19:00:13 2014 -0500
----------------------------------------------------------------------
activemq-web-console/src/main/webapp/decorators/head.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/0fb1c736/activemq-web-console/src/main/webapp/decorators/head.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/decorators/head.jsp b/activemq-web-console/src/main/webapp/decorators/head.jsp
index ca90943..abb76ea 100644
--- a/activemq-web-console/src/main/webapp/decorators/head.jsp
+++ b/activemq-web-console/src/main/webapp/decorators/head.jsp
@@ -17,7 +17,7 @@
limitations under the License.
--%>
- <title>${requestContext.brokerQuery.brokerAdmin.brokerName} : ${pageTitle}</title>
+ <title><c:out value="${requestContext.brokerQuery.brokerAdmin.brokerName} : ${pageTitle}" /></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<style type="text/css" media="screen">
[2/2] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-5033 - revert changes to the rss
and atom feed links, as c:url doesn't escape value
Posted by ha...@apache.org.
https://issues.apache.org/jira/browse/AMQ-5033 - revert changes to the rss and atom feed links, as c:url doesn't escape value
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f8b3de86
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f8b3de86
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f8b3de86
Branch: refs/heads/activemq-5.10.x
Commit: f8b3de86d8154db5680433e46734b2bd9ced852b
Parents: 0fb1c73
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Wed Dec 10 12:05:10 2014 +0100
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Fri Dec 26 19:02:03 2014 -0500
----------------------------------------------------------------------
activemq-web-console/src/main/webapp/queues.jsp | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/f8b3de86/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 86e5772..7c23c24 100644
--- a/activemq-web-console/src/main/webapp/queues.jsp
+++ b/activemq-web-console/src/main/webapp/queues.jsp
@@ -68,14 +68,8 @@
<c:param name="JMSDestination" value="${row.name}" /></c:url>">Active Consumers</a><br/>
<a href="<c:url value="queueProducers.jsp">
<c:param name="JMSDestination" value="${row.name}" /></c:url>">Active Producers</a><br/>
- <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>
+ <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="<c:url value="send.jsp">