Author: chirino
Date: Fri Aug 18 01:40:38 2006
New Revision: 432520
URL: http://svn.apache.org/viewvc?rev=432520&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=432520&r1=432519&r2=432520&view=diff
==============================================================================
--- incubator/activemq/site/features.html (original)
+++ incubator/activemq/site/features.html Fri Aug 18 01:40:38 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/Kaha+Persistence"
title="Kaha Persistence">Kaha Persistence</a>
+ <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>
<span class="smalltext">(ActiveMQ)</span>
<br>
<a
href="http://goopen.org/confluence/display/ACTIVEMQ/JMS+Streams" title="JMS
Streams">JMS Streams</a>
@@ -345,9 +348,6 @@
<span class="smalltext">(ActiveMQ)</span>
<br>
<a
href="http://goopen.org/confluence/display/ACTIVEMQ/Security"
title="Security">Security</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/Persistence"
title="Persistence">Persistence</a>
Modified: incubator/activemq/site/masterslave.html
URL:
http://svn.apache.org/viewvc/incubator/activemq/site/masterslave.html?rev=432520&r1=432519&r2=432520&view=diff
==============================================================================
--- incubator/activemq/site/masterslave.html (original)
+++ incubator/activemq/site/masterslave.html Fri Aug 18 01:40:38 2006
@@ -185,7 +185,7 @@
<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
<LI><A href="axis-support.html" title="Axis Support">Axis
Support</A></LI>
<LI><A href="c-integration.html" title="C Integration">C
Integration</A></LI>
- <LI><A href="activemq-cpp-client.html" title="ActiveMQ CPP
Client">C++ Integration</A></LI>
+ <LI><A href="activemq-c-clients.html" title="ActiveMQ C++
Clients">C++ Integration</A></LI>
<LI><A href="nms.html" title="NMS">C# and .Net Integration</A></LI>
<LI><A href="cms.html" title="CMS">CMS</A></LI>
<LI><A href="geronimo.html" title="Geronimo">Geronimo</A></LI>
@@ -343,7 +343,7 @@
<H3><A name="MasterSlave-ConfiguringMasterSlave"></A>Configuring
MasterSlave</H3>
<P>A master broker doesn't need any special configuration - it'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) and an option - so configuration is nice and easy:</P>
+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>
<DIV class="code"><DIV class="codeContent">
<PRE class="code-xml"><SPAN class="code-tag"><broker
masterConnectorURI=<SPAN
class="code-quote">"tcp://masterhost:62001"</SPAN>
shutdownOnMasterFailure=<SPAN
class="code-quote">"false"</SPAN>></SPAN>
@@ -367,17 +367,28 @@
<TD class="confluenceTd"> false </TD>
<TD class="confluenceTd"> if true, the slave will shut down if the master
fails otherwise the slave will take over as being the new master. The slave
ensures that there is a separate copy of each message and acknowledgement on
another machine which can protect against catastrophic hardware failure. If the
master fails you might want the slave to shut down as well as you may always
want to duplicate messages to 2 physical locations to prevent message loss on
catastrophic data centre or hardware failure. If you would rather the system
keep on running after a master failure then leave this flag as false. </TD>
</TR>
-<TR>
-<TD class="confluenceTd">userName</TD>
-<TD class="confluenceTd"> "" </TD>
-<TD class="confluenceTd"> username used for the masterConnector</TD>
-</TR>
-<TR>
-<TD class="confluenceTd">password</TD>
-<TD class="confluenceTd"> "" </TD>
-<TD class="confluenceTd"> password used for the masterConnector</TD>
-</TR>
-</TBODY></TABLE></DIV>
+</TBODY></TABLE>
+
+<H3><A
name="MasterSlave-ConfiguringtheauthenticationoftheSlave"></A>Configuring the
authentication of the Slave</H3>
+
+<P>In ActiveMQ 4.1 or later you can use a <B><masterConnector/></B>
element as an aternative XML configuration mechanism as shown in the following
<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<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> to
configure the user and password that the slave will use to connect to the
master</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-xml"><SPAN class="code-tag"><broker brokerName=<SPAN
class="code-quote">"slave"</SPAN> persistent=<SPAN
class="code-quote">"false"</SPAN> useJmx=<SPAN
class="code-quote">"false"</SPAN> deleteAllMessagesOnStartup=<SPAN
class="code-quote">"true"</SPAN> xmlns=<SPAN
class="code-quote">"http://activemq.org/config/1.0"</SPAN>></SPAN>
+
+ <SPAN class="code-tag"><transportConnectors></SPAN>
+ <SPAN class="code-tag"><transportConnector uri=<SPAN
class="code-quote">"tcp://localhost:62002"</SPAN>/></SPAN>
+ <SPAN class="code-tag"></transportConnectors></SPAN>
+
+ <SPAN class="code-tag"><services></SPAN>
+ <SPAN class="code-tag"><masterConnector remoteURI= <SPAN
class="code-quote">"tcp://localhost:62001"</SPAN> userName=<SPAN
class="code-quote">"James"</SPAN> password=<SPAN
class="code-quote">"Cheese"</SPAN>/></SPAN>
+ <SPAN class="code-tag"></services></SPAN>
+
+ <SPAN class="code-tag"><persistenceAdapter></SPAN>
+ <SPAN class="code-tag"><kahaPersistenceAdapter dir = <SPAN
class="code-quote">"${basedir}/target/activemq-data/slave"</SPAN>/></SPAN>
+ <SPAN class="code-tag"></persistenceAdapter></SPAN>
+<SPAN class="code-tag"></broker></SPAN></PRE>
+</DIV></DIV></DIV>
<!--
<div class="tabletitle">
@@ -404,8 +415,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 Jul 25, 2006
- (<A
href="http://goopen.org/confluence/pages/diffpages.action?pageId=34&originalId=9177">view
change</A>)
+ last edited by <A
href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James
Strachan</A> on Aug 18, 2006
+ (<A
href="http://goopen.org/confluence/pages/diffpages.action?pageId=34&originalId=9690">view
change</A>)
(<A
href="http://goopen.org/confluence/pages/editpage.action?pageId=34">edit
page</A>)
</DIV>