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 Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/79a970bc Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/79a970bc Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/79a970bc Branch: refs/heads/master Commit: 79a970bc7af73efc83ef90300c006da80329c643 Parents: eb4f835 Author: Andy Taylor <[email protected]> Authored: Tue Dec 2 09:54:10 2014 +0000 Committer: Andy Taylor <[email protected]> Committed: Tue Dec 2 16:52:23 2014 +0000 ---------------------------------------------------------------------- distribution/activemq/pom.xml | 5 +++++ distribution/activemq/src/main/assembly/dep.xml | 7 +++++++ .../src/main/resources/config/clustered/bootstrap.xml | 4 +++- .../src/main/resources/config/non-clustered/bootstrap.xml | 4 +++- .../src/main/resources/config/replicated/bootstrap.xml | 4 +++- .../src/main/resources/config/shared-store/bootstrap.xml | 4 +++- pom.xml | 8 +++++++- 7 files changed, 31 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/79a970bc/distribution/activemq/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml index 8d60c60..c0e5845 100644 --- a/distribution/activemq/pom.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/79a970bc/distribution/activemq/src/main/assembly/dep.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml index 1a60ed2..a4c17ac 100644 --- a/distribution/activemq/src/main/assembly/dep.xml +++ b/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 --> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/79a970bc/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml index 698da46..76f88d1 100644 --- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/79a970bc/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml index dbec706..a88b777 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/79a970bc/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml index 1bf29ed..6fd5686 100644 --- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/79a970bc/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml index 0da0234..344157b 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/79a970bc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c9281c0..580ce49 100644 --- a/pom.xml +++ b/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>
