You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2015/04/25 16:20:00 UTC
[1/2] activemq git commit: Upgrade jolokia
Repository: activemq
Updated Branches:
refs/heads/master 23ecbe80d -> 5dd39f906
Upgrade jolokia
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/54463898
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/54463898
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/54463898
Branch: refs/heads/master
Commit: 544638985b3c90bd987ff0d04b7e5e2c9bb2bff1
Parents: 23ecbe8
Author: Claus Ibsen <cl...@gmail.com>
Authored: Sat Apr 25 16:15:08 2015 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Sat Apr 25 16:15:08 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/54463898/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 110ba1a..4401421 100755
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<jstl-version>1.1.2</jstl-version>
<jettison-version>1.3.7</jettison-version>
<jmock-version>2.5.1</jmock-version>
- <jolokia-version>1.2.2</jolokia-version>
+ <jolokia-version>1.2.3</jolokia-version>
<josql-version>1.5_5</josql-version>
<!-- for json-simple use same version as jolokia uses -->
<json-simple-version>1.1.1</json-simple-version>
[2/2] activemq git commit: Jolokia discovery url should be configured
to correct path if people enable that.
Posted by da...@apache.org.
Jolokia discovery url should be configured to correct path if people enable that.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5dd39f90
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5dd39f90
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5dd39f90
Branch: refs/heads/master
Commit: 5dd39f906278e5beeafb879482735dd8fc7fb156
Parents: 5446389
Author: Claus Ibsen <cl...@gmail.com>
Authored: Sat Apr 25 16:16:26 2015 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Sat Apr 25 16:21:40 2015 +0200
----------------------------------------------------------------------
assembly/src/release/webapps/api/WEB-INF/web.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/5dd39f90/assembly/src/release/webapps/api/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/webapps/api/WEB-INF/web.xml b/assembly/src/release/webapps/api/WEB-INF/web.xml
index b961742..d887383 100644
--- a/assembly/src/release/webapps/api/WEB-INF/web.xml
+++ b/assembly/src/release/webapps/api/WEB-INF/web.xml
@@ -43,6 +43,10 @@
<init-param>
<param-name>discoveryEnabled</param-name>
<param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>discoveryAgentUrl</param-name>
+ <param-value>http://${host}:8161/api/jolokia</param-value>
</init-param>
<init-param>
<param-name>agentDescription</param-name>