Initial change to separate virtual hosts into types

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-vhost-refactor@1493675 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 15 insertions, 9 deletions

diff --git a/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml b/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml
index 6f5f1f38ba..bb6d9ecef7 100644
--- a/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml
+++ b/doc/book/src/java-broker/Java-Broker-Concepts-Virtual-Hosts.xml
@@ -45,14 +45,21 @@ with one being configured as the default for clients that can't or don't specify
 messages on durable <emphasis>Queues</emphasis> it contains, as well as the configuration of any durable
 <emphasis>Queues</emphasis>, <emphasis>Exchanges</emphasis>, and <emphasis>Bindings</emphasis> made during its operation.</para>
 <para>
-    The following message stores are currently supported:
+  The Java Broker supports different types of <emphasis>Virtual Host</emphasis>, which providing
+  for different High Availability patterns.  The <emphasis>standard</emphasis> <emphasis>Virtual
+  Host</emphasis> type provides no replication and is designed for standalone environments. It
+  supports a number of different <emphasis>Message Store</emphasis> implementations:
     <itemizedlist>
         <listitem><para><link linkend="Java-Broker-Stores-SQL-Store">JDBC Message Store</link></para></listitem>
         <listitem><para><link linkend="Java-Broker-Stores-Derby-Store">Derby Message Store</link></para></listitem>
         <listitem><para><link linkend="Java-Broker-Stores-BDB-Store">Berkeley DB Message Store</link></para></listitem>
-        <listitem><para><link linkend="Java-Broker-Stores-HA-BDB-Store">Berkeley DB HA Message Store</link></para></listitem>
         <listitem><para><link linkend="Java-Broker-Stores-Memory-Store">Memory Message Store</link></para></listitem>
      </itemizedlist>
 </para>
+<para>
+  The <emphasis>BDB_HA</emphasis> <emphasis>Virtual Host</emphasis> provides clustering for
+  reliability using the HA capabilties of the Oracle Berkeley DB (Java Edition) (see
+  <link linkend="Java-Broker-Stores-HA-BDB-Store">Berkeley DB HA Message Store</link>).
+</para>
 <para>Virtual Hosts configuration is covered in <xref linkend="Java-Broker-Virtual-Hosts"/>.</para>
 </section>
diff --git a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml b/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
index 072effa798..e1c128a6c7 100644
--- a/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
+++ b/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
@@ -305,7 +305,7 @@ $ ./qpid-server -prop "qpid.amqp_port=10000" -prop "qpid.http_port=10001"
 {
   "name" : "Broker",
   "defaultVirtualHost" : "default",
-  "modelVersion" : "1.0",
+  "modelVersion" : "1.1",
   "storeVersion" : 1,
   "authenticationproviders" : [ {
     "name" : "passwordFile",
@@ -332,6 +332,7 @@ $ ./qpid-server -prop "qpid.amqp_port=10000" -prop "qpid.http_port=10001"
   } ],
   "virtualhosts" : [ {
     "name" : "default",
+    "type" : "STANDARD",
     "storePath" : "${qpid.work_dir}/derbystore/default",
     "storeType" : "DERBY"
   } ],
@@ -348,7 +349,7 @@ $ ./qpid-server -prop "qpid.amqp_port=10000" -prop "qpid.http_port=10001"
                 <itemizedlist>
                     <listitem><para>Authentication Provider of type <emphasis>PlainPasswordFile</emphasis> with name "passwordFile"</para></listitem>
                     <listitem><para>Four Port entries: "AMQP", "HTTP", "RMI_REGISTRY", "JMX_CONNECTOR"</para></listitem>
-                    <listitem><para>Virtual Host with name "default" and DERBY message store type at location "${qpid.work_dir}/derbystore/default".</para></listitem>
+                    <listitem><para>A "STANDARD" (i.e. non-HA) Virtual Host with name "default" and DERBY message store type at location "${qpid.work_dir}/derbystore/default".</para></listitem>
                     <listitem><para>Two management plugins: "jmxManagement" of type "MANAGEMENT-JMX" and "httpManagement" of type "MANAGEMENT-HTTP".</para></listitem>
                     <listitem><para>Broker attributes are stored as a root entry.</para></listitem>
                 </itemizedlist>
diff --git a/doc/book/src/java-broker/Java-Broker-High-Availability.xml b/doc/book/src/java-broker/Java-Broker-High-Availability.xml
index ca205a865e..4c0391afec 100644
--- a/doc/book/src/java-broker/Java-Broker-High-Availability.xml
+++ b/doc/book/src/java-broker/Java-Broker-High-Availability.xml
@@ -56,8 +56,6 @@
         do not current offer this feature.</para></footnote> to the new Master and continue their work.</para>
     <para>The Java Broker HA solution is incompatible with the HA solution offered by the CPP Broker.  It is not possible to co-locate Java and CPP
        Brokers within the same cluster.</para>
-    <para>HA is not currently available for those using the the <emphasis role="bold">Derby Store</emphasis> or <emphasis role="bold">Memory
-      Message Store</emphasis>.</para>
   </section>
 
   <section role="h3" id="Java-Broker-High-Availability-TwoNodeCluster">
@@ -302,8 +300,8 @@
   <virtualhost>
     <name>vhostname</name>
     <vhostname>
+      <type>BDB_HA</type>
       <store>
-	<class>org.apache.qpid.server.store.berkeleydb.BDBHAMessageStore</class>
 	<environment-path>${QPID_WORK}/bdbhastore/vhostname</environment-path>
 	<highAvailability>
 	  <groupName>myclustername</groupName>
diff --git a/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml b/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml
index b240d85d4f..b5a2537eac 100644
--- a/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml
+++ b/doc/book/src/java-broker/Java-Broker-Virtual-Hosts.xml
@@ -35,7 +35,7 @@
         <itemizedlist>
             <listitem>
                 <para>
-                    <emphasis>Supplying simply a <link linkend="Java-Broker-Stores">store type</link> and a store path</emphasis>: In this case,
+                    <emphasis>Supplying simply a type, store path, and type specific fields (in the case of a "STANDARD" Virtual Host this is 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>
@@ -44,7 +44,7 @@
                     <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>.
+                    specialised Virtual Host configuration such for the <link linkend="Java-Broker-Stores-HA-BDB-Store">BDB HA Message Store</link>.
                 </para>
             </listitem>
         </itemizedlist>