summaryrefslogtreecommitdiff
path: root/qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-11-19 00:03:57 +0000
committerRobert Gemmell <robbie@apache.org>2012-11-19 00:03:57 +0000
commit72690607cac8beaf7d8041fa8edb9749cdb8d29b (patch)
tree4615b0da4fd91fa8ee026d6156bd305a6d1e536f /qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml
parentfcd807b23701a9de833f2e52c09aab2d383fccf3 (diff)
downloadqpid-python-72690607cac8beaf7d8041fa8edb9749cdb8d29b.tar.gz
QPID-4361, QPID-4443: some small corrections, move the JVM verification to its own section. Update info in the install/download sections about BDB based stores and dependencies following addition of specific store documentation
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1411033 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml')
-rw-r--r--qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml15
1 files changed, 7 insertions, 8 deletions
diff --git a/qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml b/qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml
index 4e6dc2cbce..651389d0ac 100644
--- a/qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Introduction.xml
@@ -45,7 +45,7 @@
<para>JMS 1.1 compliance (Java client).</para>
</listitem>
<listitem>
- <para>Transient and persistent message support</para>
+ <para>Persistent and non-persistent (transient) message support</para>
</listitem>
<listitem>
<para>Supports for all common messaging patterns (point-to-point, publish/subscribe, fan-out
@@ -53,15 +53,14 @@
</listitem>
<listitem>
<para>Transaction support including XA<footnote>
- <para>XA provided by AMQP 0-10 and above</para>
+ <para>XA provided when using AMQP 0-10</para>
</footnote></para>
</listitem>
<listitem>
<para>Supports for all versions of the AMQP protocol</para>
</listitem>
<listitem>
- <para>Automatic translation between the AMQP protocols allowing clients using different AMQP
- versions to communicate</para>
+ <para>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</para>
</listitem>
<listitem>
<para>Pluggable authentication architecture with out-of-the-box support for Kerberos, LDAP,
@@ -70,8 +69,8 @@
<listitem>
<para>Pluggable message store architecture with implementations based on <ulink
url="http://db.apache.org/derby/">Apache Derby</ulink>, <ulink
- url="&oracleBdbProductOverviewUrl;">Oracle BDB</ulink><footnote>
- <para>Oracle BDB JE JAR must be downloaded separately.</para>
+ url="&oracleBdbProductOverviewUrl;">Oracle BDB JE</ulink><footnote>
+ <para>Oracle BDB JE must be downloaded separately.</para>
</footnote>, and Memory Store</para>
</listitem>
<listitem>
@@ -82,8 +81,8 @@
<para>SSL support</para>
</listitem>
<listitem>
- <para>High availability (HA) support<footnote>
- <para>HA currently available to users of the BDB-store only</para>
+ <para>High availability (HA) support.<footnote>
+ <para>HA currently only available to users of the optional BDB JE HA based message store.</para>
</footnote></para>
</listitem>
</itemizedlist>