Return-Path: 
 <commits-return-23421-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
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 8327510CDA
	for <apmail-activemq-commits-archive@www.apache.org>;
 Thu, 19 Sep 2013 12:55:55 +0000 (UTC)
Received: (qmail 33175 invoked by uid 500); 19 Sep 2013 12:55:55 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 33011 invoked by uid 500); 19 Sep 2013 12:55:53 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 32993 invoked by uid 99); 19 Sep 2013 12:55:50 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Sep 2013 12:55:50 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 8B439887771; Thu, 19 Sep 2013 12:55:50 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dejanb@apache.org
To: commits@activemq.apache.org
Message-Id: <2a36df9c66464032b2d0736719b73d3f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: https://issues.apache.org/jira/browse/AMQ-4594 - add log
 plugin to hawtio
Date: Thu, 19 Sep 2013 12:55:50 +0000 (UTC)

Updated Branches:
  refs/heads/trunk fba8e2556 -> f6f22df4f


https://issues.apache.org/jira/browse/AMQ-4594 - add log plugin to hawtio


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f6f22df4
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f6f22df4
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f6f22df4

Branch: refs/heads/trunk
Commit: f6f22df4f48ce06e61882d980ad64f56f24c5a4e
Parents: fba8e25
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Thu Sep 19 14:54:49 2013 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Thu Sep 19 14:55:17 2013 +0200

----------------------------------------------------------------------
 assembly/pom.xml                             | 15 +++++++++++++++
 assembly/src/main/descriptors/common-bin.xml |  4 ++++
 assembly/src/release/conf/activemq.xml       |  6 ++++++
 pom.xml                                      |  2 ++
 4 files changed, 27 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/f6f22df4/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index b899aa6..0e21666 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -408,6 +408,21 @@
       <version>${hawtio-version}</version>
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>org.fusesource.insight</groupId>
+      <artifactId>insight-log-core</artifactId>
+      <version>${insight-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.fusesource.insight</groupId>
+      <artifactId>insight-log4j</artifactId>
+      <version>${insight-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <version>${pax-url-version}</version>
+    </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/activemq/blob/f6f22df4/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 9efc53f..82ded4b 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -267,6 +267,10 @@
         <!-- REST API -->
         <include>org.jolokia:jolokia-core</include>
         <include>com.googlecode.json-simple:json-simple</include>
+        <!-- ADDITIONAL HAWTIO PLUGINS -->
+        <include>org.fusesource.insight:insight-log-core</include>
+        <include>org.fusesource.insight:insight-log4j</include>
+        <include>org.ops4j.pax.url:pax-url-aether</include>
       </includes>
     </dependencySet>
   </dependencySets>

http://git-wip-us.apache.org/repos/asf/activemq/blob/f6f22df4/assembly/src/release/conf/activemq.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index d6728f5..126c871 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -29,6 +29,12 @@
         </property>
     </bean>
 
+    <!-- Allows log searching in hawtio console -->
+    <bean id="logQuery" class="org.fusesource.insight.log.log4j.Log4jLogQuery"
+          lazy-init="false" scope="singleton"
+          init-method="start" destroy-method="stop">
+    </bean>
+
     <!--
         The <broker> element is used to configure the ActiveMQ broker.
     -->

http://git-wip-us.apache.org/repos/asf/activemq/blob/f6f22df4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d49a8c1..4fc67c3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
     <hsqldb-version>1.8.0.12</hsqldb-version>
     <httpclient-version>4.2.5</httpclient-version>
     <httpcore-version>4.2.4</httpcore-version>
+    <insight-version>7.2.0.redhat-024</insight-version>
     <jackson-version>1.9.12</jackson-version>
     <jasypt-version>1.9.0</jasypt-version>
     <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
@@ -130,6 +131,7 @@
     <paxexam-karaf-container-version>1.0.0</paxexam-karaf-container-version>
     <pax-runner-version>1.6.1</pax-runner-version>
     <pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version>
+    <pax-url-version>1.5.2</pax-url-version>
     <felix-configadmin-version>1.4.0</felix-configadmin-version>
 
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>