diff options
63 files changed, 494 insertions, 349 deletions
diff --git a/doc/book/src/ACL.xml b/doc/book/src/ACL.xml index 123819b490..204884936f 100644 --- a/doc/book/src/ACL.xml +++ b/doc/book/src/ACL.xml @@ -20,17 +20,20 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section id="qpid_ACL"> + <title> Apache Qpid : ACL - </title><section role="h2" id="ACL-v2ACLfileformatforbrokers"><title> - v2 ACL file format - for brokers - </title> - <para> - This new ACL implementation has been designed for implementation - and interoperability on all Qpid brokers. It is currently - supported in the following brokers: - </para> + </title> + + <section role="h2" id="ACL-v2ACLfileformatforbrokers"> + <title> + v2 ACL file format for brokers + </title> + <para> + This new ACL implementation has been designed for implementation + and interoperability on all Qpid brokers. It is currently + supported in the following brokers: + </para> <table><title/><tgroup cols="2"> <thead> @@ -789,4 +792,4 @@ ACL Options: <!--h3--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/AMQP-.NET-Messaging-Client.xml b/doc/book/src/AMQP-.NET-Messaging-Client.xml index d4ea48e8ee..319a248cdd 100644 --- a/doc/book/src/AMQP-.NET-Messaging-Client.xml +++ b/doc/book/src/AMQP-.NET-Messaging-Client.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude"> +<chapter> <title> Apache Qpid : AMQP .NET Messaging Client </title> @@ -40,9 +40,9 @@ User Guides </title> - <xi:include href="NET%20User%20Guide.xml"/> - <xi:include href="Excel%20AddIn.xml"/> - <xi:include href="WCF.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="NET-User-Guide.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Excel-AddIn.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="WCF.xml"/> </section> <section role="h3" id="AMQP.NETMessagingClient-Examples"> @@ -68,7 +68,7 @@ <itemizedlist> <listitem> <para> - <xref linkend="qpid_Developer-20Pages"/> + <xref linkend="qpid_Developer-Pages"/> </para> </listitem> <listitem> @@ -79,7 +79,7 @@ <itemizedlist> <listitem> <para> - <xref linkend="qpid_Build-20.NET-20Client"/> + <xref linkend="qpid_Build-.NET-Client"/> </para> </listitem> <listitem> @@ -89,12 +89,12 @@ </listitem> <listitem> <para> - <xref linkend="qpid_Run-20tests"/> + <xref linkend="qpid_Run-tests"/> </para> </listitem> <listitem> <para> - <xref linkend="qpid_Setup-20.Net-20Client-20on-20Windows"/> + <xref linkend="qpid_Setup-.Net-Client-on-Windows"/> </para> </listitem> </itemizedlist> diff --git a/doc/book/src/AMQP-C++-Messaging-Client.xml b/doc/book/src/AMQP-C++-Messaging-Client.xml index ff21c42b51..8449c00ab6 100644 --- a/doc/book/src/AMQP-C++-Messaging-Client.xml +++ b/doc/book/src/AMQP-C++-Messaging-Client.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<chapter > <title> Apache Qpid : AMQP C++ Messaging Client </title> diff --git a/doc/book/src/AMQP-Compatibility.xml b/doc/book/src/AMQP-Compatibility.xml index 867d027d56..e9a53772df 100644 --- a/doc/book/src/AMQP-Compatibility.xml +++ b/doc/book/src/AMQP-Compatibility.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml" id="AMQP-Compatibility"> +<chapter id="AMQP-Compatibility"> <title> Apache Qpid : AMQP compatibility </title> diff --git a/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml b/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml index 2ac1964793..8576870fb0 100644 --- a/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml +++ b/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<chapter> <title> Apache Qpid : AMQP Java JMS Messaging Client @@ -42,13 +42,12 @@ Does not seem to exist! <listitem><para>AMQP Java JMS Client Feature Guide </para></listitem> -http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=qpid&title=JMS%20Client%20Feature%20Guide&linkCreation=true&fromPageId=4589057 +http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=qpid&title=JMS-Client-Feature-Guide&linkCreation=true&fromPageId=4589057 --> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Java%20FAQ.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="System%20Properties.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Connection%20URL%20Format.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Binding%20URL%20Format.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="System-Properties.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Connection-URL-Format.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Binding-URL-Format.xml"/> <!-- <listitem><para>How to Use JNDI to configure the AMQP Java JMS Client diff --git a/doc/book/src/AMQP-Messaging-Broker-CPP.xml b/doc/book/src/AMQP-Messaging-Broker-CPP.xml index 0373583af4..b9c513e511 100644 --- a/doc/book/src/AMQP-Messaging-Broker-CPP.xml +++ b/doc/book/src/AMQP-Messaging-Broker-CPP.xml @@ -40,29 +40,29 @@ Running the AMQP Messaging Broker </title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="RASC.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Cheat%20Sheet%20for%20configuring%20Queue%20Options.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Cheat%20Sheet%20for%20configuring%20Exchange%20Options.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Running-CPP-Broker.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Cheat-Sheet-for-configuring-Queue-Options.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Cheat-Sheet-for-configuring-Exchange-Options.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Using%20Broker%20Federation.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Using-Broker-Federation.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="SSL.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="LVQ.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="queue%20state%20replication.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Starting%20a%20cluster.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="queue-state-replication.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Starting-a-cluster.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ACL.xml"/> </chapter> -<chapter> +<chapter id="chapter-Managing-CPP-Broker"> <title> Managing the AMQP Messaging Broker </title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="82403.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="QMan%20-%20Qpid%20Management%20bridge.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Management%20Framework.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Management%20Design%20notes.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="QMF%20Python%20Console%20Tutorial.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Managing-CPP-Broker.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="QMan-Qpid-Management-bridge.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Management-Framework.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Management-Design-notes.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="QMF-Python-Console-Tutorial.xml"/> </chapter> </part> diff --git a/doc/book/src/AMQP-Messaging-Broker-Java.xml b/doc/book/src/AMQP-Messaging-Broker-Java.xml index 99928fe22e..14fe977670 100644 --- a/doc/book/src/AMQP-Messaging-Broker-Java.xml +++ b/doc/book/src/AMQP-Messaging-Broker-Java.xml @@ -38,34 +38,33 @@ <chapter> <title>General User Guides</title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java%20Broker%20Feature%20Guide.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Java%20FAQ.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java%20Environment%20Variables.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Troubleshooting%20Guide.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Feature-Guide.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Java-FAQ.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Environment-Variables.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Troubleshooting-Guide.xml"/> </chapter> -<chapter id="AMQPMessagingBroker%28implementedinJava%29-HowTos"> +<chapter id="Qpid-Java-Broker-HowTos"> <title>How Tos</title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Add%20New%20Users.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20ACLs.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20Java%20Qpid%20to%20use%20a%20SSL%20connection..xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20Log4j%20CompositeRolling%20Appender.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20the%20Broker%20via%20config.xml.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20the%20Virtual%20Hosts%20via%20virtualhosts.xml.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Debug%20using%20log4j.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="How%20to%20Tune%20M3%20Java%20Broker%20Performance.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Java%20Build%20How%20To.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Use%20Priority%20Queues.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Add-New-Users.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-ACLs.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-Java-Qpid-to-use-a-SSL-connection.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-Log4j-CompositeRolling-Appender.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-the-Broker-via-config.xml.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Debug-using-log4j.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="How-to-Tune-M3-Java-Broker-Performance.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Java-Build-How-To.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Use-Priority-Queues.xml"/> </chapter> -<chapter id="AMQPMessagingBroker%28implementedinJava%29-ManagementTools"> -<title>Management Tools</title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20JMX%20Management%20Console.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="MessageStore%20Tool.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Java%20Broker%20Management%20CLI.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Management%20Design%20notes.xml"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-JMX-Management-Console.xml"/> +<chapter id="QpidJavaBroker-ManagementTools"> +<title>Management Tools</title> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="MessageStore-Tool.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Java-Broker-Management-CLI.xml"/> </chapter> </part> diff --git a/doc/book/src/AMQP-Python-Messaging-Client.xml b/doc/book/src/AMQP-Python-Messaging-Client.xml index 4ccfeb3a3f..cd912431e0 100644 --- a/doc/book/src/AMQP-Python-Messaging-Client.xml +++ b/doc/book/src/AMQP-Python-Messaging-Client.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<chapter> <title> Apache Qpid : AMQP Python Messaging Client </title> diff --git a/doc/book/src/AMQP-Ruby-Messaging-Client.xml b/doc/book/src/AMQP-Ruby-Messaging-Client.xml index 6b8344197a..932a689b87 100644 --- a/doc/book/src/AMQP-Ruby-Messaging-Client.xml +++ b/doc/book/src/AMQP-Ruby-Messaging-Client.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<chapter> <title> Apache Qpid : AMQP Ruby Messaging Client </title> diff --git a/doc/book/src/AMQP.xml b/doc/book/src/AMQP.xml index 8633699db4..1a609649bb 100644 --- a/doc/book/src/AMQP.xml +++ b/doc/book/src/AMQP.xml @@ -1,4 +1,27 @@ +<?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> + <title>AMQP (Advanced Message Queueing Protocol</title> @@ -25,9 +48,9 @@ support and a lot more.</para> <title>AMQP version 0-10</title> <listitem><para><ulink url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.pdf?version=1" >AMQP 0-10 Specification (PDF)</ulink></para></listitem> -<listitem><para><ulink> url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.xml?version=1" +<listitem><para><ulink url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.xml?version=1" >AMQP 0-10 Protocol Definition XML</ulink></para></listitem> -<listitem><para><ulink> url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.dfd?version=1" +<listitem><para><ulink url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.dfd?version=1" >AMQP 0-10 Protocol Definition DTD</ulink></para></listitem> </itemizedlist> diff --git a/doc/book/src/Add-New-Users.xml b/doc/book/src/Add-New-Users.xml index 31e4495488..aa141c2531 100644 --- a/doc/book/src/Add-New-Users.xml +++ b/doc/book/src/Add-New-Users.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Add New Users </title><para> The Qpid Java Broker has a single reference source (<xref linkend="qpid_PrincipalDatabase"/>) that @@ -43,10 +43,10 @@ use they only need support the SASL mechanisms they provide. </para><itemizedlist> <listitem><para> - <xref linkend="AddNewUsers-plain"/> + <xref linkend="AddNewUsers-Plain"/> </para></listitem> <listitem><para> - <xref linkend="AddNewUsers-base64md5"/> + <xref linkend="AddNewUsers-Base64MD5PasswordFileFormat"/> </para></listitem> </itemizedlist><para> @@ -156,11 +156,11 @@ martin:X03MO1qnZdYdgyfeuILPmQ== for qpid passwd files. <emphasis>NOTE:</emphasis> For the changes to be seen by the broker you must either restart the broker or reload the data with the - management tools (see <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/>) + management tools (see <xref linkend="Qpid-JMX-Management-Console-User-Guide"/>) </para></listitem> <listitem><para>Use the management tools to create a new user. The changes will be made by the broker to the password file and the new user - will be immediately available to the system (see <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/>). + will be immediately available to the system (see <xref linkend="Qpid-JMX-Management-Console-User-Guide"/>). </para></listitem> </orderedlist> <!--h3--></section> @@ -176,7 +176,7 @@ martin:X03MO1qnZdYdgyfeuILPmQ== only read once on start up. </para><para> To make changes dynamically there are two options, both require - administrator access via the Management Console (see <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/>) + administrator access via the Management Console (see <xref linkend="Qpid-JMX-Management-Console-User-Guide"/>) </para><orderedlist> <listitem><para>You can replace the file and use the console to reload its contents. @@ -229,8 +229,8 @@ martin:X03MO1qnZdYdgyfeuILPmQ== </row> </tbody> </tgroup></table><para> - For details of SASL support see <xref linkend="qpid_Qpid-20Interoperability-20Documentation"/> + For details of SASL support see <xref linkend="qpid_Qpid-Interoperability-Documentation"/> </para> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Binding-URL-Format.xml b/doc/book/src/Binding-URL-Format.xml index 65d619b470..4951eec64a 100644 --- a/doc/book/src/Binding-URL-Format.xml +++ b/doc/book/src/Binding-URL-Format.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,8 +21,9 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> - Apache Qpid : BindingURLFormat +<section id="BindingURLFormat"> + <title> + Apache Qpid : Binding URL Format </title> <programlisting> <Exchange Class>://<Exchange Name>/[<Destination>]/[<Queue>][?<option>='<value>'[&<option>='<value>']] @@ -169,4 +171,4 @@ topic://amq.topic?routingkey='stocks.nyse.ibm' </programlisting> </example> <!--h4--></section> -</chapter> +</section> diff --git a/doc/book/src/Book-Info.xml b/doc/book/src/Book-Info.xml index f8f7516917..2e02fbe8ea 100644 --- a/doc/book/src/Book-Info.xml +++ b/doc/book/src/Book-Info.xml @@ -1,4 +1,26 @@ <?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. + +--> + <!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]> @@ -41,8 +63,6 @@ </legalnotice> - - </bookinfo> diff --git a/doc/book/src/Book.xml b/doc/book/src/Book.xml index 175814cb26..ee69532152 100644 --- a/doc/book/src/Book.xml +++ b/doc/book/src/Book.xml @@ -1,4 +1,5 @@ <?xml version='1.0' encoding='utf-8' ?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,39 +21,39 @@ --> -<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]> -<book xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="Book_Info.xml"/> +<book> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book-Info.xml"/> <part> <title>Basics</title> - <xi:include href="Introduction.xml"/> - <xi:include href="AMQP.xml"/> - <xi:include href="Getting_Started.xml"/> - <xi:include href="Download.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Introduction.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Getting-Started.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Download.xml"/> </part> <!-- The broker sections define their own <part/> elements, with <partintro/> text. --> - <xi:include href="AMQP-Messaging-Broker-CPP.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="AMQP-Messaging-Broker-Java.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Messaging-Broker-CPP.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Messaging-Broker-Java.xml"/> <part> <title>AMQP Messaging Clients Clients</title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20Java%20JMS%20Messaging%20Client.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20C++%20Messaging%20Client.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20.NET%20Messaging%20Client.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20Python%20Messaging%20Client.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20Ruby%20Messaging%20Client.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Java-JMS-Messaging-Client.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-C++-Messaging-Client.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-.NET-Messaging-Client.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Python-Messaging-Client.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Ruby-Messaging-Client.xml"/> </part> <part> <title>Appendices</title> - <xi:include href="AMQP%20Compatibility.xml"/> - <xi:include href="Qpid%20Interoperability%20Documentation.xml"/> -<!-- <xi:include href="FAQ.xml"/> --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Compatibility.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Interoperability-Documentation.xml"/> +<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="FAQ.xml"/> --> </part> </book> diff --git a/doc/book/src/Brokers.xml b/doc/book/src/Brokers.xml deleted file mode 100644 index 52fd449464..0000000000 --- a/doc/book/src/Brokers.xml +++ /dev/null @@ -1,19 +0,0 @@ -<part> - <title>AMQP Messaging Brokers</title> - - <partintro> - <para>Qpid provides two AMQP messaging brokers:</para> - - <itemizedlist> - <listitem><para>Implemented in C++ - high performance, low latency, and RDMA support.</para></listitem> - <listitem><para>Implemented in Java - Fully JMS compliant, runs on any Java platform.</para></listitem> - </itemizedlist> - - <para>Both AMQP messaging brokers support clients in multiple languages, as long as the messaging client and the messaging broker use the same version of AMQP. See <link linkend="AMQP-Compatibility"/> to see which messaging clients work with each broker.</para> - </partintro> - - <xi:include href="AMQP-Messaging-Broker-CPP.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - - <xi:include href="AMQP-Messaging-Broker-Java.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - -</part> diff --git a/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml b/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml index 777fb05e09..2a90f8a93f 100644 --- a/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml +++ b/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,11 +21,15 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> - Apache Qpid : Cheat Sheet for configuring Exchange Options - </title><section role="h2" id="CheatSheetforconfiguringExchangeOptions-ConfiguringExchangeOptions"><title> - Configuring Exchange Options - </title> +<section> + <title> + Apache Qpid : Cheat Sheet for configuring Exchange Options + </title> + + <section role="h2" id="CheatSheetforconfiguringExchangeOptions-ConfiguringExchangeOptions"> + <title> + Configuring Exchange Options + </title> <para> The C++ Broker M4 or later supports the following additional Exchange options in addition to the standard AMQP define options @@ -136,4 +141,4 @@ </programlisting> <!--h3--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml b/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml index 6b5a89ca05..2946383285 100644 --- a/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml +++ b/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +21,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Cheat Sheet for configuring Queue Options </title> @@ -165,7 +166,7 @@ ignored. </para></listitem> </itemizedlist><para> - A fully worked <xref linkend="qpid_LVQ-20Example"/> can be found here + A fully worked <xref linkend="qpid_LVQ-Example"/> can be found here </para> <!--h3--></section> <section role="h3" id="CheatSheetforconfiguringQueueOptions-Settingadditionalbehaviors"><title> @@ -210,7 +211,7 @@ This option is used to determine whether enqueue/dequeue events representing changes made to queue state are generated. These events can then be processed by plugins such as that used for - <xref linkend="qpid_queue-20state-20replication"/>. + <xref linkend="qpid_queue-state-replication"/>. </para><para> Example: </para> @@ -245,4 +246,4 @@ <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Configure-ACLs.xml b/doc/book/src/Configure-ACLs.xml index 086c323d80..f4464caac0 100644 --- a/doc/book/src/Configure-ACLs.xml +++ b/doc/book/src/Configure-ACLs.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +21,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : Configure ACLs </title> @@ -34,7 +35,7 @@ </title> <itemizedlist> <listitem><para> - <xref linkend="qpid_Java-20XML-20ACLs"/> + <xref linkend="qpid_Java-XML-ACLs"/> </para></listitem> <listitem><para> <xref linkend="qpid_ACL"/> @@ -62,7 +63,7 @@ <itemizedlist> <listitem><para> - <xref linkend="qpid_Java-20XML-20ACLs"/> + <xref linkend="qpid_Java-XML-ACLs"/> </para></listitem> <listitem><para>Support for Version 2 specification is in progress. </para></listitem> @@ -74,4 +75,4 @@ <!--h2--> </section> -</chapter> +</section> diff --git a/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml b/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml index b790b09f16..ad908c0dab 100644 --- a/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml +++ b/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +21,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Configure Java Qpid to use a SSL connection. </title> @@ -80,4 +81,4 @@ </title> <para/> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml b/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml index d8dc88bb76..3f7be3e5c3 100644 --- a/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml +++ b/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +21,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Configure Log4j CompositeRolling Appender </title> <section role="h2" id="ConfigureLog4jCompositeRollingAppender-HowtoconfiguretheCompositeRollinglog4jAppender"><title> @@ -146,4 +147,4 @@ </listitem> </orderedlist> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Configure-the-Broker-via-config.xml.xml b/doc/book/src/Configure-the-Broker-via-config.xml.xml index ac1f1d1fc6..a56c613965 100644 --- a/doc/book/src/Configure-the-Broker-via-config.xml.xml +++ b/doc/book/src/Configure-the-Broker-via-config.xml.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,14 +21,13 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : Configure the Broker via config.xml </title> <section role="h2" id="ConfiguretheBrokerviaconfig.xml-Brokerconfig.xmlOverview"> <title> - Broker - config.xml Overview + Broker config.xml Overview </title> <para> The broker config.xml file which is shipped in the etc directory @@ -68,4 +68,4 @@ <!--h2--> </section> -</chapter> +</section> diff --git a/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml b/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml index 9e54e39c85..f98b18614e 100644 --- a/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml +++ b/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +21,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Configure the Virtual Hosts via virtualhosts.xml </title><section role="h2" id="ConfiguretheVirtualHostsviavirtualhosts.xml-virtualhosts.xmlOverview"><title> virtualhosts.xml Overview @@ -127,4 +128,4 @@ </para> <!--h3--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Configuring-Management-Users.xml b/doc/book/src/Configuring-Management-Users.xml index e473a047b5..d338512ddc 100644 --- a/doc/book/src/Configuring-Management-Users.xml +++ b/doc/book/src/Configuring-Management-Users.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +21,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Configuring Management Users </title><para> The Qpid Java broker has a single source of users for the system. @@ -42,7 +43,7 @@ There are two steps required to add a new user with rights for the JMX console. </para><orderedlist> - <listitem><para>Create a new user login, see HowTo:<xref linkend="qpid_Add-20New-20Users"/> + <listitem><para>Create a new user login, see HowTo:<xref linkend="qpid_Add-New-Users"/> </para></listitem> <listitem><para>Grant the new user permission to the JMX Console </para></listitem> @@ -113,4 +114,4 @@ user=readwrite <!--h4--></section> <!--h3--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml b/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml index 1bc5e1138e..9129569c70 100644 --- a/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml +++ b/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +21,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Configuring Qpid JMX Management Console </title><section role="h2" id="ConfiguringQpidJMXManagementConsole-ConfiguringQpidJMXManagementConsole"><title> Configuring Qpid JMX Management Console @@ -30,7 +31,7 @@ Qpid has a JMX management interface that exposes a number of components of the running broker. You can find out more about the features exposed by the JMX - interfaces <xref linkend="qpid_Qpid-20Management-20Features"/>. + interfaces <xref linkend="qpid_Qpid-Management-Features"/>. </para><para> </para> @@ -49,7 +50,7 @@ being connected to is making use of this ability then additional console configuration may be required, particularly when using self-signed certificates. See - <xref linkend="qpid_Management-20Console-20Security"/> for details. + <xref linkend="qpid_Management-Console-Security"/> for details. </para> </note> </listitem> @@ -66,7 +67,7 @@ However, if you wish to connect to an older broker using JMXMP the console will support this so long as the <emphasis>jmxremote_optional.jar</emphasis> file is provided to it. - For details see <xref linkend="qpid_Management-20Console-20Security"/>. + For details see <xref linkend="qpid_Management-Console-Security"/>. </para> </note> <!--h3--></section> @@ -98,7 +99,7 @@ </title> <para> - Please see <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/> for details on using this Eclipse RCP + Please see <xref linkend="Qpid-JMX-Management-Console-User-Guide"/> for details on using this Eclipse RCP application. </para> @@ -124,7 +125,7 @@ <para> HermesJMS also offers integration with the Qpid management interfaces. You can get instructions and more information from - <xref linkend="qpid_HermesJMS"/>. + <ulink url="http://cwiki.apache.org/confluence/display/qpid/HermesJMS">HermesJMS</ulink>. </para> <!--h2--></section> @@ -134,7 +135,7 @@ </title> <para> - <xref linkend="qpid_www.mc4j.org"/> is an alternative + <ulink url="qpid_www.mc4j.org">MC4J</ulink> is an alternative management tool. It provide a richer "dashboard" that can customise the raw MBeans. </para> @@ -177,4 +178,4 @@ </para> <!--h4--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Connection-URL-Format.xml b/doc/book/src/Connection-URL-Format.xml index a50b379ceb..2195bb6c38 100644 --- a/doc/book/src/Connection-URL-Format.xml +++ b/doc/book/src/Connection-URL-Format.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +21,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section id="Connection-URL-Format"> <title> Apache Qpid : Connection URL Format </title> @@ -378,4 +379,4 @@ amqp://guest:guest@/test?brokerlist='vm://:1'&failover='nofailover' </programlisting> <!--h3--></section> -</chapter> +</section> diff --git a/doc/book/src/Debug-using-log4j.xml b/doc/book/src/Debug-using-log4j.xml index fd49dcd2e4..bf948dfdc7 100644 --- a/doc/book/src/Debug-using-log4j.xml +++ b/doc/book/src/Debug-using-log4j.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +21,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Debug using log4j </title> @@ -59,7 +60,7 @@ </title> <para> <emphasis>deprecation notice</emphasis> Version 0.6 of the Java broker includes - <xref linkend="qpid_Configure-20Operational-20Status-20Logging"/> functionality which improves upon these messages and + <xref linkend="qpid_Configure-Operational-Status-Logging"/> functionality which improves upon these messages and as such enabling status logging would be more beneficial. The configuration file has been left here for assistence with broker versions prior to 0.6. @@ -294,4 +295,4 @@ <!--h3--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Download.xml b/doc/book/src/Download.xml index 86ad4b65d8..6e2352d490 100644 --- a/doc/book/src/Download.xml +++ b/doc/book/src/Download.xml @@ -1,12 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> <!-- - [ ] <- ############### -*<ulink>url</ulink> -*Broker + + 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> +<chapter id="chapter-Download"> + <title>Download Apache Qpid</title> +<para/> + + <section><title>Production Releases</title> <para>These releases are well tested and appropriate for production use. 0.5 is the latest release of Qpid.</para> @@ -23,13 +43,17 @@ <section><title>Multiple Component Packages</title> -<table> -<thead><tr><td> Component </td><td> Download </td><td> AMQP 0-10 </td><td> AMQP 0-8/0-9 </td></tr></thead> +<table frame="all"> +<title/> +<tgroup cols='4' align='left' colsep='1' rowsep='1'> +<thead><row><entry> Component </entry><entry> Download </entry><entry> AMQP 0-10 </entry><entry> AMQP 0-8/0-9 </entry></row></thead> <tbody> -<tr><td> Full release & keys </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/">http://www.apache.org/dist/qpid/0.5/</ulink> </td><td> Y </td><td> Y </td></tr> -<tr><td> C++ broker & client </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz</ulink> </td><td> Y </td><td> </td></tr> -<tr><td> Java broker, client & tools </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz</ulink> </td><td> client </td><td> Y </td></tr> -</tbody></table> +<row><entry> Full release & keys </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/">http://www.apache.org/dist/qpid/0.5/</ulink> </entry><entry> Y </entry><entry> Y </entry></row> +<row><entry> C++ broker & client </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz</ulink> </entry><entry> Y </entry><entry> </entry></row> +<row><entry> Java broker, client & tools </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz</ulink> </entry><entry> client </entry><entry> Y </entry></row> +</tbody> +</tgroup> +</table> </section> <section><title>Single Component Package</title> @@ -37,53 +61,61 @@ <table> <title>Broker</title> -<thead><tr><td> Language </td><td> Download </td><td> AMQP 0-10 </td><td> AMQP 0-8/0-9 </td></tr></thead> +<tgroup cols="4" align='left' colsep='1' rowsep='1'> +<thead><row><entry> Language </entry><entry> Download </entry><entry> AMQP 0-10 </entry><entry> AMQP 0-8/0-9 </entry></row></thead> <tbody> -<tr><td> Java </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz</ulink> </td><td> </td><td> Y </td></tr> +<row><entry> Java </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz</ulink> </entry><entry> </entry><entry> Y </entry></row> </tbody> +</tgroup> </table> <table> <title>Client</title> -<thead><tr><td> Language </td><td> Download </td><td> AMQP 0-10 </td><td> AMQP 0-8/0-9 </td></tr></thead> +<tgroup cols="4" align='left' colsep='1' rowsep='1'> +<thead><row><entry> Language </entry><entry> Download </entry><entry> AMQP 0-10 </entry><entry> AMQP 0-8/0-9 </entry></row></thead> <tbody> -<tr><td> C# (.NET, WCF, Excel) 0-10 client (C++ Broker Compatible) </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip</ulink> </td><td> Y </td><td> </td></tr> -<tr><td> C# (.NET) 0-8 client (Java Broker Compatible) </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip</ulink> </td><td> </td><td> Y </td></tr> -<tr><td> Java </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz</ulink> </td><td> Y </td><td> Y </td></tr> -<tr><td> Python </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</ulink> </td><td> Y </td><td> Y </td></tr> -<tr><td> Ruby </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz</ulink> </td><td> Y </td><td> Y </td></tr> +<row><entry> C# (.NET, WCF, Excel) 0-10 client (C++ Broker Compatible) </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip</ulink> </entry><entry> Y </entry><entry> </entry></row> +<row><entry> C# (.NET) 0-8 client (Java Broker Compatible) </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip</ulink> </entry><entry> </entry><entry> Y </entry></row> +<row><entry> Java </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz</ulink> </entry><entry> Y </entry><entry> Y </entry></row> +<row><entry> Python </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</ulink> </entry><entry> Y </entry><entry> Y </entry></row> +<row><entry> Ruby </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz</ulink> </entry><entry> Y </entry><entry> Y </entry></row> </tbody> +</tgroup> </table> <table> <title>C++ broker management</title> -<thead><tr><td> Component </td><td> Download </td><td> AMQP 0-10 </td></tr></thead> +<tgroup cols="3" align='left' colsep='1' rowsep='1'> +<thead><row><entry> Component </entry><entry> Download </entry><entry> AMQP 0-10 </entry></row></thead> <tbody> -<tr><td> cmd line (packaged with python) </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</ulink> </td><td> Y </td></tr> -<tr><td> QMan JMX bridge, WS-DM </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz</ulink> </td><td> Y </td></tr> +<row><entry> cmd line (packaged with python) </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</ulink> </entry><entry> Y </entry></row> +<row><entry> QMan JMX bridge, WS-DM </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz</ulink> </entry><entry> Y </entry></row> </tbody> +</tgroup> </table> <table> <title>Java broker management</title> -<thead><tr><td> Component </td><td> Download </td></tr></thead> +<tgroup cols="2" align='left' colsep='1' rowsep='1'> +<thead><row><entry> Component </entry><entry> Download </entry></row></thead> <tbody> -<tr><td> Eclipse RCP client </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86.tar.gz">Linux x86</ulink> +<row><entry> Eclipse RCP client </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86.tar.gz">Linux x86</ulink> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86_64.tar.gz">Linux x86_64</ulink> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-macosx.zip">Mac OS X</ulink> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-win32-win32-x86.zip">Windows x86</ulink> -</td></tr> -<tr><td> Command line interface </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz</ulink> </td></tr> +</entry></row> +<row><entry> Command line interface </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz</ulink> </entry></row> </tbody> +</tgroup> </table> </section> </section> -<section><title>QpidComponents.org</title> +<section id="qpid_3rd-Party-Libraries"><title>QpidComponents.org</title> <para><ulink url="http://QpidComponents.org">http://QpidComponents.org</ulink> provides further components for Apache Qpid, including both persistence and management tools. These components are open source, but are not developed as part of the Apache Qpid project due to licensing or other restrictions.</para> diff --git a/doc/book/src/Excel-AddIn.xml b/doc/book/src/Excel-AddIn.xml index 86621370c0..7752cd94bf 100644 --- a/doc/book/src/Excel-AddIn.xml +++ b/doc/book/src/Excel-AddIn.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +20,7 @@ under the License. --> - -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : Excel AddIn </title> @@ -166,4 +166,4 @@ value="<path>\qpid\dotnet\client-010\addins\ExcelAddInMessageProcessor\bin <!--h1--> </section> -</chapter> +</section> diff --git a/doc/book/src/Getting-Started.xml b/doc/book/src/Getting-Started.xml index b32e105a8f..afb81ff92a 100644 --- a/doc/book/src/Getting-Started.xml +++ b/doc/book/src/Getting-Started.xml @@ -1,16 +1,36 @@ -<chapter> -<section> +<chapter id="Getting-Started"> + +<!-- + + 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. + +--> <title>Getting Started</title> <para>To get started with Apache Qpid, follow the steps below.</para> <orderedlist> -<listitem><para>Download the software [Download]</para></listitem> +<listitem><para><xref linkend="chapter-Download"/></para></listitem> <listitem> <para>Start a broker. </para> <itemizedlist> - <listitem><para>Instructions for [running a Qpid Java broker (AMQP 0-8, 0-9) | Getting Started Guide]</para></listitem> - <listitem><para>Instructions for [running a Qpid C++ broker (AMQP 0-10) | RASC]</para></listitem> - <listitem><para>[Management tools | MgmtC++] (AMQP 0-10, works with the Qpid C++ broker)</para></listitem> + <listitem><para><xref linkend="chapter-Running-a-Qpid-Java-Broker"/></para></listitem> + <listitem><para><xref linkend="section-Running-a-Qpid-CPP-Broker"/></para></listitem> + <listitem><para><xref linkend="chapter-Managing-CPP-Broker"/>(AMQP 0-10, works with the Qpid C++ broker)</para></listitem> </itemizedlist> </listitem> <listitem> @@ -18,35 +38,35 @@ <itemizedlist> <listitem><para>C++ (AMQP 0-10):</para> <itemizedlist> - <listitem><para>Examples: [https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/ | https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/]</para></listitem> - <listitem><para>[Running the C++ Examples | https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/README.txt]</para></listitem> + <listitem><para>Examples:</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/</ulink></para></listitem> + <listitem><para>Running the C++ Examples:</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/README.txt">https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/README.txt</ulink></para></listitem> </itemizedlist> </listitem> <listitem> <para>Java JMS (AMQP 0-10):</para> <itemizedlist> - <listitem><para>Examples: [https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/ | https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/]</para></listitem> - <listitem><para>[Script for Running the Java JMS Examples | https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/runSample.sh]</para></listitem> + <listitem><para>Examples:</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/</ulink></para></listitem> + <listitem><para>Script for Running the Java JMS Examples </para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/runSample.sh">https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/runSample.sh</ulink></para></listitem> </itemizedlist> </listitem> <listitem> <para>Python (AMQP 0-10):</para> <itemizedlist> - <listitem><para>Examples: [https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/ | https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/]</para></listitem> - <listitem><para>[Running the Python Examples | https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/README]</para></listitem> + <listitem><para>Examples:</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/</ulink></para></listitem> + <listitem><para>Running the Python Examples</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/README">https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/README</ulink></para></listitem> </itemizedlist> </listitem> <listitem> <para>Ruby (AMQP 0-10):</para> <itemizedlist> - <listitem><para>Examples: [https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/ | https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/]</para></listitem> + <listitem><para>Examples: </para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/</ulink></para></listitem> </itemizedlist> </listitem> <listitem> <para>.NET (AMQP 0-10):</para> <itemizedlist> - <listitem><para>Examples: [http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/ | http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/]</para></listitem> - <listitem><para>[.NET Tutorial | http://cwiki.apache.org/confluence/display/qpid/.NET+User+Guide]</para></listitem> + <listitem><para>Examples:</para><para><ulink url="http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/">http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/</ulink></para></listitem> + <listitem><para><xref linkend="NETUserGuide-Tutorial"/></para></listitem> </itemizedlist> </listitem> </itemizedlist> @@ -54,19 +74,17 @@ <listitem> <para>Read the API Guides and Documentation</para> <itemizedlist> - <listitem><para>[C++ Client API (AMQP 0-10) | http://qpid.apache.org/docs/api/cpp/html/index.html]</para></listitem> - <listitem><para>[JNDI Configuration for Java JMS | http://cwiki.apache.org/confluence/display/qpid/How+to+Use+JNDI]</para></listitem> - <listitem><para>[Python Client API (AMQP 0-10) | http://qpid.apache.org/docs/api/python/html/index.html]</para></listitem> - <listitem><para>[Documentation]</para></listitem> + <listitem><para>C++ Client API (AMQP 0-10)</para><para><ulink url="http://qpid.apache.org/docs/api/cpp/html/index.html"></ulink></para></listitem> + <listitem><para><xref linkend="How-to-Use-JNDI"/></para></listitem> + <listitem><para>Python Client API (AMQP 0-10)</para><para><ulink url="http://qpid.apache.org/docs/api/python/html/index.html">http://qpid.apache.org/docs/api/python/html/index.html</ulink></para></listitem> </itemizedlist> </listitem> <listitem> <para>Get your Questions Answered</para> <itemizedlist> - <listitem><para>Read the [FAQ|FAQ]</para></listitem> - <listitem><para>Ask a question on the user list mailto:users-subscribe@qpid.apache.org</para></listitem> + <listitem><para>Read the <xref linkend="FAQ"/></para></listitem> + <listitem><para>Ask a question on the user list</para><para>mailto:users-subscribe@qpid.apache.org</para></listitem> </itemizedlist> </listitem> </orderedlist> -</section> </chapter> diff --git a/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml b/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml index 75eed5c452..9769a97031 100644 --- a/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml +++ b/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +20,7 @@ under the License. --> - -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section id="How-to-Tune-M3-Java-Broker-Performance"> <title> Apache Qpid : How to Tune M3 Java Broker Performance </title> @@ -169,4 +169,4 @@ </para> <!--h3--> </section> -</chapter> +</section> diff --git a/doc/book/src/How-to-Use-JNDI.xml b/doc/book/src/How-to-Use-JNDI.xml index f4790af7f2..c1ebb03e6d 100644 --- a/doc/book/src/How-to-Use-JNDI.xml +++ b/doc/book/src/How-to-Use-JNDI.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<chapter id="How-to-Use-JNDI"> <title> Apache Qpid : How to Use JNDI </title> @@ -80,13 +80,13 @@ destination.direct = direct://amq.direct//directQueue The property file allows a number of queues to be defined that can then be discovered via JNDI. There are four properties used by the PFICFactory. - <emphasis>connectionfactory.<jndiname></emphasis> this is the <xref linkend="qpid_Connection-20URL-20Format"/> that the connection + <emphasis>connectionfactory.<jndiname></emphasis> this is the <xref linkend="Connection-URL-Format"/> that the connection factory will use to perform connections. <emphasis>queue.<jndiname></emphasis> this defines a jms queue or in amqp a amq.direct exchange <emphasis>topic.<jndiname></emphasis> this defines a jms topic or in amqp a amq.topic exchange - <emphasis>destination.<jndiname></emphasis> this takes a <xref linkend="qpid_BindingURLFormat"/> + <emphasis>destination.<jndiname></emphasis> this takes a <xref linkend="BindingURLFormat"/> and so can be used for defining all amq destinations, queues, topics and header matching. </para><para> diff --git a/doc/book/src/Introduction.xml b/doc/book/src/Introduction.xml index d62f4fe6ac..8f92c207cf 100644 --- a/doc/book/src/Introduction.xml +++ b/doc/book/src/Introduction.xml @@ -1,4 +1,27 @@ +<?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> + <title>Apache Qpid: Open Source AMQP Messaging</title> <para>Enterprise Messaging systems let programs communicate by exchanging messages, much as people communicate by exchanging email. Unlike email, enterprise messaging systems provide guaranteed delivery, speed, security, and freedom from spam. Until recently, there was no open standard for Enterprise Messaging systems, so programmers either wrote their own, or used expensive proprietary systems.</para> diff --git a/doc/book/src/Java-Broker-Feature-Guide.xml b/doc/book/src/Java-Broker-Feature-Guide.xml index 394a864cd7..7f62b279d3 100644 --- a/doc/book/src/Java-Broker-Feature-Guide.xml +++ b/doc/book/src/Java-Broker-Feature-Guide.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : Java Broker Feature Guide </title> @@ -81,4 +81,4 @@ <!--h3--> </section> -</chapter> +</section> diff --git a/doc/book/src/Java-Environment-Variables.xml b/doc/book/src/Java-Environment-Variables.xml index 868ea470aa..129ec693fe 100644 --- a/doc/book/src/Java-Environment-Variables.xml +++ b/doc/book/src/Java-Environment-Variables.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : Java Environment Variables </title> @@ -81,4 +81,4 @@ <!--h2--> </section> -</chapter> +</section> diff --git a/doc/book/src/LVQ.xml b/doc/book/src/LVQ.xml index 5b7b4a2c9a..690f0f4718 100644 --- a/doc/book/src/LVQ.xml +++ b/doc/book/src/LVQ.xml @@ -1,5 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<!-- + + 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. + +--> + +<section><title> Apache Qpid : LVQ </title> @@ -338,4 +359,4 @@ int main(int argc, char** argv) </programlisting> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Management-Console-Security.xml b/doc/book/src/Management-Console-Security.xml index 0c1e222115..cb3f9d09d7 100644 --- a/doc/book/src/Management-Console-Security.xml +++ b/doc/book/src/Management-Console-Security.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Management Console Security </title><section role="h1" id="ManagementConsoleSecurity-ManagementConsoleSecurity"><title> Management @@ -106,7 +106,7 @@ when starting the console. This can be done at the command line, or alternatively an example configuration has been made within the console's qpidmc.ini launcher configuration file that may - pre-configured in advance for repeated usage. See the <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/> for more + pre-configured in advance for repeated usage. See the <xref linkend="Qpid-JMX-Management-Console-User-Guide"/> for more information on this configuration process. </para> <!--h3--></section> @@ -132,7 +132,7 @@ <para> More information on Java's handling of SSL certificate verification and customizing the keystores can be found in the - <xref linkend="qpid_JSSERefGuide"/> . + <ulink url="http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CustomizingStores">http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CustomizingStores</ulink>. </para> <!--h3--></section> <!--h2--></section> @@ -183,7 +183,7 @@ qpid-server -run:external-classpath=first </para> <!--h3--></section> - <section role="h3" id="ManagementConsoleSecurity-BrokerConfiguration"><title> + <section role="h3" id="ManagementConsoleSecurity-BrokerConfiguration2"><title> Broker Configuration </title> @@ -209,7 +209,7 @@ qpid-server -run:external-classpath=first </para> <!--h3--></section> - <section role="h3" id="ManagementConsoleSecurity-JMXManagementConsoleConfiguration"><title> + <section role="h3" id="ManagementConsoleSecurity-JMXManagementConsoleConfiguration-2"><title> JMX Management Console Configuration </title> @@ -243,10 +243,10 @@ qpid-server -run:external-classpath=first <para> In order to access the management operations via JMX, users must have an account and have been assigned appropriate access rights. - See <xref linkend="qpid_Configuring-20Management-20Users"/> + See <xref linkend="qpid_Configuring-Management-Users"/> </para> <!--h2--></section> <!--h1--></section> -</chapter> +</section> diff --git a/doc/book/src/Management-Design-notes.xml b/doc/book/src/Management-Design-notes.xml index 07237c3ee2..46e13ac641 100644 --- a/doc/book/src/Management-Design-notes.xml +++ b/doc/book/src/Management-Design-notes.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Management Design notes </title><section role="h2" id="ManagementDesignnotes-StatusofThisDocument"><title> Status @@ -35,7 +35,7 @@ </para><para> Development continues on the Qpid Management Framework (QMF) for M4. If you are using M3, this is the document you need. If you - are using the SVN trunk, please refer to <xref linkend="qpid_Qpid-20Management-20Framework"/> for + are using the SVN trunk, please refer to <xref linkend="qpid_Qpid-Management-Framework"/> for up-to-date information. </para> <!--h2--></section> @@ -70,7 +70,7 @@ </title> <para> - <xref linkend="qpid_JMX-20Gateway"/> + <xref linkend="qpid_JMX-Gateway"/> </para> <!--h3--></section> @@ -2132,5 +2132,5 @@ <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/82403.xml b/doc/book/src/Managing-CPP-Broker.xml index 6745f09477..2cb4def764 100644 --- a/doc/book/src/82403.xml +++ b/doc/book/src/Managing-CPP-Broker.xml @@ -20,12 +20,8 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> - Apache Qpid : MgmtC++ - </title><section role="h2" id="MgmtC-2B-2B-ManagingtheC-5CBroker"><title> - Managing the C++ - Broker - </title> +<section id="section-Managing-CPP-Broker"> + <title> Managing the C++ Broker </title> <para> There are quite a few ways to interact with the C++ broker. The command line tools @@ -463,5 +459,4 @@ Options: You get the idea... have fun! </para> <!--h3--></section> -<!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/MessageStore-Tool.xml b/doc/book/src/MessageStore-Tool.xml index c858ce6408..404018e714 100644 --- a/doc/book/src/MessageStore-Tool.xml +++ b/doc/book/src/MessageStore-Tool.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : MessageStore Tool </title><section role="h2" id="MessageStoreTool-MessageStoreTool"><title> MessageStore Tool @@ -39,7 +39,7 @@ <itemizedlist> <listitem><para> - <xref linkend="qpid_BDBMessageStore-20-3rd-20Party-"/> + <xref linkend="qpid_BDBMessageStore--3rd-Party-"/> </para></listitem> <listitem><para> <xref linkend="qpid_JDBCStore"/> @@ -147,4 +147,4 @@ bdb$ </para> <!--h3--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/NET-User-Guide.xml b/doc/book/src/NET-User-Guide.xml index 428e14377c..7bfa20b8c8 100644 --- a/doc/book/src/NET-User-Guide.xml +++ b/doc/book/src/NET-User-Guide.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid: Open Source AMQP Messaging - .NET User Guide </title> @@ -1024,7 +1024,7 @@ noMoreMessages(session); <!--h3--> </section> - <section role="h3" id="NETUserGuide-ReadingMessagesfromtheQueue"> + <section role="h3" id="NETUserGuide-ReadingMessagesfromtheQueue2"> <title> Reading Messages from the Queue @@ -1380,4 +1380,4 @@ _session.messageTransfer("amq.direct", routingKey, response); </section> - </chapter> + </section> diff --git a/doc/book/src/PythonBrokerTest.xml b/doc/book/src/PythonBrokerTest.xml index 3d72023fef..218738f3a8 100644 --- a/doc/book/src/PythonBrokerTest.xml +++ b/doc/book/src/PythonBrokerTest.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : PythonBrokerTest </title> @@ -95,4 +95,4 @@ <!--h2--> </section> -</chapter> +</section> diff --git a/doc/book/src/QMF-Python-Console-Tutorial.xml b/doc/book/src/QMF-Python-Console-Tutorial.xml index 00ab12b4a1..71e681c356 100644 --- a/doc/book/src/QMF-Python-Console-Tutorial.xml +++ b/doc/book/src/QMF-Python-Console-Tutorial.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : QMF Python Console Tutorial </title> <itemizedlist> @@ -84,7 +84,7 @@ network. Qpid can be downloaded as source from Apache, is packaged with a number of Linux distributions, and can be purchased from commercial vendors that use Qpid. Please see - <xref linkend="qpid_Download"/> for + <xref linkend="chapter-Download"/> for information as to where to get Qpid Messaging. </para><para> Qpid Messaging includes a message broker (qpidd) which typically @@ -891,4 +891,4 @@ sess.bindClass("org.apache.qpid.broker", "queue") <!--h1--></section> -</chapter> +</section> diff --git a/doc/book/src/QMan-Qpid-Management-bridge.xml b/doc/book/src/QMan-Qpid-Management-bridge.xml index 6cce51da6f..b64239abf2 100644 --- a/doc/book/src/QMan-Qpid-Management-bridge.xml +++ b/doc/book/src/QMan-Qpid-Management-bridge.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : QMan - Qpid Management bridge </title><section role="h1" id="QMan-QpidManagementbridge-QMan-3AQpidManagementBridge"><title> QMan @@ -76,7 +76,7 @@ </row> <row> <entry> - <xref linkend="qpid_Get-20me-20up-20and-20running"/> + <xref linkend="qpid_Get-me-up-and-running"/> </entry> <entry> How to install & start QMan. @@ -84,7 +84,7 @@ </row> <row> <entry> - <xref linkend="qpid_QMan-20User-20Guide"/> + <xref linkend="qpid_QMan-User-Guide"/> </entry> <entry> QMan (WS-DM version only) Administration Console. @@ -92,7 +92,7 @@ </row> <row> <entry> - <xref linkend="qpid_JMX-20Interface-20Specification"/> + <xref linkend="qpid_JMX-Interface-Specification"/> </entry> <entry> Describes each JMX interface exposed by QMan. @@ -100,7 +100,7 @@ </row> <row> <entry> - <xref linkend="qpid_WS-DM-20Interface-20Specification"/> + <xref linkend="qpid_WS-DM-Interface-Specification"/> </entry> <entry> Describes each WS-DM interface exposed by QMan. @@ -108,7 +108,7 @@ </row> <row> <entry> - <xref linkend="qpid_QMan-20Messages-20Catalogue"/> + <xref linkend="qpid_QMan-Messages-Catalogue"/> </entry> <entry> Informational / Debug / Error / Warning messages catalogue. @@ -142,7 +142,7 @@ </row> <row> <entry> - <xref linkend="qpid_QMan-20System-20Overview"/> + <xref linkend="qpid_QMan-System-Overview"/> </entry> <entry> A short introduction about QMan deployment context. @@ -150,7 +150,7 @@ </row> <row> <entry> - <xref linkend="qpid_QMan-20Components-20View"/> + <xref linkend="qpid_QMan-Components-View"/> </entry> <entry> Describes QMan components, their interactions and @@ -163,4 +163,4 @@ <!--h2--></section> <!--h1--></section> -</chapter> +</section> diff --git a/doc/book/src/Qpid-Interoperability-Documentation.xml b/doc/book/src/Qpid-Interoperability-Documentation.xml index c67759a335..1bd07dca33 100644 --- a/doc/book/src/Qpid-Interoperability-Documentation.xml +++ b/doc/book/src/Qpid-Interoperability-Documentation.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<chapter><title> Apache Qpid : Qpid Interoperability Documentation </title><section role="h2" id="QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation"><title> Qpid Interoperability Documentation @@ -235,12 +235,14 @@ </entry> </row> </tbody> - </tgroup></table><para> - + </tgroup></table> + + <para id="QpidInteroperabilityDocumentation-1"> 1: Support for these will be in M3 (currently available on trunk). + </para> - 2: C++ Broker uses <xref linkend="qpid_"/> which + <para id="QpidInteroperabilityDocumentation-2">2: C++ Broker uses <ulink url="http://freshmeat.net/projects/cyrussasl/">Cyrus SASL</ulink> which supports CRAM-MD5 and GSSAPI but these have not been tested yet </para> <!--h4--></section> diff --git a/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml b/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml index 9f1fdf34ac..88f80999d4 100644 --- a/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml +++ b/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Qpid JMX Management Console FAQ </title> <!-- @@ -51,7 +51,7 @@ To remedy this issue you can set the _java.rmi.server.hostname_ system property </title> <para> - The <xref linkend="qpid_Management-20Console-20Security"/> page will give you the instructions that you should + The <xref linkend="qpid_Management-Console-Security"/> page will give you the instructions that you should use to set this up. </para> <!--h3--></section> @@ -93,4 +93,4 @@ To remedy this issue you can set the _java.rmi.server.hostname_ system property </para> <!--h3--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml b/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml index 3d309d8831..8143ec4e28 100644 --- a/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml +++ b/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section id="Qpid-JMX-Management-Console-User-Guide"><title> Apache Qpid : Qpid JMX Management Console User Guide </title><section role="h1" id="QpidJMXManagementConsoleUserGuide-QpidJMXManagementConsoleUserGuide"><title> Qpid JMX Management Console User Guide @@ -105,7 +105,8 @@ KeyStore and matching TrustStore. This script can serve as a guide on how to use the Java Keytool security utility to manipulate your own stores, and more information can be found in - the JSSE Reference Guide: <xref linkend="qpid_JSSERefGuide"/> + the JSSE Reference Guide: + <ulink url="http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CustomizingStores">http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CustomizingStores</ulink>. </para><para> Supplying the necessary details to the console is performed by setting the <emphasis>javax.net.ssl.trustStore</emphasis> and @@ -789,4 +790,4 @@ </para> <!--h1--></section> -</chapter> +</section> diff --git a/doc/book/src/Qpid-JMX-Management-Console.xml b/doc/book/src/Qpid-JMX-Management-Console.xml index 8503484f91..c6f471a280 100644 --- a/doc/book/src/Qpid-JMX-Management-Console.xml +++ b/doc/book/src/Qpid-JMX-Management-Console.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<chapter id="Qpid-JMX-Management-Console"> <title> Apache Qpid : Qpid JMX Management Console @@ -42,12 +42,12 @@ JMX. </para> - <xi:include href="Configuring%20Management%20Users.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="Configuring%20Qpid%20JMX%20Management%20Console.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="Management%20Console%20Security.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="Qpid%20JMX%20Management%20Console%20FAQ.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="Qpid%20JMX%20Management%20Console%20User%20Guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="Qpid%20Management%20Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="Configuring-Management-Users.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="Configuring-Qpid-JMX-Management-Console.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="Management-Console-Security.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="Qpid-JMX-Management-Console-FAQ.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="Qpid-JMX-Management-Console-User-Guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="Qpid-Management-Features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <!--h3--></section> <!--h2--></section> </chapter> diff --git a/doc/book/src/Qpid-Java-Broker-Management-CLI.xml b/doc/book/src/Qpid-Java-Broker-Management-CLI.xml index 5c670bb22f..8d6c9aaa8e 100644 --- a/doc/book/src/Qpid-Java-Broker-Management-CLI.xml +++ b/doc/book/src/Qpid-Java-Broker-Management-CLI.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Qpid Java Broker Management CLI </title> <section role="h2" id="QpidJavaBrokerManagementCLI-HowtobuildApacheQpidCLI"><title> @@ -156,4 +156,4 @@ ant compile-tests <!--h3--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Qpid-Java-Build-How-To.xml b/doc/book/src/Qpid-Java-Build-How-To.xml index 8ea8b4c2db..ffb25093ea 100644 --- a/doc/book/src/Qpid-Java-Build-How-To.xml +++ b/doc/book/src/Qpid-Java-Build-How-To.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Qpid Java Build How To </title> @@ -353,7 +353,7 @@ for i in `find . -name build.xml` ; do echo "$i:"; grep module.depends $i ; done What next ? </title> <para> - If you want to run your built Qpid package, see our <xref linkend="qpid_Getting-20Started-20Guide"/> for details of + If you want to run your built Qpid package, see our <xref linkend="qpid_Getting-Started-Guide"/> for details of how to do that. </para><para> If you want to run our tests, you can use the ant test or @@ -362,4 +362,4 @@ for i in `find . -name build.xml` ; do echo "$i:"; grep module.depends $i ; done <!--h2--></section> <!--h1--></section> -</chapter> +</section> diff --git a/doc/book/src/Qpid-Java-FAQ.xml b/doc/book/src/Qpid-Java-FAQ.xml index 181b0a3fcc..ec255dacea 100644 --- a/doc/book/src/Qpid-Java-FAQ.xml +++ b/doc/book/src/Qpid-Java-FAQ.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Qpid Java FAQ </title> @@ -55,7 +55,7 @@ <listitem><para>Persistence using the high performance Berkeley DB Java Edition. The persistence layer is also pluggable should an alternative implementation be required. The BDB store is - available from the <xref linkend="qpid_3rd-20Party-20Libraries"/> page + available from the <xref linkend="qpid_3rd-Party-Libraries"/> page </para></listitem> <listitem><para>Pluggable security using SASL. Any Java SASL provider can be used @@ -168,7 +168,7 @@ at org.apache.qpid.server.security.auth.database.ConfigurationFilePrincipalDatab manifest files to your classpath. </para><para> For more information on running the broker please see our - <xref linkend="qpid_Getting-20Started"/> page. + <xref linkend="Getting-Started"/> page. </para> <!--h3--></section> @@ -178,7 +178,7 @@ at org.apache.qpid.server.security.auth.database.ConfigurationFilePrincipalDatab </title> <para> - Please see the <xref linkend="qpid_Connection-20URL-20Format"/> documentation. + Please see the <xref linkend="qpid_Connection-URL-Format"/> documentation. </para> <!--h3--></section> @@ -203,7 +203,7 @@ at org.apache.qpid.server.security.auth.database.ConfigurationFilePrincipalDatab Queue names may consist of any mixture of digits, letters, and underscores. </para><para> - The <xref linkend="qpid_BindingURLFormat"/> is described in more + The <xref linkend="BindingURLFormat"/> is described in more detail on it's own page. </para> <!--h4--></section> @@ -252,7 +252,7 @@ at org.apache.qpid.server.security.auth.database.ConfigurationFilePrincipalDatab </title> <para> - see <xref linkend="qpid_How-20to-20Use-20JNDI"/> + see <xref linkend="How-to-Use-JNDI"/> </para> <!--h3--></section> @@ -262,8 +262,10 @@ at org.apache.qpid.server.security.auth.database.ConfigurationFilePrincipalDatab </title> <para> - Here is a donated Spring configuration file <xref linkend="qpid_2264.zip"/> which shows the - config for Qpid side by side with Weblogic. HtH ! + Here is a donated Spring configuration file <ulink + url="http://qpid.apache.org/qpid-java-faq.data/appContext.zip">appContext.zip</ulink> + which shows the config for Qpid side by side with + Weblogic. HtH ! </para> <!--h3--></section> @@ -323,13 +325,13 @@ amqj.logging.level qpid-server -c <your_config_file's_path> </para><para> For more detailed information on configuration, please see - <xref linkend="qpid_Qpid-20Design-20--20Configuration"/> + <xref linkend="qpid_Qpid-Design---Configuration"/> </para><para> </para> <!--h3--></section> - <section role="h3" id="QpidJavaFAQ-Whatportsdoesthebrokeruse-3F"><title> + <section role="h3" id="QpidJavaFAQ-Whatportsdoesthebrokeruse"><title> What ports does the broker use? </title> @@ -371,7 +373,7 @@ amqj.logging.level For additional details on what ports the broker uses see <xref linkend="QpidJavaFAQ-Whatportsdoesthebrokeruse"/> FAQ entry. For more detailed information on configuration, please see - <xref linkend="qpid_Qpid-20Design-20--20Configuration"/> + <xref linkend="qpid_Qpid-Design---Configuration"/> </para> <!--h3--></section> @@ -586,7 +588,7 @@ amqj.logging.level <para> There are a number of tuning options available, please see the - <xref linkend="qpid_How-20to-20Tune-20M3-20Java-20Broker-20Performance"/> page for more information. + <xref linkend="How-to-Tune-M3-Java-Broker-Performance"/> page for more information. </para> <!--h3--></section> @@ -678,12 +680,12 @@ amqj.logging.level <para> For general questions, please subscribe to the - users@qpid.apache.org mailing list (<xref linkend="qpid_"/>). + <ulink url="mailto:users@qpid.apache.org">users@qpid.apache.org</ulink> mailing list. </para><para> For development questions, please subscribe to the - dev@qpid.apache.org mailing list (<xref linkend="qpid_"/>). + <ulink url="mailto:dev@qpid.apache.org">dev@qpid.apache.org</ulink> mailing list. </para><para> - More details on these lists are available on our <xref linkend="qpid_Mailing-20Lists"/> + More details on these lists are available on our <xref linkend="qpid_Mailing-Lists"/> page. </para> <!--h3--></section> @@ -693,7 +695,7 @@ amqj.logging.level </title> <para> - You can do this via the <xref linkend="qpid_Qpid-20JMX-20Management-20Console"/>. To + You can do this via the <xref linkend="qpid_Qpid-JMX-Management-Console"/>. To do this simply log in to the management console as an admin user (you need to have created an admin account in the jmxremote.access file first) and then select the 'UserManagement' @@ -705,7 +707,7 @@ amqj.logging.level to be disconnected if they are already connected. </para><para> For more information on the Management Console please see our - <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/> + <xref linkend="Qpid-JMX-Management-Console-User-Guide"/> </para> <!--h3--></section> @@ -740,14 +742,15 @@ amqj.logging.level </title> <para> - I would take a look at the testPassiveTTL in <xref linkend="qpid_TimeToLiveTest.java?revision=683950&view=markup"/> + I would take a look at the testPassiveTTL in + <ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java">TimeToLiveTest.java</ulink> </para><para> The setUp and tearDown methods show how to correctly start up a broker for InVM testing. If you write your tests using a file for the JNDI you can then very easily swap between running your tests InVM and against a real broker. </para><para> - See our <xref linkend="qpid_How-20to-20Use-20JNDI"/> on how to confgure it + See our <xref linkend="How-to-Use-JNDI"/> on how to confgure it </para><para> Basically though you just need to set two System Properites: </para><para> @@ -771,10 +774,10 @@ amqj.logging.level There are two possibilities here: </para><para> 1) The management console can be used to interogate an active - broker and browse the contents of a queue.See the <xref linkend="qpid_Qpid-20JMX-20Management-20Console"/> + broker and browse the contents of a queue.See the <xref linkend="qpid_Qpid-JMX-Management-Console"/> page for further details. </para><para> - 2) The <xref linkend="qpid_MessageStore-20Tool"/> can be used to inspect + 2) The <xref linkend="qpid_MessageStore-Tool"/> can be used to inspect the contents of a persistent message store. Note: this can currently only be used when the broker is offline. </para> @@ -821,7 +824,7 @@ amqj.logging.level </para><para> You may also want to increase the memory allowance to the broker though this will only delay the exception if you are publishing - messages faster than you are consuming. See <xref linkend="qpid_Java-20Environment-20Variables"/> for + messages faster than you are consuming. See <xref linkend="qpid_Java-Environment-Variables"/> for details of changing the memory settings. </para> <!--h3--></section> @@ -899,7 +902,7 @@ java.lang.NullPointerException <para> You have not configured the console's SSL trust store properly, - see <xref linkend="qpid_Management-20Console-20Security"/> for + see <xref linkend="qpid_Management-Console-Security"/> for more details. </para> <!--h3--></section> @@ -923,7 +926,7 @@ java.lang.NullPointerException Transfer accross the network and b) to be fully written to disk. </para><para> These situations require that the default timeout value be - increased. A cilent <xref linkend="qpid_System-20Properties"/> 'amqj.default_syncwrite_timeout' can be set + increased. A cilent <xref linkend="qpid_System-Properties"/> 'amqj.default_syncwrite_timeout' can be set on the client to increase the wait time. The default in 0.5 is 30000 (30s). </para> @@ -935,7 +938,7 @@ java.lang.NullPointerException </title> <para> - See <xref linkend="qpid_Configure-20Broker-20and-20Client-20Heartbeating"/> + See <xref linkend="qpid_Configure-Broker-and-Client-Heartbeating"/> </para> <!--h3--></section> @@ -943,4 +946,4 @@ java.lang.NullPointerException -</chapter> +</section> diff --git a/doc/book/src/Qpid-Management-Features.xml b/doc/book/src/Qpid-Management-Features.xml index 2fb84ff291..c42f28c270 100644 --- a/doc/book/src/Qpid-Management-Features.xml +++ b/doc/book/src/Qpid-Management-Features.xml @@ -20,12 +20,12 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : Qpid Management Features </title> <para> - <emphasis>Management tool:</emphasis> See our <xref linkend="qpid_Qpid-20JMX-20Management-20Console"/> for + <emphasis>Management tool:</emphasis> See our <xref linkend="qpid_Qpid-JMX-Management-Console"/> for details of how to use various console options with the Qpid management features. </para> @@ -152,7 +152,7 @@ </para></listitem> <listitem><para>Dropping a connection. </para></listitem> - <listitem><para>The work for <xref linkend="qpid_Network-20IO-20Interface"/> implies that + <listitem><para>The work for <xref linkend="qpid_Network-IO-Interface"/> implies that there are potentially some additional requirements <orderedlist> <listitem><para>Alert when tcp flow control kicks in @@ -179,8 +179,7 @@ </para></listitem> <listitem><para>Creating a Queue. </para></listitem> - <listitem><para>Deleting a - Queue. + <listitem><para>Deleting a Queue. </para></listitem> </orderedlist> -</chapter> +</section> diff --git a/doc/book/src/Qpid-Management-Framework.xml b/doc/book/src/Qpid-Management-Framework.xml index f82be57317..8afd391e13 100644 --- a/doc/book/src/Qpid-Management-Framework.xml +++ b/doc/book/src/Qpid-Management-Framework.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Qpid Management Framework </title> <itemizedlist> @@ -58,7 +58,7 @@ </itemizedlist> <para> - Please visit the <xref linkend="qpid_QMFv2-20Project-20Page"/> for information + Please visit the <xref linkend="qpid_QMFv2-Project-Page"/> for information about the future of QMF. </para> <section role="h1" id="QpidManagementFramework-WhatIsQMF"><title> @@ -915,10 +915,10 @@ one another. </para><para> A description of the current version of the QMF protocol can be - found at <xref linkend="qpid_QMF-20Protocol"/>. + found at <xref linkend="qpid_QMF-Protocol"/>. </para><para> A proposal for an updated protocol based on map-messages is in - progress and can be found at <xref linkend="qpid_QMF-20Map-20Message-20Protocol"/>. + progress and can be found at <xref linkend="qpid_QMF-Map-Message-Protocol"/>. </para> <!--h1--></section> @@ -928,7 +928,7 @@ </title> <para> - Please see the <xref linkend="qpid_QMF-20Python-20Console-20Tutorial"/> for information about using the console API with + Please see the <xref linkend="qpid_QMF-Python-Console-Tutorial"/> for information about using the console API with Python. </para> <!--h1--></section> @@ -941,4 +941,4 @@ <!--h1--></section> -</chapter> +</section> diff --git a/doc/book/src/Qpid-Troubleshooting-Guide.xml b/doc/book/src/Qpid-Troubleshooting-Guide.xml index 12cbd7ed25..86b0f5fa64 100644 --- a/doc/book/src/Qpid-Troubleshooting-Guide.xml +++ b/doc/book/src/Qpid-Troubleshooting-Guide.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : Qpid Troubleshooting Guide @@ -149,8 +149,8 @@ should always be created at broker startup. If you don't want to use this config, then simply ensure that you consume first from queue before staring to publish to it. See the entry on our - <xref linkend="qpid_Qpid-20Java-20FAQ"/> for more details of using the virtualhosts.xml route. + <xref linkend="qpid_Qpid-Java-FAQ"/> for more details of using the virtualhosts.xml route. </para> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/RASC.xml b/doc/book/src/Running-CPP-Broker.xml index 84a76ebff3..5ab7de02f2 100644 --- a/doc/book/src/RASC.xml +++ b/doc/book/src/Running-CPP-Broker.xml @@ -20,11 +20,12 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> - Apache Qpid : RASC - </title> +<section id="section-Running-a-Qpid-CPP-Broker"> + <title> + Running a Qpid C++ Broker + </title> - <section role="h2" id="RASC-BuildingtheC-5CBrokerandClientLibraries"><title> + <section role="h2" id="RASC-BuildingtheCppBrokerandClientLibraries"><title> Building the C++ Broker and Client Libraries </title> @@ -35,11 +36,11 @@ most cases you will do the following: </para> <programlisting> -[qpidc-0.4]$ ./configure}} +[qpidc-0.4]$ ./configure [qpidc-0.4]$ make </programlisting> <!--h2--></section> - <section role="h2" id="RASC-RunningtheC-5CBroker"><title> + <section role="h2" id="RASC-RunningtheCppBroker"><title> Running the C++ Broker </title> <para> @@ -145,7 +146,7 @@ daemon=yes log-to-syslog=yes </programlisting> <!--h3--></section> - <section role="h3" id="RASC-CanIuseanyLanguageclientwiththeC-5CBroker-3F"><title> + <section role="h3" id="RASC-CanIuseanyLanguageclientwiththeCppBroker-3F"><title> Can I use any Language client with the C++ Broker? </title> @@ -159,13 +160,13 @@ log-to-syslog=yes using the Java client refer to these pages: </para><itemizedlist> <listitem><para> - <xref linkend="qpid_How-20to-20Use-20JNDI"/> + <xref linkend="How-to-Use-JNDI"/> </para></listitem> <listitem><para> - <xref linkend="qpid_URL-20Formats"/> + <xref linkend="qpid_URL-Formats"/> </para></listitem> <listitem><para> - <xref linkend="qpid_Example-20Classes"/> + <xref linkend="qpid_Example-Classes"/> </para></listitem> </itemizedlist> <!--h3--></section> @@ -324,4 +325,4 @@ Store Options: pages (1 read page = 64kiB) </programlisting> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/SSL.xml b/doc/book/src/SSL.xml index 36d0586c80..a90ff03ccc 100644 --- a/doc/book/src/SSL.xml +++ b/doc/book/src/SSL.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : SSL </title> @@ -177,4 +177,4 @@ public void connectSSL(String host, int port, String virtualHost, String usernam </para> <!--h2--></section> <!--h1--></section> -</chapter> +</section> diff --git a/doc/book/src/Starting-a-cluster.xml b/doc/book/src/Starting-a-cluster.xml index c5e77bcac5..7d402d2a6e 100644 --- a/doc/book/src/Starting-a-cluster.xml +++ b/doc/book/src/Starting-a-cluster.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Starting a cluster </title><section role="h1" id="Startingacluster-RunningaQpiddcluster"><title> Running a @@ -222,4 +222,4 @@ qpidd -p5674 --cluster-name=MY_CLUSTER --log-output=cluster0.log -d --no-data-di </para> <!--h2--></section> <!--h1--></section> -</chapter> +</section> diff --git a/doc/book/src/System-Properties.xml b/doc/book/src/System-Properties.xml index 62c4c5e5a6..22682b12e1 100644 --- a/doc/book/src/System-Properties.xml +++ b/doc/book/src/System-Properties.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : System Properties @@ -79,7 +79,7 @@ - <varlistentry> + <varlistentry id="SystemProperties-STRICTAMQPFATAL"> <term>STRICT_AMQP_FATAL</term> <listitem> <variablelist> @@ -414,4 +414,4 @@ </variablelist> </section> </section> -</chapter> +</section> diff --git a/doc/book/src/Use-Priority-Queues.xml b/doc/book/src/Use-Priority-Queues.xml index b9900129cb..80151fbced 100644 --- a/doc/book/src/Use-Priority-Queues.xml +++ b/doc/book/src/Use-Priority-Queues.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Use Priority Queues </title> @@ -111,7 +111,7 @@ </programlisting> <para> The prefetch can be also be adjusted on a per connection basis by - adding a 'maxprefetch' value to the <xref linkend="qpid_Connection-20URL-20Format"/> + adding a 'maxprefetch' value to the <xref linkend="Connection-URL-Format"/> </para> <programlisting> amqp://guest:guest@client1/development?maxprefetch='1'&brokerlist='tcp://localhost:5672' @@ -135,4 +135,4 @@ amqp://guest:guest@client1/development?maxprefetch='1'&brokerlist='tcp://loc </para> <!--h3--></section> <!--h2--></section> -</chapter> +</section> diff --git a/doc/book/src/Using-Broker-Federation.xml b/doc/book/src/Using-Broker-Federation.xml index 61f33c4979..c6ebd061e8 100644 --- a/doc/book/src/Using-Broker-Federation.xml +++ b/doc/book/src/Using-Broker-Federation.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title> +<section><title> Apache Qpid : Using Broker Federation </title><section role="h1" id="UsingBrokerFederation-Introduction"><title> Introduction @@ -29,10 +29,12 @@ Please note: Whereas broker federation was introduced in the M3 milestone release, the discussion in this document is based on the richer capabilities of federation in the M4 release. - </para><para> - This document presents broker federation for the administrative - user. For design and developer information, please see <xref linkend="qpid_Federation-20Design-20Note"/>. </para> +<!-- + <para> + This document presents broker federation for the administrative + user. For design and developer information, please see <xref linkend="qpid_Federation-Design-Note"/>. + </para> --> <!--h1--></section> <section role="h1" id="UsingBrokerFederation-WhatIsBrokerFederation-3F"><title> @@ -699,4 +701,4 @@ qpid-route dynamic add $broker8 $broker6 fed.topic </section> -</chapter> +</section> diff --git a/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml b/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml index ed12f37e94..069841b4c8 100644 --- a/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml +++ b/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<chapter> <title> Apache Qpid : Using Qpid with other JNDI Providers diff --git a/doc/book/src/WCF.xml b/doc/book/src/WCF.xml index 5040ed0177..03ce273cb1 100644 --- a/doc/book/src/WCF.xml +++ b/doc/book/src/WCF.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : WCF </title> @@ -134,4 +134,4 @@ service.Open(); </programlisting> <!--h1--> </section> -</chapter> +</section> diff --git a/doc/book/src/queue-state-replication.xml b/doc/book/src/queue-state-replication.xml index dedcc5ec34..42bbb11f56 100644 --- a/doc/book/src/queue-state-replication.xml +++ b/doc/book/src/queue-state-replication.xml @@ -20,7 +20,7 @@ --> -<chapter xmlns:html="http://www.w3.org/1999/xhtml"> +<section> <title> Apache Qpid : queue state replication </title> @@ -330,4 +330,4 @@ Queue Replication Options: </section> <!--h2--> </section> -</chapter> +</section> diff --git a/doc/book/src/schemas.xml b/doc/book/src/schemas.xml index 0ab56a8bdb..b78cdd5d3c 100644 --- a/doc/book/src/schemas.xml +++ b/doc/book/src/schemas.xml @@ -21,6 +21,12 @@ --> <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0"> + <uri resource="Download.xml" typeId="DocBook"/> + <uri resource="Getting-Started.xml" typeId="DocBook"/> + <uri resource="WCF.xml" typeId="DocBook"/> + <uri resource="Book-Info.xml" typeId="DocBook"/> + <uri resource="Book-Info.xml" typeId="DocBook"/> + <uri resource="Book.xml" uri="../../../../../../../usr/share/xml/docbook5/schema/rng/5.0/docbookxi.rnc"/> <uri resource="queue%20state%20replication.xml" typeId="DocBook"/> <uri resource="queue state replication.xml" typeId="DocBook"/> <uri resource="AMQP Ruby Messaging Client.xml" typeId="DocBook"/> |