Return-Path: 
 <commits-return-22716-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 4C75810FBD
	for <apmail-activemq-commits-archive@www.apache.org>;
 Sun,  9 Jun 2013 19:40:21 +0000 (UTC)
Received: (qmail 3059 invoked by uid 500); 9 Jun 2013 19:40:21 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 3008 invoked by uid 500); 9 Jun 2013 19:40:20 -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 2925 invoked by uid 99); 9 Jun 2013 19:40:20 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jun 2013 19:40:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jun 2013 19:40:19 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 102C52388900;
	Sun,  9 Jun 2013 19:40:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1491272 - in /activemq/trunk: assembly/pom.xml
 assembly/src/main/descriptors/common-bin.xml
 assembly/src/release/conf/jetty.xml pom.xml
Date: Sun, 09 Jun 2013 19:39:59 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130609194000.102C52388900@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chirino
Date: Sun Jun  9 19:39:59 2013
New Revision: 1491272

URL: http://svn.apache.org/r1491272
Log:
Repackage the hawtio webconsole in the standalone distro.

Modified:
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/common-bin.xml
    activemq/trunk/assembly/src/release/conf/jetty.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1491272&r1=1491271&r2=1491272&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Sun Jun  9 19:39:59 2013
@@ -365,6 +365,12 @@
       <artifactId>json-simple</artifactId>
       <version>1.1</version>
     </dependency>
+    <dependency>
+      <groupId>io.hawt</groupId>
+      <artifactId>hawtio-web</artifactId>
+      <version>${hawtio-version}</version>
+      <type>war</type>
+    </dependency>
   </dependencies>
 
   <build>

Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1491272&r1=1491271&r2=1491272&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Sun Jun  9 19:39:59 2013
@@ -95,6 +95,21 @@
   </fileSets>
 
   <dependencySets>
+    <dependencySet>
+      <outputDirectory>/webapps/hawtio</outputDirectory>
+      <unpack>true</unpack>
+      <unpackOptions>
+        <excludes>
+          <exclude>WEB-INF/lib/slf4j-api-1.6.1.jar</exclude>
+          <exclude>WEB-INF/lib/log4j-1.2.16.jar</exclude>
+          <exclude>WEB-INF/lib/commons-codec-1.2.jar</exclude>
+        </excludes>
+      </unpackOptions>      
+      <scope>runtime</scope>
+      <includes>
+        <include>io.hawt:hawtio-web:war</include>
+      </includes>
+    </dependencySet>
 
     <!-- Copy over jar files -->
     <dependencySet>

Modified: activemq/trunk/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=1491272&r1=1491271&r2=1491272&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Sun Jun  9 19:39:59 2013
@@ -49,6 +49,11 @@
                 <property name="handlers">
                     <list>
                         <bean class="org.eclipse.jetty.webapp.WebAppContext">
+                            <property name="contextPath" value="/hawtio" />
+                            <property name="war" value="${activemq.home}/webapps/hawtio" />
+                            <property name="logUrlOnStart" value="true" />
+                        </bean>
+                        <bean class="org.eclipse.jetty.webapp.WebAppContext">
                             <property name="contextPath" value="/admin" />
                             <property name="resourceBase" value="${activemq.home}/webapps/admin" />
                             <property name="logUrlOnStart" value="true" />

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1491272&r1=1491271&r2=1491272&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Sun Jun  9 19:39:59 2013
@@ -60,6 +60,7 @@
     <commons-primitives-version>1.0</commons-primitives-version>
     <commons-net-version>3.2</commons-net-version>
     <directory-version>2.0.0-M6</directory-version>
+    <hawtio-version>1.2-M1</hawtio-version>
 
     <ftpserver-version>1.0.6</ftpserver-version>
     <geronimo-version>1.0</geronimo-version>