activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1417993 - in /activemq/trunk/activemq-web-console/src/main/webapp: WEB-INF/tags/form/short.tag message.jsp
Date Thu, 06 Dec 2012 16:40:41 GMT
Author: tabish
Date: Thu Dec  6 16:40:39 2012
New Revision: 1417993

URL: http://svn.apache.org/viewvc?rev=1417993&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-3215

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

Modified:
    activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag
    activemq/trunk/activemq-web-console/src/main/webapp/message.jsp

Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag?rev=1417993&r1=1417992&r2=1417993&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag Thu Dec
 6 16:40:39 2012
@@ -21,7 +21,7 @@
  text = org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(text);
  if (length == null)
     length = 20;
- if (text.length() <= 20) {
+ if (text.length() <= length) {
      out.print(text);
  } else {
      out.println(text.substring(0, 10) + "..." + text.substring(text.length() - 5));

Modified: activemq/trunk/activemq-web-console/src/main/webapp/message.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/message.jsp?rev=1417993&r1=1417992&r2=1417993&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/message.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/message.jsp Thu Dec  6 16:40:39 2012
@@ -5,9 +5,9 @@
     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.
@@ -34,90 +34,90 @@ No message could be found for ID <c:out 
 <c:otherwise>
 
 <table class="layout">
-	<tr>
-		<td class="layout"  valign="top">
-			<table id="header" class="sortable autostripe">
-				<thead>
-					<tr>
-						<th colspan="2">
-						    Headers
-						</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td class="label" title="Unique Message ID for this message">Message ID</td>
-						<td><c:out value="${row.JMSMessageID}"/></td>
-					</tr>
-					<tr>
-						<td class="label">Destination</td>
-						<td><form:tooltip text="${row.JMSDestination}" length="50"/></td>
-					</tr>
-					<tr>
-						<td class="label" title="The ID used to correlate messages together in a conversation">Correlation
ID</td>
-						<td><c:out value="${row.JMSCorrelationID}"/></td>
-					</tr>
-					<tr>
-						<td class="label" title="Message Group Identifier">Group</td>
-						<td><c:out value="${row.groupID}"/></td>
-					</tr>
-					<tr>
-						<td class="label" title="Message Group Sequence Number">Sequence</td>
-						<td><c:out value="${row.groupSequence}"/></td>
-					</tr>
-					<tr>
-						<td class="label">Expiration</td>
-						<td><c:out value="${row.JMSExpiration}"/></td>
-					</tr>
-					<tr>
-						<td class="label">Persistence</td>
-						<td><jms:persistent message="${row}"/></td>
-					</tr>
-					<tr>
-						<td class="label">Priority</td>
-						<td><c:out value="${row.JMSPriority}"/></td>
-					</tr>
-					<tr>
-						<td class="label">Redelivered</td>
-					    <td><c:out value="${row.JMSRedelivered}"/></td>
-					</tr>
-					<tr>
-						<td class="label">Reply To</td>
-						<td><c:out value="${row.JMSReplyTo}"/></td>
-					</tr>
-					<tr>
-						<td class="label">Timestamp</td>
-						<td><jms:formatTimestamp timestamp="${row.JMSTimestamp}"/></td>
-					</tr>
-					<tr>
-						<td class="label">Type</td>
-						<td><c:out value="${row.JMSType}"/></td>
-					</tr>
-				</tbody>
-			</table>
+    <tr>
+        <td class="layout"  valign="top">
+            <table id="header" class="sortable autostripe">
+                <thead>
+                    <tr>
+                        <th colspan="2">
+                            Headers
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td class="label" title="Unique Message ID for this message">Message
ID</td>
+                        <td><c:out value="${row.JMSMessageID}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label">Destination</td>
+                        <td><form:tooltip text="${row.JMSDestination}" length="50"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label" title="The ID used to correlate messages together
in a conversation">Correlation ID</td>
+                        <td><c:out value="${row.JMSCorrelationID}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label" title="Message Group Identifier">Group</td>
+                        <td><c:out value="${row.groupID}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label" title="Message Group Sequence Number">Sequence</td>
+                        <td><c:out value="${row.groupSequence}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label">Expiration</td>
+                        <td><c:out value="${row.JMSExpiration}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label">Persistence</td>
+                        <td><jms:persistent message="${row}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label">Priority</td>
+                        <td><c:out value="${row.JMSPriority}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label">Redelivered</td>
+                        <td><c:out value="${row.JMSRedelivered}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label">Reply To</td>
+                        <td><c:out value="${row.JMSReplyTo}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label">Timestamp</td>
+                        <td><jms:formatTimestamp timestamp="${row.JMSTimestamp}"/></td>
+                    </tr>
+                    <tr>
+                        <td class="label">Type</td>
+                        <td><c:out value="${row.JMSType}"/></td>
+                    </tr>
+                </tbody>
+            </table>
         </td>
 
         <td  class="layout" valign="top">
-			<table id="properties" class="sortable autostripe">
-				<thead>
-					<tr>
-						<th colspan="2">
-						    Properties
-						</th>
-					</tr>
-				</thead>
-				<tbody>
+            <table id="properties" class="sortable autostripe">
+                <thead>
+                    <tr>
+                        <th colspan="2">
+                            Properties
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
                    <form:forEachMapEntry items="${requestContext.messageQuery.propertiesMap}"
var="prop">
-						<tr>
-							<td class="label"><c:out value="${prop.key}"/></td>
-							<td><c:out value="${prop.value}"/></td>
-						</tr>
-						<tr>
-					</form:forEachMapEntry>
-				</tbody>
-			</table>
-		</td>
-	</tr>
+                        <tr>
+                            <td class="label"><c:out value="${prop.key}"/></td>
+                            <td><c:out value="${prop.value}"/></td>
+                        </tr>
+                        <tr>
+                    </form:forEachMapEntry>
+                </tbody>
+            </table>
+        </td>
+    </tr>
     <tr>
         <td class="layout" colspan="2">
             <table id="body" width="100%">
@@ -139,12 +139,12 @@ No message could be found for ID <c:out 
                                 <option value=""> -- Please select --</option>
                                 <c:forEach items="${requestContext.brokerQuery.queues}"
var="queues">
                                     <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:forEach>
                             </select>
                         </td>
-                        
+
                     </tr>
                     <tr class="odd">
                         <td><a href="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=<c:out
value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out
value='${sessionScope["secret"]}'/>')">Move</a></td>
@@ -152,25 +152,25 @@ No message could be found for ID <c:out 
                 </tbody>
             </table>
         </td>
-    </tr>   	
-	<tr>
-		<td class="layout" colspan="2">
-			<table id="body" width="100%">
-				<thead>
-					<tr>
-						<th>
-						    Message Details
-						</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td><div class="message"><pre class="prettyprint"><c:out value="${requestContext.messageQuery.body}"/></pre></div></td>
-					</tr>
-				</tbody>
-			</table>
-		</td>
-	</tr>
+    </tr>
+    <tr>
+        <td class="layout" colspan="2">
+            <table id="body" width="100%">
+                <thead>
+                    <tr>
+                        <th>
+                            Message Details
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td><div class="message"><pre class="prettyprint"><c:out
value="${requestContext.messageQuery.body}"/></pre></div></td>
+                    </tr>
+                </tbody>
+            </table>
+        </td>
+    </tr>
 </table>
 
 </c:otherwise>
@@ -182,4 +182,4 @@ No message could be found for ID <c:out 
 
 </body>
 </html>
-	
+



Mime
View raw message