activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-4979 - put jolokia back in
Date Tue, 21 Jan 2014 14:13:31 GMT
Updated Branches:
  refs/heads/trunk 18e163de5 -> 286a5a6b4


https://issues.apache.org/jira/browse/AMQ-4979 - put jolokia back in


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/286a5a6b
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/286a5a6b
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/286a5a6b

Branch: refs/heads/trunk
Commit: 286a5a6b498a456be73efd19b20289f1c6d2abe3
Parents: 18e163d
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Tue Jan 21 15:13:04 2014 +0100
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Tue Jan 21 15:13:27 2014 +0100

----------------------------------------------------------------------
 assembly/src/release/webapps/api/WEB-INF/web.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/286a5a6b/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 52e12c6..a8aa302 100644
--- a/assembly/src/release/webapps/api/WEB-INF/web.xml
+++ b/assembly/src/release/webapps/api/WEB-INF/web.xml
@@ -36,9 +36,20 @@
         -->
     </servlet>
 
+    <servlet>
+        <servlet-name>jolokia-agent</servlet-name>
+        <servlet-class>org.jolokia.http.AgentServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
     <servlet-mapping>
         <servlet-name>MessageServlet</servlet-name>
         <url-pattern>/message/*</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>jolokia-agent</servlet-name>
+        <url-pattern>/jolokia/*</url-pattern>
+    </servlet-mapping>
+
 </web-app>
\ No newline at end of file


Mime
View raw message