diff --git a/assembly/src/release/conf/jetty.xml b/assembly/src/release/conf/jetty.xml
index 18915cb23e2..fd3fb72f527 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -24,6 +24,31 @@
+
+
@@ -51,6 +76,10 @@
+
+
+
+
@@ -106,6 +135,14 @@
+
+
@@ -147,6 +184,7 @@
+
@@ -162,19 +200,94 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 127.0.0.1
+
+
+
+
+
+
+ ::1
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
@@ -225,7 +338,7 @@
+ depends-on="broker, configureJetty, invokeConnectors, inetAccessIncludeLoopbackV6">
diff --git a/assembly/src/release/conf/jolokia-access.xml b/assembly/src/release/conf/jolokia-access.xml
index 97b099a5b7f..6844c314608 100644
--- a/assembly/src/release/conf/jolokia-access.xml
+++ b/assembly/src/release/conf/jolokia-access.xml
@@ -17,7 +17,14 @@
-->
-
+
+
+ post
+
+
+
@@ -46,11 +53,143 @@
+
+
+ org.apache.activemq:type=Broker,brokerName=*
+
+ terminateJVM
+ stop
+ stopGracefully
+ restart
+ gc
+
+ addConnector
+ removeConnector
+ addNetworkConnector
+ removeNetworkConnector
+ addQueue
+ removeQueue
+ addTopic
+ removeTopic
+ createDurableSubscriber
+ destroyDurableSubscriber
+
+ reloadLog4jProperties
+ setMemoryLimit
+ setStoreLimit
+ setTempLimit
+ setJobSchedulerStoreLimit
+ setMaxUncommittedCount
+
+
+
+
+ org.apache.activemq:type=Broker,brokerName=*,destinationType=*,destinationName=*
+ purge
+ removeMessage
+ removeMatchingMessages
+ copyMessageTo
+ copyMatchingMessagesTo
+ moveMessageTo
+ moveMatchingMessagesTo
+ retryMessage
+ retryMessages
+ removeMessageGroup
+ removeAllMessageGroups
+ sendTextMessage
+ sendTextMessageWithProperties
+ pause
+ resume
+
+
+
+
+ org.apache.activemq:type=Broker,brokerName=*,destinationType=*,destinationName=*,endpoint=Consumer,clientId=*,consumerId=*
+ destroy
+ removeMessage
+ setSelector
+
+
+
+
+ org.apache.activemq:type=Broker,brokerName=*,service=JobScheduler,name=*
+ removeJob
+ removeAllJobs
+ removeAllJobsAtScheduledTime
+
+
+
+
+ org.apache.activemq:type=Broker,brokerName=*,service=Log4JConfiguration
+ setRootLogLevel
+ setLogLevel
+ reloadLog4jProperties
+
+
+
+
+ org.apache.activemq:type=Broker,brokerName=*,connector=networkConnectors,networkConnectorName=*
+ Password
+ RemotePassword
+ setUserName
+ setPassword
+ setRemoteUserName
+ setRemotePassword
+ setBridgeTempDestinations
+ setConduitSubscriptions
+ setDispatchAsync
+ setDynamicOnly
+ setMessageTTL
+ setConsumerTTL
+ setPrefetchSize
+ setAdvisoryPrefetchSize
+ setDecreaseNetworkConsumerPriority
+ setSuppressDuplicateQueueSubscriptions
+ setSuppressDuplicateTopicSubscriptions
+
+
+
+
+ javax.management.loading:type=MLet
+ *
+ *
+
+
+ JMImplementation:*
+ *
+ *
+
org.apache.logging.log4j2:*
*
*
+
+ java.util.logging:*
+ *
+ *
+
+
+
+ java.lang:type=Memory
+ *
+ *
+
+
+ java.lang:type=ClassLoading
+ *
+ *
+
+
+
+ java.lang:type=Runtime
+ SystemProperties
+ InputArguments
+ *
+
com.sun.management:type=DiagnosticCommand
*