You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2013/06/09 21:39:59 UTC
svn commit: r1491272 - in /activemq/trunk: assembly/pom.xml
assembly/src/main/descriptors/common-bin.xml
assembly/src/release/conf/jetty.xml pom.xml
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>