Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5BD2F109D4 for ; Fri, 31 Jan 2014 21:56:32 +0000 (UTC) Received: (qmail 11219 invoked by uid 500); 31 Jan 2014 21:56:31 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 11181 invoked by uid 500); 31 Jan 2014 21:56:31 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 11174 invoked by uid 99); 31 Jan 2014 21:56:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jan 2014 21:56:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E2FE28C05E3; Fri, 31 Jan 2014 21:56:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hadrian@apache.org To: commits@activemq.apache.org Message-Id: <048c5ef247cf4f7d842252a310c752b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMQ-4994. Fix OOME while browsing deep queues Date: Fri, 31 Jan 2014 21:56:30 +0000 (UTC) Updated Branches: refs/heads/trunk d4d985503 -> f4e768760 AMQ-4994. Fix OOME while browsing deep queues Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f4e76876 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f4e76876 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f4e76876 Branch: refs/heads/trunk Commit: f4e768760f2e66f155baf83f76cdb24af828a5fe Parents: d4d9855 Author: Hadrian Zbarcea Authored: Fri Jan 31 16:56:21 2014 -0500 Committer: Hadrian Zbarcea Committed: Fri Jan 31 16:56:21 2014 -0500 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/web.xml | 4 +- activemq-web-console/src/main/webapp/browse.jsp | 11 ++- .../src/main/webapp/connection.jsp | 8 ++- .../src/main/webapp/connections.jsp | 9 ++- .../src/main/webapp/decorators/footer.jsp | 73 ++++++++++++++++++++ .../src/main/webapp/decorators/head.jsp | 36 ++++++++++ .../src/main/webapp/decorators/header.jsp | 73 ++++++++++++++++++++ activemq-web-console/src/main/webapp/graph.jsp | 8 ++- activemq-web-console/src/main/webapp/index.jsp | 7 +- .../src/main/webapp/message.jsp | 6 +- .../src/main/webapp/network.jsp | 8 ++- .../src/main/webapp/queueConsumers.jsp | 9 ++- .../src/main/webapp/queueGraph.jsp | 8 ++- activemq-web-console/src/main/webapp/queues.jsp | 7 +- .../src/main/webapp/scheduled.jsp | 8 ++- activemq-web-console/src/main/webapp/send.jsp | 8 ++- .../src/main/webapp/subscribers.jsp | 7 +- activemq-web-console/src/main/webapp/topics.jsp | 7 +- 18 files changed, 279 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/WEB-INF/web.xml b/activemq-web-console/src/main/webapp/WEB-INF/web.xml index 662e67b..9996c61 100755 --- a/activemq-web-console/src/main/webapp/WEB-INF/web.xml +++ b/activemq-web-console/src/main/webapp/WEB-INF/web.xml @@ -30,7 +30,7 @@ - + http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/browse.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/browse.jsp b/activemq-web-console/src/main/webapp/browse.jsp index 069db2a..628b3b9 100644 --- a/activemq-web-console/src/main/webapp/browse.jsp +++ b/activemq-web-console/src/main/webapp/browse.jsp @@ -16,10 +16,16 @@ --%> -Browse <form:short text="${requestContext.queueBrowser.JMSDestination}"/> + + +<%@include file="decorators/head.jsp" %> +<%@include file="decorators/header.jsp" %> + + +

Browse

@@ -59,6 +65,9 @@ + +<%@include file="decorators/footer.jsp" %> + http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/connection.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/connection.jsp b/activemq-web-console/src/main/webapp/connection.jsp index c5b66f3..a2f600f 100644 --- a/activemq-web-console/src/main/webapp/connection.jsp +++ b/activemq-web-console/src/main/webapp/connection.jsp @@ -17,10 +17,15 @@ -Connection <c:out value="${requestContext.connectionQuery.connectionID}" /> + + +<%@include file="decorators/head.jsp" %> +<%@include file="decorators/header.jsp" %> + + @@ -135,6 +140,7 @@ No connection could be found for ID http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/connections.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/connections.jsp b/activemq-web-console/src/main/webapp/connections.jsp index 5f0a360..928fdac 100644 --- a/activemq-web-console/src/main/webapp/connections.jsp +++ b/activemq-web-console/src/main/webapp/connections.jsp @@ -16,10 +16,16 @@ --%> -Connections + + +<%@include file="decorators/head.jsp" %> +<%@include file="decorators/header.jsp" %> + + +

Connections

@@ -79,6 +85,7 @@
+<%@include file="decorators/footer.jsp" %> http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/decorators/footer.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/decorators/footer.jsp b/activemq-web-console/src/main/webapp/decorators/footer.jsp new file mode 100644 index 0000000..b5a5181 --- /dev/null +++ b/activemq-web-console/src/main/webapp/decorators/footer.jsp @@ -0,0 +1,73 @@ + + + + + +
+
+
+

Queue Views

+ + +

Topic Views

+ +
    + + + +
  • XML
    • +
+

Subscribers Views

+ +
    + + + +
  • XML
    • +
+

Useful Links

+ + +
+
+
+ + + + + + +
+ + + + +
+
+
+
+
+ Copyright 2005-2014 The Apache Software Foundation. + + +
+
+
+
+
+ + http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/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 new file mode 100644 index 0000000..ca90943 --- /dev/null +++ b/activemq-web-console/src/main/webapp/decorators/head.jsp @@ -0,0 +1,36 @@ + +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%-- + 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. +--%> + + ${requestContext.brokerQuery.brokerAdmin.brokerName} : ${pageTitle} + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/decorators/header.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/decorators/header.jsp b/activemq-web-console/src/main/webapp/decorators/header.jsp new file mode 100644 index 0000000..5b10793 --- /dev/null +++ b/activemq-web-console/src/main/webapp/decorators/header.jsp @@ -0,0 +1,73 @@ + +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%-- + 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. +--%> + +
+
+
+
+
+
+
+
+
+
+ +
+ + + + + +
+ + +
+ + + + +
+
http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/graph.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/graph.jsp b/activemq-web-console/src/main/webapp/graph.jsp index 8736b9c..756d1fb 100644 --- a/activemq-web-console/src/main/webapp/graph.jsp +++ b/activemq-web-console/src/main/webapp/graph.jsp @@ -16,10 +16,15 @@ --%> -Browse ${requestContext.queueBrowser.JMSDestination} + + +<%@include file="decorators/head.jsp" %> +<%@include file="decorators/header.jsp" %> + +

Browse ${requestContext.queueBrowser.JMSDestination}

@@ -61,6 +66,7 @@
+<%@include file="decorators/footer.jsp" %> http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/index.jsp b/activemq-web-console/src/main/webapp/index.jsp index 1a858b5..bbb6fc2 100644 --- a/activemq-web-console/src/main/webapp/index.jsp +++ b/activemq-web-console/src/main/webapp/index.jsp @@ -16,10 +16,14 @@ --%> -ActiveMQ Console + + +<%@include file="decorators/head.jsp" %> +<%@include file="decorators/header.jsp" %> +

Welcome!

@@ -63,6 +67,7 @@ You can find more information about Apache ActiveMQ on the http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/message.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/message.jsp b/activemq-web-console/src/main/webapp/message.jsp index 500674a..be4e14f 100644 --- a/activemq-web-console/src/main/webapp/message.jsp +++ b/activemq-web-console/src/main/webapp/message.jsp @@ -17,10 +17,13 @@ -Message <c:out value="${requestContext.messageQuery.id}"/> + + +<%@include file="decorators/head.jsp" %> +<%@include file="decorators/header.jsp" %> @@ -178,6 +181,7 @@ No message could be found for ID http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/network.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/network.jsp b/activemq-web-console/src/main/webapp/network.jsp index 408cf36..9b9d503 100644 --- a/activemq-web-console/src/main/webapp/network.jsp +++ b/activemq-web-console/src/main/webapp/network.jsp @@ -15,11 +15,14 @@ limitations under the License. --%> - -Network Bridges + + +<%@include file="decorators/head.jsp" %> +<%@include file="decorators/header.jsp" %> +

+<%@include file="decorators/footer.jsp" %> http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/queueConsumers.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/queueConsumers.jsp b/activemq-web-console/src/main/webapp/queueConsumers.jsp index 1aa08f6..47e3d91 100644 --- a/activemq-web-console/src/main/webapp/queueConsumers.jsp +++ b/activemq-web-console/src/main/webapp/queueConsumers.jsp @@ -16,10 +16,16 @@ --%> -Consumers for <c:out value="${requestContext.queueConsumerQuery.JMSDestination}" /> + + +<%@include file="decorators/head.jsp" %> +<%@include file="decorators/header.jsp" %> + + +

Active Consumers for

@@ -80,6 +86,7 @@
+<%@include file="decorators/footer.jsp" %> http://git-wip-us.apache.org/repos/asf/activemq/blob/f4e76876/activemq-web-console/src/main/webapp/queueGraph.jsp ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/queueGraph.jsp b/activemq-web-console/src/main/webapp/queueGraph.jsp index 3e26c1d..2b92062 100644 --- a/activemq-web-console/src/main/webapp/queueGraph.jsp +++ b/activemq-web-console/src/main/webapp/queueGraph.jsp @@ -16,9 +16,10 @@ --%> -Queues + + - +<%@include file="decorators/head.jsp" %> @@ -28,6 +29,8 @@ +<%@include file="decorators/header.jsp" %> +