From 1cff5b63b5503feaa555c9f31ddc057fe9a18fdd Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Mon, 6 Oct 2014 06:56:59 +0000
Subject: QPID-6108: [Java Broker Documentation] Updates for changes made
 during 0.30

* Remove references to virtualhost.xml
* Rework concepts section
* Rework management section to separate means of management from management of the entities themselves
* Remove references message stores
* Update JVM defect to Java 7
* ACL updates
* Add Flow to Disk

Still further changes required flagged by TODO.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1629579 13f79535-47bb-0310-9956-ffa450edef68
---
 .../Java-Broker-Management-Channels.xml            | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 qpid/doc/book/src/java-broker/Java-Broker-Management-Channels.xml

(limited to 'qpid/doc/book/src/java-broker/Java-Broker-Management-Channels.xml')

diff --git a/qpid/doc/book/src/java-broker/Java-Broker-Management-Channels.xml b/qpid/doc/book/src/java-broker/Java-Broker-Management-Channels.xml
new file mode 100644
index 0000000000..80fbb308bc
--- /dev/null
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Management-Channels.xml
@@ -0,0 +1,49 @@
+<?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.
+
+-->
+
+<chapter id="Java-Broker-Management-Channel">
+  <title>Management Channels</title>
+  <para>The Broker can be managed over a number of different channels.</para>
+  <itemizedlist>
+    <listitem>
+      <para>HTTP - The primary channel for management. The HTTP interace comprises of a Web
+        Console and a REST API.</para>
+    </listitem>
+    <listitem>
+      <para>JMX - The Broker provides a JMX compilent management interface. This is not currently
+        undergoing further development and is retained largely for backward compatibility. It is
+        suggested the new users favour the Web Console/REST API.</para>
+    </listitem>
+    <listitem>
+      <para>AMQP - The AMQP protocols 0-8..0-10 allow for some management of Exchanges, Queue and
+        Bindings. This will be superceded by AMQP 1.0 Management. It is suggested that new users
+        favour the Management facilities provided by the Web Console/REST API.</para>
+    </listitem>
+  </itemizedlist>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="management/channels/Java-Broker-Management-Channel-HTTP.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="management/channels/Java-Broker-Management-Channel-Web-Console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="management/channels/Java-Broker-Management-Channel-REST-API.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="management/channels/Java-Broker-Management-Channel-JMX.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="management/channels/Java-Broker-Management-Channel-AMQP-Intrinsic.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="management/channels/Java-Broker-Management-Channel-QMF.xml"/>
+</chapter>
+
-- 
cgit v1.2.1