Update from trunk r1375509 through r1450773asyncstore

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 69 deletions

diff --git a/cpp/INSTALL b/cpp/INSTALL
index dbd41c7cc1..c503f8de19 100644
--- a/cpp/INSTALL
+++ b/cpp/INSTALL
@@ -10,7 +10,6 @@ Table of Contents
    2.2. How to Install
       2.2.1. Using Package Management Tools
       2.2.2. From Source
-	 a. openais
 	 b. boost
          c. autotools
    2.3. Important Environment Variable Settings
@@ -25,7 +24,7 @@ Table of Contents
 
 1. Introduction
 ===============
-Note that the daemon and client API can be installed separately. 
+Note that the daemon and client API can be installed separately.
 
 This document describes how to build the Qpid/C++ broker and client, either
 from a checkout of the source or from a source distribution, on Linux/UNIX.
@@ -55,13 +54,9 @@ a source distribution:
 to get 1.32 working in the svn tree though that is only recommended as
 a last resort.
 
-Optional cluster functionality requires ONE of:
- * openais <http://openais.org> 	       		(0.80.3)
- * corosync <http://corosync.org>			(1.0.0.rc1)
-
- Optional XML exchange requires:
- * xqilla  <http://xqilla.sourceforge.net/HomePage>     (2.0.0)                                  
- * xerces-c <http://xerces.apache.org/xerces-c/>        (2.7.0)  
+Optional XML exchange requires:
+ * xqilla  <http://xqilla.sourceforge.net/HomePage>     (2.0.0)
+ * xerces-c <http://xerces.apache.org/xerces-c/>        (2.7.0)
 
 Optional SSL support requires:
 * nss <http://www.mozilla.org/projects/security/pki/nss/>
@@ -95,8 +90,8 @@ the following must also be installed:
  * ruby-devel
  * python-devel
  * swig       <http://www.swig.org>                     (1.3.35)
- 
-UUID problems: 
+
+UUID problems:
 In some earlier Linux releases (such as Fedora 11), the uuid/uuid.h
 file is located in the e2fsprogs-devel package instead of
 libuuid-devel. If you are using an older Linux release and run into a
@@ -114,13 +109,6 @@ package management tool. For example on Fedora:
 
  # yum install boost-devel libuuid-devel pkgconfig gcc-c++ make autoconf automake ruby libtool help2man doxygen graphviz
 
-The optional clustering packages changed name in Fedora 10. On Fedora 9 or earlier:
- # yum install openais-devel cman-devel
-On Fedora 10 or later
- # yum install corosync-devel cmanlib-devel
-On Fedora 12 they changed again:
- # yum install corosynclib-devel clusterlib-devel
-
 For SASL and SSL, include
  # yum install cyrus-sasl-devel nss-devel nspr-devel
 
@@ -147,55 +135,9 @@ It is recommended that you create a directory to install them to, for example,
   # ./configure --prefix=~/qpid-tools
   # make install
 
-The exceptions are openais and boost.
-
-a. openais
-==========
-
-If ais is shipped with you platform and you have 0.80.3-x or later, skip
-builing ais
-
-To build ais: Unpack the source distribution and do:
- # make
- # sudo make install DESTDIR=
- # sudo ldconfig
-
-This will install in the standard places (/usr/lib, /usr/include etc.)
-
-Configuring ais:
-
-Edit /etc/ais/openais.conf and modify the "bindnetaddr" setting
-to your hosts IP address. Do not use 127.0.0.1.
+The exception is boost.
 
-Make sure the UDP port set for mcastport in openais.conf (5405 by
-default) is not blocked by your firewall. Disable the firewall or
-configure it to allow this port for UDP.
-
-Finally start the ais daemon (must be done as root):
- # sudo /sbin/aisexec
-
-Note that to run the AIS tests your primary group must be "ais".  You
-can change your primary group with the usermod command or set it
-temporarily with the newgrp command.
-
-Troubleshooting tips:
-
-If aisexec goes into a loop printing "entering GATHER state", verify
-your firewall is allowing UDP traffic on the mcastport set in
-openais.conf.
-
-If aisexec reports "got nodejoin message 127.0.0.1" verify the
-bindnetaddr in openais.conf is an active local IP address.  ifconfig
-will list local addresses.
-
-When aisexec is working correctly, the start-up log messages will end
-with "entering OPERATIONAL state." and "got nodejoin message <ip
-address>" where <ip address> is the local IP address specified for
-bindnetaddr in openais.conf.
-
-For further info on openais http://openais.org/
-
-b. boost
+boost
 ========
  1. Unpack boost-jam.
  2. Add bjam in the unpacked directory to your path.
@@ -358,8 +300,8 @@ To try it out "make doxygen" then open doxygen/html/index.html.
 ==================
 When building, get the following on configure
   configure: error: Package requirements (apr-1 >= 1.2.2) were not met:
-  
+
   No package 'apr-1' found
-  
-The following has not been set 
+
+The following has not been set
   export PKG_CONFIG_PATH=$HOME/qpid-tools/lib/pkgconfig:/usr/lib/pkgconfig