Author: kwall
Date: Tue May 21 11:29:11 2013
New Revision: 1484763

URL: http://svn.apache.org/r1484763
Log:
NO-JIRA: Corrected vhostname typo in HA example vhost configuration. Also moved 
documentation of <envConfig> element to BDBMessageStore config section as it 
applies generally

Modified:
    qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
    
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml

Modified: 
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml?rev=1484763&r1=1484762&r2=1484763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml 
(original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml 
Tue May 21 11:29:11 2013
@@ -298,25 +298,27 @@
     <example>
       <title>Configuring a VirtualHost to use the BDBHAMessageStore</title>
       <programlisting language="xml"><![CDATA[
-<virtualhost>
-  <name>myhost</name>
-  <myvhost>
-    <store>
-      <class>org.apache.qpid.server.store.berkeleydb.BDBHAMessageStore</class>
-      <environment-path>${work}/bdbhastore</environment-path>
-      <highAvailability>
-        <groupName>myclustername</groupName>
-        <nodeName>mynode1</nodeName>
-        <nodeHostPort>node1host:port</nodeHostPort>
-        <helperHostPort>node1host:port</helperHostPort>
-        <durability>NO_SYNC\,NO_SYNC\,SIMPLE_MAJORITY</durability>
-        <coalescingSync>true|false</coalescingSync>
-        <designatedPrimary>true|false</designatedPrimary>
-      </highAvailability>
-    </store>
-    ...
- </myvhost>
-</virtualhost>]]></programlisting>
+<virtualhosts>
+  <virtualhost>
+    <name>vhostname</name>
+    <vhostname>
+      <store>
+       <class>org.apache.qpid.server.store.berkeleydb.BDBHAMessageStore</class>
+       <environment-path>${QPID_WORK}/bdbhastore/vhostname</environment-path>
+       <highAvailability>
+         <groupName>myclustername</groupName>
+         <nodeName>mynode1</nodeName>
+         <nodeHostPort>node1host:port</nodeHostPort>
+         <helperHostPort>node1host:port</helperHostPort>
+         <durability>NO_SYNC\,NO_SYNC\,SIMPLE_MAJORITY</durability>
+         <coalescingSync>true|false</coalescingSync>
+         <designatedPrimary>true|false</designatedPrimary>
+       </highAvailability>
+      </store>
+      ...
+   </vhostname>
+  </virtualhost>
+</virtualhosts>]]></programlisting>
     </example>
     </para>
     <para>The <varname>groupName</varname> is the name of logical name of the 
cluster.  All nodes within the
@@ -355,26 +357,12 @@
 
     <section role="h4" 
id="Java-Broker-High-Availability-Configuration_BDBEnvVars">
       <title>Passing BDB environment and replication configuration 
options</title>
-      <para>It is possible to pass BDB <ulink 
url="&oracleBdbJavaDocUrl;com/sleepycat/je/EnvironmentConfig.html">
-         environment</ulink> and <ulink 
url="&oracleBdbJavaDocUrl;com/sleepycat/je/rep/ReplicationConfig.html">
-         replication</ulink> configuration options from the virtualhost.xml. 
Environment configuration options are passed using
-         the <varname>envConfig</varname> element, and replication config 
using <varname>repConfig</varname>.</para>
-      <para>For example, to override the BDB environment configuration options 
<varname>je.cleaner.threads</varname> and
-        <varname>je.txn.timeout</varname></para>
-      <programlisting language="xml"><![CDATA[
-         ...
-      </highAvailability>
-      <envConfig>
-        <name>je.cleaner.threads</name>
-        <value>2</value>
-      </envConfig>
-      <envConfig>
-        <name>je.txn.timeout</name>
-        <value>15 min</value>
-      </envConfig>
-      ...
-    </store>]]></programlisting>
-      <para>And to override the BDB replication configuration options 
<varname>je.rep.electionsPrimaryRetries</varname>.</para>
+      <para>It is possible to pass BDB <ulink 
url="&oracleBdbJavaDocUrl;com/sleepycat/je/EnvironmentConfig.html">environment</ulink>
 and
+        <ulink 
url="&oracleBdbJavaDocUrl;com/sleepycat/je/rep/ReplicationConfig.html">replication</ulink>
 configuration options from the
+        virtualhost.xml.</para>
+      <para>Environment configuration options are passed as described in <xref 
linkend="Java-Broker-Stores-BDB-Store-Configuration_BDBEnvVars"/></para>
+      <para>Replication configuration option are passed using 
<varname>repConfig</varname> elements with the <varname>store</varname> 
element.</para>
+      <para>For example, to override the BDB replication configuration option 
<varname>je.rep.electionsPrimaryRetries</varname>.</para>
       <programlisting language="xml"><![CDATA[
          ...
       </highAvailability>

Modified: 
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml?rev=1484763&r1=1484762&r2=1484763&view=diff
==============================================================================
--- 
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml
 (original)
+++ 
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml
 Tue May 21 11:29:11 2013
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE entities [
+<!ENTITY %  entities SYSTEM  "commonEntities.xml">
+%entities;
+]>
 <!--
 
  Licensed to the Apache Software Foundation (ASF) under one
@@ -116,6 +120,36 @@
 </virtualhosts>
     ]]></programlisting>
         </example>
+
+       <section role="h4" 
id="Java-Broker-Stores-BDB-Store-Configuration_BDBEnvVars">
+         <title>Passing BDB environment configuration options</title>
+         <para>It is possible to pass BDB <ulink 
url="&oracleBdbJavaDocUrl;com/sleepycat/je/EnvironmentConfig.html">
+            environment</ulink> from the virtualhost.xml. Environment 
configuration options are passed using
+            <varname>envConfig</varname> elements within the 
<varname>store</varname> element.</para>
+         <para>For example, to override the BDB environment configuration 
options <varname>je.cleaner.threads</varname> and
+           <varname>je.log.fileMax</varname></para>
+         <example>
+           <title>Configuring BDB Environment Configuration</title>
+           <programlisting language="xml"><![CDATA[
+      <store>
+       ...
+       <envConfig>
+         <name>je.cleaner.threads</name>
+         <value>2</value>
+       </envConfig>
+       <envConfig>
+         <name>je.log.fileMax</name>
+         <value>5000000</value>
+       </envConfig>
+         ...
+      </store>]]></programlisting>
+          </example>
+       </section>
+      </section>
+
+      <section role="h3" id="Java-Broker-Stores-BDBHA-Store-Configuration">
+        <title>Configuring BDBHAMessageStore</title>
+        <para>See <xref 
linkend="Java-Broker-High-Availability-Configuration"/></para>
       </section>
 
       <section role="h3" id="Java-Broker-Stores-Derby-Store-Configuration">
@@ -142,7 +176,7 @@
 </virtualhosts>
     ]]></programlisting>
         </example>
-      </section>
+    </section>
 
     <section role="h3" id="Java-Broker-Stores-JDBC-Store-Configuration">
     <title>Configuring JDBCMessageStore</title>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to