Return-Path: 
 <activemq-commits-return-3197-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 20209 invoked from network); 21 Aug 2006 17:40:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 21 Aug 2006 17:40:55 -0000
Received: (qmail 63680 invoked by uid 500); 21 Aug 2006 17:40:55 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 63664 invoked by uid 500); 21 Aug 2006 17:40:55 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 63655 invoked by uid 99); 21 Aug 2006 17:40:55 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Aug 2006 10:40:55 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Aug 2006 10:40:54 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6E24B1A981A; Mon, 21 Aug 2006 10:40:33 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r433303 - in /incubator/activemq/site: features.html
 masterslave.html
Date: Mon, 21 Aug 2006 17:40:32 -0000
To: activemq-commits@geronimo.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060821174033.6E24B1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: chirino
Date: Mon Aug 21 10:40:32 2006
New Revision: 433303

URL: http://svn.apache.org/viewvc?rev=433303&view=rev
Log:
Latest export from confluence

Modified:
    incubator/activemq/site/features.html
    incubator/activemq/site/masterslave.html

Modified: incubator/activemq/site/features.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/features.html?rev=433303&r1=433302&r2=433303&view=diff
==============================================================================
--- incubator/activemq/site/features.html (original)
+++ incubator/activemq/site/features.html Mon Aug 21 10:40:32 2006
@@ -287,7 +287,10 @@
               <a href="javascript:hideChildren()">Hide Children</a></span>
           </div>
           <div class="greybox" id="children" style="display: none;">
-                                      <a href="http://goopen.org/confluence/display/ACTIVEMQ/Interceptors" title="Interceptors">Interceptors</a>
+                                      <a href="http://goopen.org/confluence/display/ACTIVEMQ/MasterSlave" title="MasterSlave">MasterSlave</a>
+              <span class="smalltext">(ActiveMQ)</span>
+              <br>
+                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/Interceptors" title="Interceptors">Interceptors</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                           <a href="http://goopen.org/confluence/display/ACTIVEMQ/Kaha+Persistence" title="Kaha Persistence">Kaha Persistence</a>
@@ -297,9 +300,6 @@
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                           <a href="http://goopen.org/confluence/display/ACTIVEMQ/Advisory+Message" title="Advisory Message">Advisory Message</a>
-              <span class="smalltext">(ActiveMQ)</span>
-              <br>
-                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/MasterSlave" title="MasterSlave">MasterSlave</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                           <a href="http://goopen.org/confluence/display/ACTIVEMQ/Selectors" title="Selectors">Selectors</a>

Modified: incubator/activemq/site/masterslave.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/masterslave.html?rev=433303&r1=433302&r2=433303&view=diff
==============================================================================
--- incubator/activemq/site/masterslave.html (original)
+++ incubator/activemq/site/masterslave.html Mon Aug 21 10:40:32 2006
@@ -276,18 +276,48 @@
 <!--          
             <div class="pagetitle">MasterSlave</div>
 -->
-            <DIV class="wiki-content"><TABLE cellpadding="5" width="85%" cellspacing="8px" class="noteMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://goopen.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">Apache ActiveMQ 4.0 Feature</B><BR>
-<P>The Master/Slave functionality is only available in the Apache ActiveMQ 4.0 release and above.</P>
+            <DIV class="wiki-content"><H2><A name="MasterSlave-IntroductiontoMaster%2FSlave"></A>Introduction to Master / Slave</H2>
 
-<P>If you are using a shared network file system such as a SAN we recommend a <A href="shared-file-system-master-slave.html" title="Shared File System Master Slave">Shared File System Master Slave</A>. If you are happy to dispense with the high performance journal and are using pure JDBC as your persistence engine then you should use <A href="jdbc-master-slave.html" title="JDBC Master Slave">JDBC Master Slave</A> instead.</P></TD></TR></TABLE>
+<P>Master/Slave is now the recommended way for providing high availabilty and fault tolerance for Apache ActiveMQ. The Master/Slave functionality is only available in the Apache ActiveMQ 4.0 release and above.</P>
 
-<H3><A name="MasterSlave-Introduction"></A>Introduction</H3>
+<P>The following are the different kinds of Master/Slave are available</P>
 
-<P>Master/Slave is now the recommended way for providing high availabilty and simple fault tolerance for Apache ActiveMQ if you are not relying on a shared file system or shared JDBC database (see above).</P>
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Master Slave Type </TH>
+<TH class="confluenceTh"> Requirements </TH>
+<TH class="confluenceTh"> Pros </TH>
+<TH class="confluenceTh"> Cons </TH>
+</TR>
+<TR>
+<TD class="confluenceTd"> Pure Master Slave  </TD>
+<TD class="confluenceTd"> None </TD>
+<TD class="confluenceTd"> No central point of failure </TD>
+<TD class="confluenceTd"> Requires manual restart to bring back a failed master and can only support 1 slave </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="shared-file-system-master-slave.html" title="Shared File System Master Slave">Shared File System Master Slave</A> </TD>
+<TD class="confluenceTd"> A Shared File system such as a SAN </TD>
+<TD class="confluenceTd"> Run as many slaves as required. Automatic recovery of old masters </TD>
+<TD class="confluenceTd"> Requires shared file system </TD>
+</TR>
+<TR>
+<TD class="confluenceTd"> <A href="jdbc-master-slave.html" title="JDBC Master Slave">JDBC Master Slave</A> </TD>
+<TD class="confluenceTd"> A Shared database </TD>
+<TD class="confluenceTd"> Run as many slaves as required. Automatic recovery of old masters </TD>
+<TD class="confluenceTd"> Requires a shared database. Also relatively slow as it cannot use the high performance journal </TD>
+</TR>
+</TBODY></TABLE>
+
+
+<P>If you are using a shared network file system such as a SAN we recommend a <A href="shared-file-system-master-slave.html" title="Shared File System Master Slave">Shared File System Master Slave</A>. If you are happy to dispense with the high performance journal and are using pure JDBC as your persistence engine then you should use <A href="jdbc-master-slave.html" title="JDBC Master Slave">JDBC Master Slave</A> instead.</P>
+
+
+<H3><A name="MasterSlave-PureMasterSlave"></A>Pure Master Slave</H3>
 
-<P>A Master/Slave configuration provides a basic shared nothing, fully replicated toplogy.</P>
+<P>A Pure Master/Slave configuration provides a basic shared nothing, fully replicated toplogy which does not depend on a shared file system or shared database. </P>
 
-<H3><A name="MasterSlave-Howitworks"></A>How it works</H3>
+<H3><A name="MasterSlave-HowPureMaster%2FSlaveworks"></A>How Pure Master/Slave works</H3>
 
 <UL>
 	<LI>A slave of a master broker consumes all message states from the master - messages, acknowledgements and transactional states.<BR>
@@ -321,7 +351,7 @@
 </DIV></DIV>
 <P>The <B>randomize</B> property just disables randomness so that the transport will always try the master first, then the slave if it can&apos;t connect to that. Note that the slave does not accept connections until it becomes the master</P>
 
-<H3><A name="MasterSlave-Limitations"></A>Limitations</H3>
+<H3><A name="MasterSlave-LimitationsofPureMasterSlave"></A>Limitations of Pure Master Slave</H3>
 
 <UL>
 	<LI>Only one slave can be connected to the Master</LI>
@@ -340,7 +370,7 @@
 </UL>
 
 
-<H3><A name="MasterSlave-ConfiguringMasterSlave"></A>Configuring MasterSlave</H3>
+<H3><A name="MasterSlave-ConfiguringPureMasterSlave"></A>Configuring Pure Master Slave</H3>
 
 <P>A master broker doesn&apos;t need any special configuration - it&apos;s a normal broker until a slave broker attaches itself.<BR>
 To identify a broker as a slave - there is just one property to set (see below) as this <SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml" title="Visit page outside Confluence" rel="nofollow">example shows<SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN> - so configuration is nice and easy:</P>
@@ -415,8 +445,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=rajdavies">Rob Davies</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Aug 18, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=34&originalId=9690">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Aug 21, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=34&originalId=9714">view change</A>)
               
       (<A href="http://goopen.org/confluence/pages/editpage.action?pageId=34">edit page</A>)
     </DIV>