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

fix for: https://issues.apache.org/jira/browse/AMQ-3215 

Allow for longer names of destination while still imposing limit before a truncation occurs.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1417993 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2012-12-06 16:40:39 +00:00
parent 763f32a842
commit b489fc6f75
2 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@
text = org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(text); text = org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(text);
if (length == null) if (length == null)
length = 20; length = 20;
if (text.length() <= 20) { if (text.length() <= length) {
out.print(text); out.print(text);
} else { } else {
out.println(text.substring(0, 10) + "..." + text.substring(text.length() - 5)); out.println(text.substring(0, 10) + "..." + text.substring(text.length() - 5));

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

@ -34,90 +34,90 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
<c:otherwise> <c:otherwise>
<table class="layout"> <table class="layout">
<tr> <tr>
<td class="layout" valign="top"> <td class="layout" valign="top">
<table id="header" class="sortable autostripe"> <table id="header" class="sortable autostripe">
<thead> <thead>
<tr> <tr>
<th colspan="2"> <th colspan="2">
Headers Headers
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td class="label" title="Unique Message ID for this message">Message ID</td> <td class="label" title="Unique Message ID for this message">Message ID</td>
<td><c:out value="${row.JMSMessageID}"/></td> <td><c:out value="${row.JMSMessageID}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label">Destination</td> <td class="label">Destination</td>
<td><form:tooltip text="${row.JMSDestination}" length="50"/></td> <td><form:tooltip text="${row.JMSDestination}" length="50"/></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>
<td><c:out value="${row.JMSCorrelationID}"/></td> <td><c:out value="${row.JMSCorrelationID}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label" title="Message Group Identifier">Group</td> <td class="label" title="Message Group Identifier">Group</td>
<td><c:out value="${row.groupID}"/></td> <td><c:out value="${row.groupID}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label" title="Message Group Sequence Number">Sequence</td> <td class="label" title="Message Group Sequence Number">Sequence</td>
<td><c:out value="${row.groupSequence}"/></td> <td><c:out value="${row.groupSequence}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label">Expiration</td> <td class="label">Expiration</td>
<td><c:out value="${row.JMSExpiration}"/></td> <td><c:out value="${row.JMSExpiration}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label">Persistence</td> <td class="label">Persistence</td>
<td><jms:persistent message="${row}"/></td> <td><jms:persistent message="${row}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label">Priority</td> <td class="label">Priority</td>
<td><c:out value="${row.JMSPriority}"/></td> <td><c:out value="${row.JMSPriority}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label">Redelivered</td> <td class="label">Redelivered</td>
<td><c:out value="${row.JMSRedelivered}"/></td> <td><c:out value="${row.JMSRedelivered}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label">Reply To</td> <td class="label">Reply To</td>
<td><c:out value="${row.JMSReplyTo}"/></td> <td><c:out value="${row.JMSReplyTo}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label">Timestamp</td> <td class="label">Timestamp</td>
<td><jms:formatTimestamp timestamp="${row.JMSTimestamp}"/></td> <td><jms:formatTimestamp timestamp="${row.JMSTimestamp}"/></td>
</tr> </tr>
<tr> <tr>
<td class="label">Type</td> <td class="label">Type</td>
<td><c:out value="${row.JMSType}"/></td> <td><c:out value="${row.JMSType}"/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</td> </td>
<td class="layout" valign="top"> <td class="layout" valign="top">
<table id="properties" class="sortable autostripe"> <table id="properties" class="sortable autostripe">
<thead> <thead>
<tr> <tr>
<th colspan="2"> <th colspan="2">
Properties Properties
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<form:forEachMapEntry items="${requestContext.messageQuery.propertiesMap}" var="prop"> <form:forEachMapEntry items="${requestContext.messageQuery.propertiesMap}" var="prop">
<tr> <tr>
<td class="label"><c:out value="${prop.key}"/></td> <td class="label"><c:out value="${prop.key}"/></td>
<td><c:out value="${prop.value}"/></td> <td><c:out value="${prop.value}"/></td>
</tr> </tr>
<tr> <tr>
</form:forEachMapEntry> </form:forEachMapEntry>
</tbody> </tbody>
</table> </table>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="layout" colspan="2"> <td class="layout" colspan="2">
<table id="body" width="100%"> <table id="body" width="100%">
@ -139,7 +139,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
<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="<c:out value="${queues.name}" />"><form:short text="${queues.name}"/></option> <option value="<c:out value="${queues.name}" />"><form:short text="${queues.name}" length="80"/></option>
</c:if> </c:if>
</c:forEach> </c:forEach>
</select> </select>
@ -153,24 +153,24 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</table> </table>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="layout" colspan="2"> <td class="layout" colspan="2">
<table id="body" width="100%"> <table id="body" width="100%">
<thead> <thead>
<tr> <tr>
<th> <th>
Message Details Message Details
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td><div class="message"><pre class="prettyprint"><c:out value="${requestContext.messageQuery.body}"/></pre></div></td> <td><div class="message"><pre class="prettyprint"><c:out value="${requestContext.messageQuery.body}"/></pre></div></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
</c:otherwise> </c:otherwise>