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

fix for AMQ-1969 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@702149 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2008-10-06 14:00:42 +00:00
parent 3332220a35
commit 44953e41ac
9 changed files with 89 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf
View File

@ -18,3 +18,4 @@
<%@ taglib prefix="form" tagdir="/WEB-INF/tags/form" %> <%@ taglib prefix="form" tagdir="/WEB-INF/tags/form" %>
<%@ taglib prefix="jms" tagdir="/WEB-INF/tags/jms" %> <%@ taglib prefix="jms" tagdir="/WEB-INF/tags/jms" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>

27
activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag Normal file
View File

@ -0,0 +1,27 @@
<%--
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" %>
<%@ attribute name="length" type="java.lang.Integer" required="false" %>
<%
if (length == null)
length = 20;
if (text.length() <= 20) {
out.print(text);
} else {
out.println(text.substring(0, 10) + "..." + text.substring(text.length() - 5));
}
%>

29
activemq-web-console/src/main/webapp/WEB-INF/tags/form/tooltip.tag Normal file
View File

@ -0,0 +1,29 @@
<%--
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" %>
<%@ attribute name="length" type="java.lang.Integer" required="false" %>
<%
text = text.replaceAll("<", "&lt;");
text = text.replaceAll(">", "&gt;");
if (length == null)
length = 23;
if (text.length() <= length) {
out.print(text);
} else {
out.println("<span class=\"tooltip\"> " + text.substring(0, length - 3) + "... <span>" + text + "</span></span>");
}
%>

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

@ -16,11 +16,11 @@
--%> --%>
<html> <html>
<head> <head>
<title>Browse ${requestContext.queueBrowser.JMSDestination}</title> <title>Browse <form:short text="${requestContext.queueBrowser.JMSDestination}"/></title>
</head> </head>
<body> <body>
<h2>Browse ${requestContext.queueBrowser.JMSDestination}</h2> <h2>Browse <form:tooltip text="${requestContext.queueBrowser.JMSDestination}"/></h2>
<table id="messages" class="sortable autostripe"> <table id="messages" class="sortable autostripe">
<thead> <thead>

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

@ -51,7 +51,7 @@ No message could be found for ID ${requestContext.messageQuery.JMSMessageID}
</tr> </tr>
<tr> <tr>
<td class="label">Destination</td> <td class="label">Destination</td>
<td>${row.JMSDestination}</td> <td><form:tooltip text="${row.JMSDestination}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label" title="The ID used to correlate messages together in a conversation">Correlation ID</td> <td class="label" title="The ID used to correlate messages together in a conversation">Correlation ID</td>
@ -87,7 +87,7 @@ No message could be found for ID ${requestContext.messageQuery.JMSMessageID}
</tr> </tr>
<tr> <tr>
<td class="label">Timestamp</td> <td class="label">Timestamp</td>
<td>${row.JMSTimestamp}</td> <td><jms:formatTimestamp timestamp="${row.JMSTimestamp}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label">Type</td> <td class="label">Type</td>
@ -130,7 +130,7 @@ No message could be found for ID ${requestContext.messageQuery.JMSMessageID}
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td><c:out value="${requestContext.messageQuery.body}" escapeXml="true" /></td> <td><form:tooltip text="${requestContext.messageQuery.body}" length="78"/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -157,7 +157,7 @@ No message could be found for ID ${requestContext.messageQuery.JMSMessageID}
<option value=""> -- Please select --</option> <option value=""> -- Please select --</option>
<c:forEach items="${requestContext.brokerQuery.queues}" var="queues"> <c:forEach items="${requestContext.brokerQuery.queues}" var="queues">
<c:if test="${queues.name != requestContext.messageQuery.JMSDestination}"> <c:if test="${queues.name != requestContext.messageQuery.JMSDestination}">
<option value="${queues.name}">${queues.name}</option> <option value="${queues.name}"><form:short text="${queues.name}"/></option>
</c:if> </c:if>
</c:forEach> </c:forEach>
</select> </select>

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

@ -49,7 +49,7 @@
<tbody> <tbody>
<c:forEach items="${requestContext.brokerQuery.queues}" var="row"> <c:forEach items="${requestContext.brokerQuery.queues}" var="row">
<tr> <tr>
<td><a href="browse.jsp?JMSDestination=${row.name}">${row.name}</a></td> <td><a href="browse.jsp?JMSDestination=${row.name}"><form:tooltip text="${row.name}" length="8"/></a></td>
<td>${row.queueSize}</td> <td>${row.queueSize}</td>
<td>${row.consumerCount}</td> <td>${row.consumerCount}</td>
<td>${row.enqueueCount}</td> <td>${row.enqueueCount}</td>

23
activemq-web-console/src/main/webapp/styles/type-settings.css
View File

@ -21,7 +21,7 @@ body, p, ul, ol {
font-style: normal; font-style: normal;
font-font-variant: normal; font-font-variant: normal;
font-weight: normal; font-weight: normal;
line-height: 140% line-height: 140%;
color: #000000; color: #000000;
} }
@ -36,7 +36,7 @@ td, table, tr {
font-style: normal; font-style: normal;
font-font-variant: normal; font-font-variant: normal;
font-weight: normal; font-weight: normal;
line-height: normal% line-height: normal;
color: #000000; color: #000000;
} }
@ -75,7 +75,7 @@ pre {
} }
hr { hr {
color: 3c78b5; color: #3c78b5;
height: 1; height: 1;
} }
@ -152,3 +152,20 @@ blockquote {
border-left: 1px solid #3c78b5; border-left: 1px solid #3c78b5;
} }
.tooltip { position: relative;
text-decoration: none;
}
.tooltip span {
display: none;
}
.tooltip:hover span {
position: absolute;
top: 10px;
left: 25px;
display: block;
background: #ccc;
color: #880055;
border: 1px solid #880055;
}

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

@ -91,10 +91,10 @@
<tbody> <tbody>
<c:forEach items="${requestContext.brokerQuery.durableTopicSubscribers}" var="row"> <c:forEach items="${requestContext.brokerQuery.durableTopicSubscribers}" var="row">
<tr> <tr>
<td>${row.clientId}</td> <td><form:tooltip text="${row.clientId}" length="10"/></td>
<td>${row.subscriptionName}</td> <td><form:tooltip text="${row.subscriptionName}" length="10"/></td>
<td>${row.connectionId}</td> <td><form:tooltip text="${row.connectionId}" length="10"/></td>
<td>${row.destinationName}</td> <td><form:tooltip text="${row.destinationName}" length="10"/></td>
<td>${row.selector}</td> <td>${row.selector}</td>
<td>${row.pendingQueueSize}</td> <td>${row.pendingQueueSize}</td>
<td>${row.dispatchedQueueSize}</td> <td>${row.dispatchedQueueSize}</td>

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

@ -46,7 +46,7 @@
<tbody> <tbody>
<c:forEach items="${requestContext.brokerQuery.topics}" var="row"> <c:forEach items="${requestContext.brokerQuery.topics}" var="row">
<tr> <tr>
<td><a href="send.jsp?JMSDestination=${row.name}&JMSDestinationType=topic">${row.name}</a></td> <td><a href="send.jsp?JMSDestination=${row.name}&JMSDestinationType=topic"><form:tooltip text="${row.name}" length="50"/></a></td>
<td>${row.consumerCount}</td> <td>${row.consumerCount}</td>
<td>${row.enqueueCount}</td> <td>${row.enqueueCount}</td>
<td>${row.dequeueCount}</td> <td>${row.dequeueCount}</td>