ACTIVEMQ6-15 - expose Jolokia in web server

https://issues.apache.org/jira/browse/ACTIVEMQ6-15

The Jolokia War Agent is now bootstrapped with the server so mBeans are accessible via Rest API's

distribution/activemq/pom.xml

@@ -179,6 +179,11 @@
           <groupId>org.apache.geronimo.specs</groupId>
           <artifactId>geronimo-servlet_3.0_spec</artifactId>
        </dependency>
+       <dependency>
+          <groupId>org.jolokia</groupId>
+          <artifactId>jolokia-war</artifactId>
+          <type>war</type>
+       </dependency>
        <!-- javadoc -->
        <dependency>
            <groupId>org.apache.activemq</groupId>

distribution/activemq/src/main/assembly/dep.xml

@@ -84,6 +84,13 @@
            <outputDirectory>web/api</outputDirectory>
            <unpack>true</unpack>
        </dependencySet>
+       <dependencySet>
+           <includes>
+               <include>org.jolokia:jolokia-war:war</include>
+           </includes>
+           <outputDirectory>web</outputDirectory>
+           <unpack>false</unpack>
+       </dependencySet>
    </dependencySets>
    <fileSets>
      <!-- schema -->

distribution/activemq/src/main/resources/config/clustered/bootstrap.xml

@@ -26,7 +26,9 @@
 
    <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
 
-   <web bind="http://localhost:8161" path="web"/>
+   <web bind="http://localhost:8161" path="web">
+       <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+   </web>
 
 </broker>
 

distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml

@@ -26,7 +26,9 @@
 
    <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
 
-   <web bind="http://localhost:8161" path="web"/>
+   <web bind="http://localhost:8161" path="web">
+       <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+   </web>
 
 </broker>
 

distribution/activemq/src/main/resources/config/replicated/bootstrap.xml

@@ -26,7 +26,9 @@
 
    <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
 
-   <web bind="http://localhost:8161" path="web"/>
+   <web bind="http://localhost:8161" path="web">
+       <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+   </web>
 
 </broker>
 

distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml

@@ -26,7 +26,9 @@
 
    <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
 
-   <web bind="http://localhost:8161" path="web"/>
+   <web bind="http://localhost:8161" path="web">
+       <app url="jolokia" war="jolokia-war-1.2.3.war"/>
+   </web>
 
 </broker>
 

pom.xml

@@ -368,7 +368,13 @@
            <groupId>org.apache.geronimo.specs</groupId>
            <artifactId>geronimo-servlet_3.0_spec</artifactId>
            <version>1.0</version>
-      </dependency>
+        </dependency>
+        <dependency>
+           <groupId>org.jolokia</groupId>
+           <artifactId>jolokia-war</artifactId>
+           <type>war</type>
+           <version>1.2.3</version>
+        </dependency>
          <!-- needed to compile the tests -->
          <dependency>
             <groupId>junit</groupId>