Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: davsclaus@apache.org
To: commits@activemq.apache.org
Date: Thu, 28 Jan 2016 18:51:22 -0000
Message-Id: <b918cbde6c0e4b25a764933738516f3b@git.apache.org>
In-Reply-To: <bb8158747dac40e4b073e279dc64fcad@git.apache.org>
References: <bb8158747dac40e4b073e279dc64fcad@git.apache.org>
Subject: [2/2] activemq git commit: AMQ-6149: Lets pre-configure jolokia in
 the broker

AMQ-6149: Lets pre-configure jolokia in the broker


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

Branch: refs/heads/activemq-5.12.x
Commit: 09e748d959a1b2adafc0c726fe4fdc7ce3b4c47d
Parents: 5c89397
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Thu Jan 28 19:45:15 2016 +0100
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Thu Jan 28 19:51:09 2016 +0100

----------------------------------------------------------------------
 .../api/WEB-INF/classes/jolokia-access.xml      | 34 ++++++++++++++++++++
 1 file changed, 34 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/09e748d9/assembly/src/release/webapps/api/WEB-INF/classes/jolokia-access.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/webapps/api/WEB-INF/classes/jolokia-access.xml b/assembly/src/release/webapps/api/WEB-INF/classes/jolokia-access.xml
new file mode 100644
index 0000000..09f29a4
--- /dev/null
+++ b/assembly/src/release/webapps/api/WEB-INF/classes/jolokia-access.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<restrict>
+
+  <!-- deny calling operations or getting attributes from these mbeans -->
+  <deny>
+    <mbean>
+      <name>com.sun.management:type=DiagnosticCommand</name>
+      <attribute>*</attribute>
+      <operation>*</operation>
+    </mbean>
+    <mbean>
+      <name>com.sun.management:type=HotSpotDiagnostic</name>
+      <attribute>*</attribute>
+      <operation>*</operation>
+    </mbean>
+  </deny>
+
+</restrict>
\ No newline at end of file