Author: kwall Date: Tue May 21 14:53:18 2013 New Revision: 1484825 URL: http://svn.apache.org/r1484825 Log: NO-JIRA: [Java Broker Docbook] Corrected vhostname typo in HA example vhost configuration. Also moved documentation of <envConfig> element to BDBMessageStore config section as it applies generally
merged from trunk r1484763 svn merge -c 1484763 https://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/java-broker Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/ (props changed) qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-Virtual-Hosts-Configuration.xml Propchange: qpid/branches/0.22/qpid/doc/book/src/java-broker/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue May 21 14:53:18 2013 @@ -0,0 +1,7 @@ +/qpid/branches/0.5.x-dev/qpid/doc/book/src/java-broker:892761,894875 +/qpid/branches/0.6-release-windows-installer/doc/book/src/java-broker:926803 +/qpid/branches/0.6-release-windows-installer/qpid/doc/book/src/java-broker:926803,927233 +/qpid/branches/java-network-refactor/qpid/doc/book/src/java-broker:805429-825319 +/qpid/branches/qpid-2935/qpid/doc/book/src/java-broker:1061302-1072333 +/qpid/branches/qpid-3346/qpid/doc/book/src/java-broker:1144319-1179855 +/qpid/trunk/qpid/doc/book/src/java-broker:1460552,1461248-1461249,1462138-1462139,1462214,1462646,1464210,1470475,1477554,1478012,1478025,1478041,1478092-1478093,1478373-1478374,1478376,1478385,1478393,1478396-1478397,1478400,1478425,1478434,1478444,1478449,1478520,1478552,1478582,1478736,1478738,1480196,1480672,1483887,1484370,1484417,1484441,1484763 Modified: qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml?rev=1484825&r1=1484824&r2=1484825&view=diff ============================================================================== --- qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml (original) +++ qpid/branches/0.22/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml Tue May 21 14:53:18 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/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=1484825&r1=1484824&r2=1484825&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 Tue May 21 14:53:18 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]
