You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/05/20 13:35:53 UTC
svn commit: r1484436 [2/2] - in /qpid/branches/0.22/qpid/doc/book: ./
src/java-broker/
Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml?rev=1484436&r1=1484435&r2=1484436&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml Mon May 20 11:35:52 2013
@@ -105,10 +105,6 @@
However, configuring of maximum delivery retries on a queue without DLQ(AlternateExchange) will result in messages
being discarded after the limit is reached.</para>
</section>
- <section role="h2" id="Java-Broker-Queues-OtherTypes-CreateUsingConfig">
- <title>Using configuration</title>
- <para>How to declare queues in the Virtual Host configuration file is described in <xref linkend="Java-Broker-Virtual-Host-Declare-Queues"/>.</para>
- </section>
<section role="h2" id="Java-Broker-Queues-OtherTypes-CreateUsingJmsOrJmx">
<title>Using JMX or AMQP</title>
<para>To create a priority, sorted or LVQ queue programmatically from JMX or using a Qpid
@@ -186,6 +182,10 @@ arguments.put("qpid.queue_sort_key","myh
managedBroker.createNewQueue("myqueue", null, true, arguments);]]></programlisting>
</example>
</section>
+ <section role="h2" id="Java-Broker-Queues-OtherTypes-CreateUsingConfig">
+ <title>Using configuration</title>
+ <para>How to declare queues in the Virtual Host configuration file is described in <xref linkend="Java-Broker-Virtual-Host-Declare-Queues"/>.</para>
+ </section>
</section>
<section role="h2" id="Java-Broker-Queues-OtherTypes-Message-Grouping">
Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml?rev=1484436&r1=1484435&r2=1484436&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Stores-HA-BDB-Store.xml Mon May 20 11:35:52 2013
@@ -48,7 +48,8 @@
<section role="h3" id="Java-Broker-Stores-HA-BDB-Store-Configuration">
<title>Configuration</title>
<para>
- In order to use the BDBHAMessageStore, you must configure it for each VirtualHost desired by updating the store element
+ In order to use the BDBHAMessageStore, you must use a <link linkend="Java-Broker-Virtual-Hosts-Configuration-File">Virtual Host XML configuration file</link>
+ when <link linkend="Java-Broker-Virtual-Hosts-Configuring-Managing">defining a VirtualHost</link>, configuring it for each VirtualHost desired by updating the store element
to specify the associated store class, provide a directory location for the data to be written, and configure the
replication group and policies used by BDB JA HA.
</para>
Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml?rev=1484436&r1=1484435&r2=1484436&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml Mon May 20 11:35:52 2013
@@ -19,43 +19,31 @@
under the License.
-->
+<chapter id="Java-Broker-Virtual-Hosts-Configuration-File">
+ <title>Virtual Host XML configuration file</title>
- <section id="Java-Broker-Virtual-Hosts-Configuration-File">
- <title>Configuring Virtual Host using configuration file</title>
- <para>This section describes how to configure Virtual Host using configuration XML.</para>
- <para>Virtual Host configuration XML can hold configuration for a single Virtual Host or multiple Virtual Hosts.
- When multiple Virtual Hosts are configured a section for the each virtual host needs to be added. It should contain a tag
- having the same name as virtual host.
+ <section id="Java-Broker-Virtual-Hosts-Configuration-File-Introduction">
+ <title>Introduction</title>
+ <para>
+ This chapter describes how to configure Virtual Hosts using an XML file.
</para>
-<programlisting>
-<virtualhosts>
- ...
- <virtualhost> <co id="Java-Broker-Virtual-Hosts-Configuration-Multiple-1"/>
- <name>test</name>
- <test>
- ...
- </test>
- </virtualhost>
-
- <virtualhost> <co id="Java-Broker-Virtual-Hosts-Configuration-Multiple-2"/>
- <name>development</name>
- <development>
- ...
- </development>
- </virtualhost>
- ...
-</virtualhosts>
- </programlisting>
- <calloutlist>
- <callout arearefs="Java-Broker-Virtual-Hosts-Configuration-Multiple-1"><para>A configuration section for a virtual host "test"</para></callout>
- <callout arearefs="Java-Broker-Virtual-Hosts-Configuration-Multiple-2"><para>A configuration section for a virtual host "development"</para></callout>
- </calloutlist>
+ <para>
+ This is no longer the preferred approach for
+ <link linkend="Java-Broker-Virtual-Hosts-Configuring-Managing">defining a VirtualHost</link> and will likely be removed
+ in a future release, however it is currently neccessary to support certain use cases such as per-virtualhost attribute
+ configuration, and specialised store configuration such as for the <link linkend="Java-Broker-Stores-HA-BDB-Store">BDB HA Message Store</link>
+ </para>
+ <para>
+ Each XML Virtual Host configuration file can hold configuration for a single Virtual Host or multiple Virtual Hosts.
+ For an example file (with multiple VirtualHosts), see <xref linkend="Java-Broker-Virtual-Host-Configuration-File-Example"/>
+ </para>
+ </section>
<section id="Java-Broker-Virtual-Hosts-Configuration-File-ACL">
<title>Configuring ACL</title>
<para><xref linkend="Java-Broker-Security-ACLs"/> provides the details of ACL, rules, formats, etc.</para>
<para>
- To apply an ACL on a single virtualhost named <replaceable>test</replaceable>, add the following to the config.xml:
+ To apply an ACL on a single virtualhost named <replaceable>test</replaceable>, add the following to the virtualhosts.xml:
</para>
<programlisting>
@@ -489,7 +477,7 @@
</section>
- <section role="h2" id="Java-Broker-Virtual-Host-Configuration-Example">
+ <section role="h2" id="Java-Broker-Virtual-Host-Configuration-File-Example">
<title>An example of virtual host configuration file</title>
<example>
<title>An example of virtual host configuration file</title>
@@ -502,7 +490,7 @@
<store>
<class>org.apache.qpid.server.store.MemoryMessageStore</class>
<!--<class>org.apache.qpid.server.store.derby.DerbyMessageStore</class>
- <environment-path>${QPID_WORK}/derbystore</environment-path>-->
+ <environment-path>${QPID_WORK}/derbystore/localhost</environment-path>-->
</store>
<housekeeping>
@@ -562,7 +550,7 @@
<store>
<class>org.apache.qpid.server.store.MemoryMessageStore</class>
<!--<class>org.apache.qpid.server.store.derby.DerbyMessageStore</class>
- <environment-path>${QPID_WORK}/derbystore</environment-path>-->
+ <environment-path>${QPID_WORK}/derbystore/development</environment-path>-->
</store>
<queues>
@@ -602,7 +590,7 @@
<store>
<!--<class>org.apache.qpid.server.store.MemoryMessageStore</class>-->
<class>org.apache.qpid.server.store.derby.DerbyMessageStore</class>
- <environment-path>${QPID_WORK}/derbystore</environment-path>
+ <environment-path>${QPID_WORK}/derbystore/test</environment-path>
</store>
<queues>
@@ -640,4 +628,4 @@
</example>
</section>
-</section>
\ No newline at end of file
+</chapter>
Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml?rev=1484436&r1=1484435&r2=1484436&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml Mon May 20 11:35:52 2013
@@ -25,23 +25,29 @@
<section id="Java-Broker-Virtual-Hosts-Configuring-Managing">
<title>Configuring And Managing</title>
- <para>One or more Virtual Hosts can be configured on the Broker. The
- <link linkend="Java-Broker-Configuring-And-Managing-REST-API">REST Management interfaces</link>
- and <link linkend="Java-Broker-Configuring-And-Managing-Web-Console">Web Management Console</link>
- can be used to add and delete Virtual Hosts.</para>
+ <para>
+ One or more Virtual Hosts can be configured on the Broker. The
+ <link linkend="Java-Broker-Configuring-And-Managing-HTTP-Management-Introduction">HTTP management interfaces</link>
+ can be used to add and delete Virtual Hosts.
+ </para>
- <para>A new Virtual Host can be created in two ways by specifying either:
+ <para>A new Virtual Host can be created in two ways:
<itemizedlist>
- <listitem><para>A <link linkend="Java-Broker-Stores">store type</link> and a store path</para></listitem>
- <listitem><para>A path to Virtual Host XML configuration file</para></listitem>
+ <listitem>
+ <para>
+ <emphasis>Supplying simply a <link linkend="Java-Broker-Stores">store type</link> and a store path</emphasis>: In this case,
+ the virtual host attributes are currently derived from default attribute values defined on the broker. This is the preferred approach.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Supplying the path to a <link linkend="Java-Broker-Virtual-Hosts-Configuration-File">Virtual Host XML configuration file</link></emphasis>: In this case, specific per-virtualhost attribute configuration
+ can be set in the file, as well as pre-configuring queues, exchanges, etc. This is no longer the preferred approach and will likely be removed in
+ a future release, however it is currently still neccessary to support certain use-cases such as per-virtualhost attribute configuration, and
+ specialised store configuration such as for the <link linkend="Java-Broker-Stores-HA-BDB-Store">BDB HA Message Store</link>.
+ </para>
+ </listitem>
</itemizedlist>
- In first case the virtual host attributes are derived from Broker global attributes.
- In the second case, the Virtual Host specific configuration can be set in the configuration XML,
- for example, alert thresholds, message store, queues, exchanges, ACL etc. The first way of Virtual Host creation
- is more preferable as it will reduce the burden of configuration changes when migrating to a newer version,
- especially, when the support of Virtual Host configuration XML will be removed. However, the second way
- is the only way at the moment to configure <link linkend="Java-Broker-Stores-HA-BDB-Store">HA Message Store</link>,
- Virtual Host <link linkend="Java-Broker-Security-ACLs">ACL</link> and virtual host specific attributes.
</para>
<para>The following Virtual Host Managing operations are available from
@@ -58,9 +64,6 @@
<listitem><para>Existing Exchange/Queue tabs can be navigated from Virtual Host tab</para></listitem>
</itemizedlist>
</para>
-
</section>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Virtual-Hosts-Configuration.xml"/>
-
</chapter>
Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/commonEntities.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/commonEntities.xml?rev=1484436&r1=1484435&r2=1484436&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/doc/book/src/java-broker/commonEntities.xml (original)
+++ qpid/branches/0.22/qpid/doc/book/src/java-broker/commonEntities.xml Mon May 20 11:35:52 2013
@@ -25,6 +25,11 @@
<!ENTITY qpidCurrentRelease "0.22">
+<!ENTITY windowsBrokerDownloadFileName "qpid-java-broker-&qpidCurrentRelease;.zip">
+<!ENTITY windowsExtractedBrokerDirName "qpid-broker-&qpidCurrentRelease;">
+<!ENTITY unixBrokerDownloadFileName "qpid-java-broker-&qpidCurrentRelease;.tar.gz">
+<!ENTITY unixExtractedBrokerDirName "qpid-broker-&qpidCurrentRelease;">
+
<!-- Oracle javadoc -->
<!ENTITY oracleJdkDocUrl "http://oracle.com/javase/6/docs/api/">
<!ENTITY oracleJeeDocUrl "http://docs.oracle.com/javaee/6/api/">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org