You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/07/26 22:04:44 UTC

svn commit: r425825 [23/39] - in /incubator/activemq/site: ./ 2004/04/13/ 2004/05/26/ 2004/06/23/ 2004/06/25/ 2004/08/17/ 2004/08/19/ 2004/08/23/ 2004/10/07/ 2004/11/02/ 2004/12/20/ 2005/02/03/ 2005/02/25/ 2005/04/11/ 2005/06/06/ 2005/07/04/ 2005/07/13...

Added: incubator/activemq/site/jdbc-master-slave.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/jdbc-master-slave.html?rev=425825&view=auto
==============================================================================
--- incubator/activemq/site/jdbc-master-slave.html (added)
+++ incubator/activemq/site/jdbc-master-slave.html Wed Jul 26 13:04:17 2006
@@ -0,0 +1,439 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+  <HEAD>
+<!--
+    Pier's plugin always overwrites the stylesheet so lets explicitly use another one
+    <link type="text/css" rel="stylesheet" href="autoexport:///ACTIVEMQ/resources/space.css">
+-->
+    <LINK type="text/css" rel="stylesheet" href="resources/site.css">
+    <SCRIPT src="resources/space.js" type="text/javascript"></SCRIPT>
+    <TITLE>
+JDBC Master Slave
+    </TITLE>
+  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+  <BODY onload="init()">
+
+    <!-- Banner -->
+    <DIV id="site-banner">
+
+      <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" class="topbardiv" nowrap="">
+            <IMG border="0" src="http://incubator.apache.org/activemq/images/logo.gif">
+          </TD>
+          <TD align="right" nowrap="">
+            <IMG border="0" src="http://incubator.apache.org/images/apache-incubator-logo.png">
+          </TD>
+        </TR> 
+      </TABLE>
+
+    </DIV>
+
+    <!-- Bread crumbs and Quick Links -->
+    <DIV id="site-navbar">
+      <TABLE border="0" cellpadding="0" cellspacing="0" width="100%">
+        <TR>
+          <TD align="left" valign="middle" nowrap="">
+            <DIV id="site-breadcrumbs">
+<A href="home.html" title="ActiveMQ">ActiveMQ</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="features.html" title="Features">Features</A>&nbsp;&gt;&nbsp;<A href="masterslave.html" title="MasterSlave">MasterSlave</A>&nbsp;&gt;&nbsp;<A href="" title="JDBC Master Slave">JDBC Master Slave</A>
+            </DIV>
+          </TD>
+          <TD align="right" valign="middle" nowrap="">
+            <DIV id="site-quicklinks">
+<P><A href="download.html" title="Download">Download</A> &#124; <SPAN class="nobr"><A href="http://incubator.apache.org/activemq/maven/activemq-core/apidocs/" title="Visit page outside Confluence" rel="nofollow">JavaDocs<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> <A href="javadocs.html" title="JavaDocs">More...</A> &#124; <A href="source.html" title="Source">Source</A> &#124; <A href="site.html" title="Site">Wiki</A> &#124;<SPAN class="nobr"><A href="irc://irc.codehaus.org/activemq" title="Visit page outside Confluence" rel="nofollow">IRC<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> &#124; <SPAN class="nobr"><A href="http://servlet.uwyn.com/drone/log/hausbot/activemq" title="Visit page outside Confluence" rel="nofollow">IRC Log<SUP><IMG cl
 ass="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN> &#124; <A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A> &#124; <A href="discussion-forums.html" title="Discussion Forums">Discussion Forums</A> &#124; <A href="support.html" title="Support">Support</A></P>
+            </DIV>
+          </TD>
+        </TR> 
+      </TABLE>
+    </DIV>
+
+<!-- Integrate google search later.
+          <form name="search" action="http://www.google.com/search" method="get">
+            <input type="hidden" name="ie" value="UTF- 8" />
+            <input type="hidden" name="oe" value="UTF- 8" />
+            <input type="hidden" name="domains" value="" />
+            <input type="hidden" name="sitesearch" value="" />
+            <input type="text" name="q" maxlength="255" value="" />        
+            <input type="submit" name="btnG" value="Google Search" />
+          </form>
+-->
+
+      <DIV id="site-content">
+        <TABLE>
+        <TR>
+        <TD valign="top">
+          <DIV id="site-navigation">
+<H3><A name="Navigation-Overview"></A><A href="overview.html" title="Overview">Overview</A></H3>
+
+<UL class="alternate" type="square">
+	<LI><A href="home.html" title="Home">Home</A></LI>
+	<LI><A href="news.html" title="News">News</A></LI>
+	<LI><A href="new-features.html" title="New Features">New Features</A></LI>
+	<LI><A href="faq.html" title="FAQ">FAQ</A></LI>
+	<LI><A href="site.html" title="Site">Site</A></LI>
+	<LI><A href="articles.html" title="Articles">Articles</A></LI>
+	<LI><A href="download.html" title="Download">Download</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Search"></A>Search</H3>
+
+
+<DIV style="padding: 10px 10px 0px 25px;">
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value=""></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/activemq"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/activemq"></INPUT>
+</FORM>
+</DIV>
+
+
+<H3><A name="Navigation-Community"></A><A href="community.html" title="Community">Community</A></H3>
+
+<UL class="alternate" type="square">
+	<LI><A href="support.html" title="Support">Support</A></LI>
+	<LI><A href="discussion-forums.html" title="Discussion Forums">Discussion Forums</A></LI>
+	<LI><A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A></LI>
+	<LI><SPAN class="nobr"><A href="http://gmane.org/find.php?list=activemq" title="Visit page outside Confluence" rel="nofollow">News Reader<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></LI>
+	<LI><SPAN class="nobr"><A href="navigation.html" title="Visit page outside Confluence" rel="nofollow">Wiki<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></LI>
+	<LI><A href="projects-using-activemq.html" title="Projects Using ActiveMQ">Projects Using ActiveMQ</A></LI>
+	<LI><A href="users.html" title="Users">Users</A></LI>
+	<LI><A href="contributing.html" title="Contributing">Contributing</A></LI>
+	<LI><A href="team.html" title="Team">Team</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Support"></A><A href="support.html" title="Support">Support</A></H3>
+
+<UL class="alternate" type="square">
+	<LI><SPAN class="nobr"><A href="http://issues.apache.org/activemq/browse/AMQ" title="Visit page outside Confluence" rel="nofollow">Issues<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></LI>
+	<LI><SPAN class="nobr"><A href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel" title="Visit page outside Confluence" rel="nofollow">Roadmap<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></LI>
+	<LI><SPAN class="nobr"><A href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel" title="Visit page outside Confluence" rel="nofollow">Change log<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></LI>
+</UL>
+
+
+<H3><A name="Navigation-UsingActiveMQ"></A><A href="using-activemq.html" title="Using ActiveMQ">Using ActiveMQ</A></H3>
+
+<UL class="alternate" type="square">
+	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
+	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
+	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
+	<LI><A href="destination-options.html" title="Destination Options">Destination Options</A></LI>
+	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
+	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
+	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
+	<LI><A href="hello-world.html" title="Hello World">Hello World</A></LI>
+	<LI><A href="use-cases.html" title="Use Cases">Use Cases</A></LI>
+	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
+	<LI><A href="jmeter-performance-tests.html" title="JMeter Performance Tests">Performance Testing</A></LI>
+	<LI><A href="performance-tuning.html" title="Performance Tuning">Performance Tuning</A></LI>
+	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Features"></A><A href="features.html" title="Features">Features</A></H3>
+
+<UL class="alternate" type="square">
+	<LI><A href="cross-language-clients.html" title="Cross Language Clients">Cross Language Clients</A></LI>
+	<LI><A href="jmx.html" title="JMX">JMX</A></LI>
+	<LI><A href="performance.html" title="Performance">Performance</A></LI>
+	<LI><A href="protocols.html" title="Protocols">Protocols</A></LI>
+	<LI><A href="persistence.html" title="Persistence">Persistence</A></LI>
+	<LI><A href="jdbc-support.html" title="JDBC Support">JDBC Support</A></LI>
+	<LI><A href="security.html" title="Security">Security</A></LI>
+	<LI><A href="interceptors.html" title="Interceptors">Interceptors</A></LI>
+	<LI><A href="clustering.html" title="Clustering">Clustering</A></LI>
+	<LI><A href="discovery.html" title="Discovery">Discovery</A></LI>
+	<LI><A href="wildcards.html" title="Wildcards">Wildcard Support</A></LI>
+	<LI><A href="composite-destinations.html" title="Composite Destinations">Composite Destinations</A></LI>
+	<LI><A href="jms-streams.html" title="JMS Streams">JMS Streams</A></LI>
+	<LI><A href="advisory-message.html" title="Advisory Message">Advisory Message</A></LI>
+	<LI><A href="resource-adapter.html" title="Resource Adapter">JCA 1.5 Resource Adapter</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Featuresin4.x"></A>Features in 4.x</H3>
+
+<UL class="alternate" type="square">
+	<LI><A href="message-groups.html" title="Message Groups">Message Groups</A></LI>
+	<LI><A href="masterslave.html" title="MasterSlave">MasterSlave</A></LI>
+	<LI><A href="networks-of-brokers.html" title="Networks of Brokers">Networks of Brokers</A></LI>
+	<LI><A href="exclusive-consumer.html" title="Exclusive Consumer">Exclusive Consumer</A></LI>
+	<LI><A href="total-ordering.html" title="Total Ordering">Total Ordering</A></LI>
+	<LI><A href="consumer-priority.html" title="Consumer Priority">Consumer Priority</A></LI>
+	<LI><A href="retroactive-consumer.html" title="Retroactive Consumer">Retroactive Consumer</A></LI>
+	<LI><A href="jms-to-jms-bridge.html" title="JMS to JMS Bridge">JMS to JMS Bridge</A></LI>
+	<LI><A href="visualisation.html" title="Visualisation">Visualisation</A></LI>
+	<LI><A href="kaha-persistence.html" title="Kaha Persistence">Kaha Persistence</A></LI>
+	<LI><A href="async-sends.html" title="Async Sends">Async Sends</A></LI>
+	<LI><A href="jmsxuserid.html" title="JMSXUserID">JMSXUserID</A></LI>
+	<LI><A href="new-features.html" title="New Features">More New Features</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Connectivity"></A><A href="connectivity.html" title="Connectivity">Connectivity</A></H3>
+
+<UL class="alternate" type="square">
+	<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+&#43; Integration</A></LI>
+	<LI><A href="dot-net.html" title="dot Net">C# and .Net Integration</A></LI>
+	<LI><A href="geronimo.html" title="Geronimo">Geronimo</A></LI>
+	<LI><A href="j2ee.html" title="J2EE">J2EE</A></LI>
+	<LI><A href="jboss-integration.html" title="JBoss Integration">JBoss Integration</A></LI>
+	<LI><SPAN class="nobr"><A href="http://docs.codehaus.org/display/JETTY/Integrating%20with%20ActiveMQ" title="Visit page outside Confluence" rel="nofollow">Jetty<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></LI>
+	<LI><A href="jndi-support.html" title="JNDI Support">JNDI Support</A></LI>
+	<LI><A href="openwire.html" title="OpenWire">OpenWire</A></LI>
+	<LI><A href="rest.html" title="REST">REST</A></LI>
+	<LI><A href="rss-and-atom.html" title="RSS and Atom">RSS and Atom</A></LI>
+	<LI><A href="spring-support.html" title="Spring Support">Spring Support</A></LI>
+	<LI><A href="stomp.html" title="Stomp">Stomp</A></LI>
+	<LI><A href="sun-jndi.html" title="Sun JNDI">Sun JNDI</A></LI>
+	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
+	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
+	<LI><A href="wsif.html" title="WSIF">WSIF</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Tools"></A><A href="tools.html" title="Tools">Tools</A></H3>
+
+<UL class="alternate" type="square">
+	<LI><A href="web-console.html" title="Web Console">Web Console</A></LI>
+	<LI><A href="jca-container.html" title="JCA Container">JCA Container</A></LI>
+	<LI><A href="hermes-jms.html" title="Hermes Jms">Hermes Jms</A></LI>
+	<LI><SPAN class="nobr"><A href="http://jakarta.apache.org/jmeter" title="Visit page outside Confluence" rel="nofollow">JMeter<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></LI>
+</UL>
+
+
+<H3><A name="Navigation-RelatedProjects"></A>Related Projects</H3>
+
+<UL class="alternate" type="square">
+	<LI><SPAN class="nobr"><A href="http://incubator.apache.org/servicemix/" title="Distributed Enterprise Service Bus based on JBI" rel="nofollow">Apache ServiceMix<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></LI>
+	<LI><SPAN class="nobr"><A href="http://lingo.codehaus.org/" title="POJO Remoting using JMS" rel="nofollow">Lingo<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></LI>
+	<LI><SPAN class="nobr"><A href="http://jencks.org/" title="Message Driven POJOs and pooling for JMS and JDBC" rel="nofollow">Jencks<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></LI>
+	<LI><SPAN class="nobr"><A href="http://stomp.codehaus.org/" title="Simple cross language protocol for messaging" rel="nofollow">Stomp<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></LI>
+	<LI><SPAN class="nobr"><A href="http://activecluster.codehaus.org/" title="Visit page outside Confluence" rel="nofollow">ActiveCluster<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></LI>
+	<LI><SPAN class="nobr"><A href="http://activespace.codehaus.org/" title="Visit page outside Confluence" rel="nofollow">ActiveSpace<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></LI>
+	<LI><SPAN class="nobr"><A href="http://www.springframework.org/" title="Visit page outside Confluence" rel="nofollow">Spring<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></LI>
+	<LI><SPAN class="nobr"><A href="http://geronimo.apache.org/" title="Visit page outside Confluence" rel="nofollow">Geronimo<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></LI>
+</UL>
+
+
+<H3><A name="Navigation-Developers"></A><A href="developers.html" title="Developers">Developers</A></H3>
+
+<UL class="alternate" type="square">
+	<LI><A href="source.html" title="Source">Source</A></LI>
+	<LI><A href="building.html" title="Building">Building</A></LI>
+	<LI><A href="developer-guide.html" title="Developer Guide">Developer Guide</A></LI>
+	<LI><A href="becoming-a-committer.html" title="Becoming a committer">Becoming a committer</A></LI>
+	<LI><A href="code-overview.html" title="Code Overview">Code Overview</A></LI>
+	<LI><A href="wire-protocol.html" title="Wire Protocol">Wire Protocol</A></LI>
+	<LI><A href="release-guide.html" title="Release Guide">Release Guide</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Tests"></A>Tests</H3>
+
+<UL class="alternate" type="square">
+	<LI><A href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">Maven2 Performance Plugin</A></LI>
+	<LI><A href="integration-tests.html" title="Integration Tests">Integration Tests</A></LI>
+	<LI><A href="benchmark-tests.html" title="Benchmark Tests">Benchmark Tests</A></LI>
+	<LI><A href="jmeter-performance-tests.html" title="JMeter Performance Tests">JMeter Performance Tests</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-ProjectReports"></A>Project Reports</H3>
+<UL class="alternate" type="square">
+	<LI><A href="junit-reports.html" title="JUnit Reports">JUnit Reports</A></LI>
+	<LI><SPAN class="nobr"><A href="http://activemq.codehaus.org/maven/clover/" title="Visit page outside Confluence" rel="nofollow">Clover Report<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></LI>
+	<LI><A href="source-xref.html" title="Source XRef">Source XRef</A></LI>
+	<LI><A href="test-source-xref.html" title="Test Source XRef">Test Source XRef</A></LI>
+	<LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/" title="Visit page outside Confluence" rel="nofollow">GBuild<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></LI>
+	<LI><SPAN class="nobr"><A href="http://incubator.apache.org/activemq/maven/activemq-core/activemq.xsd.html" title="Visit page outside Confluence" rel="nofollow">XSD<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></LI>
+</UL>
+
+
+<H3><A name="Navigation-Toolsweuse"></A>Tools we use</H3>
+
+<P><SPAN class="nobr"><A href="http://www.yourkit.com/" title="Visit page outside Confluence" rel="nofollow"><IMG src="http://incubator.apache.org/activemq/images/yourkit.jpg" align="absmiddle" border="0"><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><BR>
+[]</P>
+          </DIV>
+        </TD>
+        <TD valign="top">
+          <DIV id="site-page">
+
+<!--          
+            <div class="pagetitle">JDBC Master Slave</div>
+-->
+            <DIV class="wiki-content"><H2><A name="JDBCMasterSlave-JDBCMasterSlave"></A>JDBC Master Slave</H2>
+
+<P>First supported in ActiveMQ version 4.1</P>
+
+<P>If you are using pure JDBC and not using the high performance journal then you are generally relying on your database as your single point of failure and persistence engine. If you do not have really high performance requirements this approach can make a lot of sense as you have a single persistence engine to backup and manage etc.</P>
+
+<H3><A name="JDBCMasterSlave-Startup"></A>Startup</H3>
+
+<P>When using just JDBC as the data source you can use a Master Slave approach, running as many brokers as you wish as this diagram shows. On startup one master grabs an exclusive lock in the broker database - all other brokers are slaves and pause waiting for the exclusive lock.</P>
+
+<P><IMG src="jdbc-master-slave.data/Startup.png" align="absmiddle" border="0"></P>
+
+<P>Clients should be using the <A href="failover-transport-reference.html" title="Failover Transport Reference">Failover Transport</A> to connect to the available brokers. e.g. using a URL something like the following</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-java">failover:(tcp:<SPAN class="code-comment">//broker1:61616,tcp://broker2:61616,tcp://broker3:61616)</SPAN></PRE>
+</DIV></DIV>
+
+<P>Only the master broker starts up its transport connectors and so the clients can only connect to the master.</P>
+
+<H3><A name="JDBCMasterSlave-Masterfailure"></A>Master failure</H3>
+
+<P>If the master looses connection to the database or looses the exclusive lock then it immediately shuts down. If a master shuts down or fails, one of the other slaves will grab the lock and so the topology switches to the following diagram</P>
+
+<P><IMG src="jdbc-master-slave.data/MasterFailed.png" align="absmiddle" border="0"></P>
+
+<P>One of the other other slaves immediately grabs the exclusive lock on the database to them commences becoming the master, starting all of its transport connectors.</P>
+
+<P>Clients loose connection to the stopped master and then the failover transport tries to connect to the available brokers - of which the only one available is the new master.</P>
+
+<H3><A name="JDBCMasterSlave-Masterrestart"></A>Master restart</H3>
+
+<P>At any time you can restart other brokers which join the cluster and start as slaves waiting to become a master if the master is shutdown or a failure occurs. So the following topology is created after a restart of an old master...</P>
+
+<P><IMG src="jdbc-master-slave.data/MasterRestarted.png" align="absmiddle" border="0"></P>
+
+<H3><A name="JDBCMasterSlave-ConfiguringJDBCMasterSlave"></A>Configuring JDBC Master Slave</H3>
+
+<P>By default if you use the <B>&lt;jdbcPersistenceAdapter/&gt;</B> to avoid the high performance journal you will be using JDBC Master Slave by default. You just need to run more than one broker and point the client side URIs to them to get master/slave.</P>
+
+<P>The following example shows how to configure the ActiveMQ broker in JDBC Master Slave mode</P>
+
+<DIV class="code"><DIV class="codeContent">
+<PRE class="code-xml"><SPAN class="code-tag">&lt;beans&gt;</SPAN>
+
+  <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Allows us to use system properties as variables in this configuration file --&gt;</SPAN></SPAN>
+  <SPAN class="code-tag">&lt;bean class=<SPAN class="code-quote">&quot;org.springframework.beans.factory.config.PropertyPlaceholderConfigurer&quot;</SPAN>/&gt;</SPAN>
+  
+  <SPAN class="code-tag">&lt;broker xmlns=<SPAN class="code-quote">&quot;http://activemq.org/config/1.0&quot;</SPAN>&gt;</SPAN>
+  
+    <SPAN class="code-tag">&lt;memoryManager&gt;</SPAN>  
+      <SPAN class="code-tag">&lt;usageManager id=<SPAN class="code-quote">&quot;memory-manager&quot;</SPAN> limitMb=<SPAN class="code-quote">&quot;50&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;/memoryManager&gt;</SPAN>
+
+    <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- In ActiveMQ 4, you can setup destination policies --&gt;</SPAN></SPAN>  
+    <SPAN class="code-tag">&lt;destinationPolicy&gt;</SPAN>
+      <SPAN class="code-tag">&lt;policyMap&gt;</SPAN><SPAN class="code-tag">&lt;policyEntries&gt;</SPAN>
+        
+          <SPAN class="code-tag">&lt;policyEntry topic=<SPAN class="code-quote">&quot;FOO.&gt;</SPAN>&quot;</SPAN>&gt;
+            <SPAN class="code-tag">&lt;dispatchPolicy&gt;</SPAN>
+              <SPAN class="code-tag">&lt;strictOrderDispatchPolicy /&gt;</SPAN>
+            <SPAN class="code-tag">&lt;/dispatchPolicy&gt;</SPAN>
+            <SPAN class="code-tag">&lt;subscriptionRecoveryPolicy&gt;</SPAN>
+              <SPAN class="code-tag">&lt;lastImageSubscriptionRecoveryPolicy /&gt;</SPAN>
+            <SPAN class="code-tag">&lt;/subscriptionRecoveryPolicy&gt;</SPAN>
+          <SPAN class="code-tag">&lt;/policyEntry&gt;</SPAN>
+
+      <SPAN class="code-tag">&lt;/policyEntries&gt;</SPAN><SPAN class="code-tag">&lt;/policyMap&gt;</SPAN>
+    <SPAN class="code-tag">&lt;/destinationPolicy&gt;</SPAN>
+  
+  
+    <SPAN class="code-tag">&lt;persistenceAdapter&gt;</SPAN>
+        <SPAN class="code-tag">&lt;jdbcPersistenceAdapter dataDirectory=<SPAN class="code-quote">&quot;activemq-data&quot;</SPAN>/&gt;</SPAN>
+
+        &lt;!-- 
+        <SPAN class="code-tag">&lt;jdbcPersistenceAdapter dataDirectory=<SPAN class="code-quote">&quot;activemq-data&quot;</SPAN> dataSource=<SPAN class="code-quote">&quot;#oracle-ds&quot;</SPAN>/&gt;</SPAN>
+        --&gt; 
+    <SPAN class="code-tag">&lt;/persistenceAdapter&gt;</SPAN>
+  
+    <SPAN class="code-tag">&lt;transportConnectors&gt;</SPAN>
+       <SPAN class="code-tag">&lt;transportConnector name=<SPAN class="code-quote">&quot;default&quot;</SPAN> uri=<SPAN class="code-quote">&quot;tcp://localhost:61616&quot;</SPAN> discoveryUri=<SPAN class="code-quote">&quot;multicast://default&quot;</SPAN>/&gt;</SPAN>
+       <SPAN class="code-tag">&lt;transportConnector name=<SPAN class="code-quote">&quot;stomp&quot;</SPAN>   uri=<SPAN class="code-quote">&quot;stomp://localhost:61613&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;/transportConnectors&gt;</SPAN>
+    
+    <SPAN class="code-tag">&lt;networkConnectors&gt;</SPAN>
+      &lt;!-- auto discover the other brokers 
+      
+      <SPAN class="code-tag">&lt;networkConnector name=<SPAN class="code-quote">&quot;default&quot;</SPAN> uri=<SPAN class="code-quote">&quot;multicast://default&quot;</SPAN>/&gt;</SPAN>
+      
+      or use static hosts
+      
+      <SPAN class="code-tag">&lt;networkConnector name=<SPAN class="code-quote">&quot;host1 and host2&quot;</SPAN> uri=<SPAN class="code-quote">&quot;static://(tcp://host1:61616,tcp://host2:61616)&quot;</SPAN> failover=<SPAN class="code-quote">&quot;true&quot;</SPAN>/&gt;</SPAN>
+      --&gt;
+    <SPAN class="code-tag">&lt;/networkConnectors&gt;</SPAN>
+    
+  <SPAN class="code-tag">&lt;/broker&gt;</SPAN>
+  
+  <SPAN class="code-tag"><SPAN class="code-comment">&lt;!--  This xbean configuration file supports all the standard spring xml configuration options --&gt;</SPAN></SPAN>
+  
+  <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Postgres DataSource Sample Setup --&gt;</SPAN></SPAN>
+  &lt;!-- 
+  <SPAN class="code-tag">&lt;bean id=<SPAN class="code-quote">&quot;postgres-ds&quot;</SPAN> class=<SPAN class="code-quote">&quot;org.postgresql.ds.PGPoolingDataSource&quot;</SPAN>&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;serverName&quot;</SPAN> value=<SPAN class="code-quote">&quot;localhost&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;databaseName&quot;</SPAN> value=<SPAN class="code-quote">&quot;activemq&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;portNumber&quot;</SPAN> value=<SPAN class="code-quote">&quot;0&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;user&quot;</SPAN> value=<SPAN class="code-quote">&quot;activemq&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;password&quot;</SPAN> value=<SPAN class="code-quote">&quot;activemq&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;dataSourceName&quot;</SPAN> value=<SPAN class="code-quote">&quot;postgres&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;initialConnections&quot;</SPAN> value=<SPAN class="code-quote">&quot;1&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;maxConnections&quot;</SPAN> value=<SPAN class="code-quote">&quot;10&quot;</SPAN>/&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/bean&gt;</SPAN>
+  --&gt;
+  
+  <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- MySql DataSource Sample Setup --&gt;</SPAN></SPAN>
+  &lt;!-- 
+  <SPAN class="code-tag">&lt;bean id=<SPAN class="code-quote">&quot;mysql-ds&quot;</SPAN> class=<SPAN class="code-quote">&quot;org.apache.commons.dbcp.BasicDataSource&quot;</SPAN> destroy-method=<SPAN class="code-quote">&quot;close&quot;</SPAN>&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;driverClassName&quot;</SPAN> value=<SPAN class="code-quote">&quot;com.mysql.jdbc.Driver&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;url&quot;</SPAN> value=<SPAN class="code-quote">&quot;jdbc:mysql://localhost/activemq?relaxAutoCommit=true&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;username&quot;</SPAN> value=<SPAN class="code-quote">&quot;activemq&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;password&quot;</SPAN> value=<SPAN class="code-quote">&quot;activemq&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;poolPreparedStatements&quot;</SPAN> value=<SPAN class="code-quote">&quot;true&quot;</SPAN>/&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/bean&gt;</SPAN>
+  --&gt;  
+   
+  <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Oracle DataSource Sample Setup --&gt;</SPAN></SPAN>
+  &lt;!--
+  <SPAN class="code-tag">&lt;bean id=<SPAN class="code-quote">&quot;oracle-ds&quot;</SPAN> class=<SPAN class="code-quote">&quot;oracle.jdbc.pool.OracleDataSource&quot;</SPAN>&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;URL&quot;</SPAN> value=<SPAN class="code-quote">&quot;jdbc:oracle:thin:@localhost:1521:AMQDB&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;user&quot;</SPAN> value=<SPAN class="code-quote">&quot;scott&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;password&quot;</SPAN> value=<SPAN class="code-quote">&quot;tiger&quot;</SPAN>/&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/bean&gt;</SPAN>
+  --&gt;
+      
+  <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- Embedded Derby DataSource Sample Setup --&gt;</SPAN></SPAN>
+  &lt;!-- 
+  <SPAN class="code-tag">&lt;bean id=<SPAN class="code-quote">&quot;derby-ds&quot;</SPAN> class=<SPAN class="code-quote">&quot;org.apache.derby.jdbc.EmbeddedDataSource&quot;</SPAN>&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;databaseName&quot;</SPAN> value=<SPAN class="code-quote">&quot;derbydb&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;createDatabase&quot;</SPAN> value=<SPAN class="code-quote">&quot;create&quot;</SPAN>/&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/bean&gt;</SPAN>
+  --&gt;  
+
+<SPAN class="code-tag">&lt;/beans&gt;</SPAN></PRE>
+</DIV></DIV>
+
+</DIV>
+          
+                  </DIV>
+        </TD>
+      </TR>
+      </TABLE>     
+      </DIV>
+    </DIV>
+    <DIV id="site-footer">
+          Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A>,
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Jul 21, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=9130&originalId=9153">view change</A>)
+              
+      (<A href="http://goopen.org/confluence/pages/editpage.action?pageId=9130">edit page</A>)
+    </DIV>
+
+  </BODY>
+
+</HTML>
\ No newline at end of file

Modified: incubator/activemq/site/jdbc-support.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/jdbc-support.html?rev=425825&r1=425824&r2=425825&view=diff
==============================================================================
--- incubator/activemq/site/jdbc-support.html (original)
+++ incubator/activemq/site/jdbc-support.html Wed Jul 26 13:04:17 2006
@@ -80,14 +80,14 @@
 <H3><A name="Navigation-Search"></A>Search</H3>
 
 
-<DIV style="padding:10px; padding-left:25; padding-bottom:0px">
-<FORM method="get" action="http://www.google.com/search" style="font-size: 10px">
-<INPUT type="hidden" name="ie" value="UTF-8">
-<INPUT type="hidden" name="oe" value="UTF-8">
-  <INPUT type="text" name="q" size="15" maxlength="255" value=""><BR>
-  <INPUT type="submit" name="btnG" value="Search">
-  <INPUT type="hidden" name="domains" value="incubator.apache.org/activemq">
-  <INPUT type="hidden" name="sitesearch" value="incubator.apache.org/activemq"> 
+<DIV style="padding: 10px 10px 0px 25px;">
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value=""></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/activemq"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/activemq"></INPUT>
 </FORM>
 </DIV>
 
@@ -152,7 +152,7 @@
 	<LI><A href="interceptors.html" title="Interceptors">Interceptors</A></LI>
 	<LI><A href="clustering.html" title="Clustering">Clustering</A></LI>
 	<LI><A href="discovery.html" title="Discovery">Discovery</A></LI>
-	<LI><A href="wildcard.html" title="Wildcard">Wildcard Support</A></LI>
+	<LI><A href="wildcards.html" title="Wildcards">Wildcard Support</A></LI>
 	<LI><A href="composite-destinations.html" title="Composite Destinations">Composite Destinations</A></LI>
 	<LI><A href="jms-streams.html" title="JMS Streams">JMS Streams</A></LI>
 	<LI><A href="advisory-message.html" title="Advisory Message">Advisory Message</A></LI>
@@ -233,28 +233,39 @@
 <UL class="alternate" type="square">
 	<LI><A href="source.html" title="Source">Source</A></LI>
 	<LI><A href="building.html" title="Building">Building</A></LI>
-	<LI><A href="code-overview.html" title="Code Overview">Code Overview</A></LI>
-	<LI><A href="wire-protocol.html" title="Wire Protocol">Wire Protocol</A></LI>
 	<LI><A href="developer-guide.html" title="Developer Guide">Developer Guide</A></LI>
 	<LI><A href="becoming-a-committer.html" title="Becoming a committer">Becoming a committer</A></LI>
-	<LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/" title="Visit page outside Confluence" rel="nofollow">GBuild<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></LI>
-	<LI><A href="integration-tests.html" title="Integration Tests">Integration Tests</A></LI>
+	<LI><A href="code-overview.html" title="Code Overview">Code Overview</A></LI>
+	<LI><A href="wire-protocol.html" title="Wire Protocol">Wire Protocol</A></LI>
+	<LI><A href="release-guide.html" title="Release Guide">Release Guide</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Tests"></A>Tests</H3>
+
+<UL class="alternate" type="square">
 	<LI><A href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">Maven2 Performance Plugin</A></LI>
+	<LI><A href="integration-tests.html" title="Integration Tests">Integration Tests</A></LI>
 	<LI><A href="benchmark-tests.html" title="Benchmark Tests">Benchmark Tests</A></LI>
 	<LI><A href="jmeter-performance-tests.html" title="JMeter Performance Tests">JMeter Performance Tests</A></LI>
-	<LI><A href="release-guide.html" title="Release Guide">Release Guide</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-ProjectReports"></A>Project Reports</H3>
+<UL class="alternate" type="square">
 	<LI><A href="junit-reports.html" title="JUnit Reports">JUnit Reports</A></LI>
 	<LI><SPAN class="nobr"><A href="http://activemq.codehaus.org/maven/clover/" title="Visit page outside Confluence" rel="nofollow">Clover Report<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></LI>
 	<LI><A href="source-xref.html" title="Source XRef">Source XRef</A></LI>
 	<LI><A href="test-source-xref.html" title="Test Source XRef">Test Source XRef</A></LI>
-	<LI><SPAN class="nobr"><A href="http://activemq.codehaus.org/maven/activemq.xsd.html" title="Visit page outside Confluence" rel="nofollow">XSD<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></LI>
+	<LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/" title="Visit page outside Confluence" rel="nofollow">GBuild<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></LI>
+	<LI><SPAN class="nobr"><A href="http://incubator.apache.org/activemq/maven/activemq-core/activemq.xsd.html" title="Visit page outside Confluence" rel="nofollow">XSD<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></LI>
 </UL>
 
 
 <H3><A name="Navigation-Toolsweuse"></A>Tools we use</H3>
 
 <P><SPAN class="nobr"><A href="http://www.yourkit.com/" title="Visit page outside Confluence" rel="nofollow"><IMG src="http://incubator.apache.org/activemq/images/yourkit.jpg" align="absmiddle" border="0"><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><BR>
-<SPAN class="nobr"><A href="http://goopen.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&title=width%3D120,height%3D40!&linkCreation=true&fromPageId=97" title="http://www.ej-technologies.com/products/jprofiler/overview.html" class="createlink"><IMG src="http://incubator.apache.org/activemq/images/logo_jprofiler01.gif" width="120" height="40" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+[]</P>
           </DIV>
         </TD>
         <TD valign="top">

Modified: incubator/activemq/site/jmeter-performance-tests.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/jmeter-performance-tests.html?rev=425825&r1=425824&r2=425825&view=diff
==============================================================================
--- incubator/activemq/site/jmeter-performance-tests.html (original)
+++ incubator/activemq/site/jmeter-performance-tests.html Wed Jul 26 13:04:17 2006
@@ -80,14 +80,14 @@
 <H3><A name="Navigation-Search"></A>Search</H3>
 
 
-<DIV style="padding:10px; padding-left:25; padding-bottom:0px">
-<FORM method="get" action="http://www.google.com/search" style="font-size: 10px">
-<INPUT type="hidden" name="ie" value="UTF-8">
-<INPUT type="hidden" name="oe" value="UTF-8">
-  <INPUT type="text" name="q" size="15" maxlength="255" value=""><BR>
-  <INPUT type="submit" name="btnG" value="Search">
-  <INPUT type="hidden" name="domains" value="incubator.apache.org/activemq">
-  <INPUT type="hidden" name="sitesearch" value="incubator.apache.org/activemq"> 
+<DIV style="padding: 10px 10px 0px 25px;">
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value=""></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/activemq"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/activemq"></INPUT>
 </FORM>
 </DIV>
 
@@ -152,7 +152,7 @@
 	<LI><A href="interceptors.html" title="Interceptors">Interceptors</A></LI>
 	<LI><A href="clustering.html" title="Clustering">Clustering</A></LI>
 	<LI><A href="discovery.html" title="Discovery">Discovery</A></LI>
-	<LI><A href="wildcard.html" title="Wildcard">Wildcard Support</A></LI>
+	<LI><A href="wildcards.html" title="Wildcards">Wildcard Support</A></LI>
 	<LI><A href="composite-destinations.html" title="Composite Destinations">Composite Destinations</A></LI>
 	<LI><A href="jms-streams.html" title="JMS Streams">JMS Streams</A></LI>
 	<LI><A href="advisory-message.html" title="Advisory Message">Advisory Message</A></LI>
@@ -233,28 +233,39 @@
 <UL class="alternate" type="square">
 	<LI><A href="source.html" title="Source">Source</A></LI>
 	<LI><A href="building.html" title="Building">Building</A></LI>
-	<LI><A href="code-overview.html" title="Code Overview">Code Overview</A></LI>
-	<LI><A href="wire-protocol.html" title="Wire Protocol">Wire Protocol</A></LI>
 	<LI><A href="developer-guide.html" title="Developer Guide">Developer Guide</A></LI>
 	<LI><A href="becoming-a-committer.html" title="Becoming a committer">Becoming a committer</A></LI>
-	<LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/" title="Visit page outside Confluence" rel="nofollow">GBuild<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></LI>
-	<LI><A href="integration-tests.html" title="Integration Tests">Integration Tests</A></LI>
+	<LI><A href="code-overview.html" title="Code Overview">Code Overview</A></LI>
+	<LI><A href="wire-protocol.html" title="Wire Protocol">Wire Protocol</A></LI>
+	<LI><A href="release-guide.html" title="Release Guide">Release Guide</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Tests"></A>Tests</H3>
+
+<UL class="alternate" type="square">
 	<LI><A href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">Maven2 Performance Plugin</A></LI>
+	<LI><A href="integration-tests.html" title="Integration Tests">Integration Tests</A></LI>
 	<LI><A href="benchmark-tests.html" title="Benchmark Tests">Benchmark Tests</A></LI>
 	<LI><A href="" title="JMeter Performance Tests">JMeter Performance Tests</A></LI>
-	<LI><A href="release-guide.html" title="Release Guide">Release Guide</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-ProjectReports"></A>Project Reports</H3>
+<UL class="alternate" type="square">
 	<LI><A href="junit-reports.html" title="JUnit Reports">JUnit Reports</A></LI>
 	<LI><SPAN class="nobr"><A href="http://activemq.codehaus.org/maven/clover/" title="Visit page outside Confluence" rel="nofollow">Clover Report<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></LI>
 	<LI><A href="source-xref.html" title="Source XRef">Source XRef</A></LI>
 	<LI><A href="test-source-xref.html" title="Test Source XRef">Test Source XRef</A></LI>
-	<LI><SPAN class="nobr"><A href="http://activemq.codehaus.org/maven/activemq.xsd.html" title="Visit page outside Confluence" rel="nofollow">XSD<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></LI>
+	<LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/" title="Visit page outside Confluence" rel="nofollow">GBuild<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></LI>
+	<LI><SPAN class="nobr"><A href="http://incubator.apache.org/activemq/maven/activemq-core/activemq.xsd.html" title="Visit page outside Confluence" rel="nofollow">XSD<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></LI>
 </UL>
 
 
 <H3><A name="Navigation-Toolsweuse"></A>Tools we use</H3>
 
 <P><SPAN class="nobr"><A href="http://www.yourkit.com/" title="Visit page outside Confluence" rel="nofollow"><IMG src="http://incubator.apache.org/activemq/images/yourkit.jpg" align="absmiddle" border="0"><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><BR>
-<SPAN class="nobr"><A href="http://goopen.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&title=width%3D120,height%3D40!&linkCreation=true&fromPageId=97" title="http://www.ej-technologies.com/products/jprofiler/overview.html" class="createlink"><IMG src="http://incubator.apache.org/activemq/images/logo_jprofiler01.gif" width="120" height="40" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+[]</P>
           </DIV>
         </TD>
         <TD valign="top">

Modified: incubator/activemq/site/jmeter-system-tests.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/jmeter-system-tests.html?rev=425825&r1=425824&r2=425825&view=diff
==============================================================================
--- incubator/activemq/site/jmeter-system-tests.html (original)
+++ incubator/activemq/site/jmeter-system-tests.html Wed Jul 26 13:04:17 2006
@@ -80,14 +80,14 @@
 <H3><A name="Navigation-Search"></A>Search</H3>
 
 
-<DIV style="padding:10px; padding-left:25; padding-bottom:0px">
-<FORM method="get" action="http://www.google.com/search" style="font-size: 10px">
-<INPUT type="hidden" name="ie" value="UTF-8">
-<INPUT type="hidden" name="oe" value="UTF-8">
-  <INPUT type="text" name="q" size="15" maxlength="255" value=""><BR>
-  <INPUT type="submit" name="btnG" value="Search">
-  <INPUT type="hidden" name="domains" value="incubator.apache.org/activemq">
-  <INPUT type="hidden" name="sitesearch" value="incubator.apache.org/activemq"> 
+<DIV style="padding: 10px 10px 0px 25px;">
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value=""></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/activemq"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/activemq"></INPUT>
 </FORM>
 </DIV>
 
@@ -152,7 +152,7 @@
 	<LI><A href="interceptors.html" title="Interceptors">Interceptors</A></LI>
 	<LI><A href="clustering.html" title="Clustering">Clustering</A></LI>
 	<LI><A href="discovery.html" title="Discovery">Discovery</A></LI>
-	<LI><A href="wildcard.html" title="Wildcard">Wildcard Support</A></LI>
+	<LI><A href="wildcards.html" title="Wildcards">Wildcard Support</A></LI>
 	<LI><A href="composite-destinations.html" title="Composite Destinations">Composite Destinations</A></LI>
 	<LI><A href="jms-streams.html" title="JMS Streams">JMS Streams</A></LI>
 	<LI><A href="advisory-message.html" title="Advisory Message">Advisory Message</A></LI>
@@ -233,28 +233,39 @@
 <UL class="alternate" type="square">
 	<LI><A href="source.html" title="Source">Source</A></LI>
 	<LI><A href="building.html" title="Building">Building</A></LI>
-	<LI><A href="code-overview.html" title="Code Overview">Code Overview</A></LI>
-	<LI><A href="wire-protocol.html" title="Wire Protocol">Wire Protocol</A></LI>
 	<LI><A href="developer-guide.html" title="Developer Guide">Developer Guide</A></LI>
 	<LI><A href="becoming-a-committer.html" title="Becoming a committer">Becoming a committer</A></LI>
-	<LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/" title="Visit page outside Confluence" rel="nofollow">GBuild<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></LI>
-	<LI><A href="integration-tests.html" title="Integration Tests">Integration Tests</A></LI>
+	<LI><A href="code-overview.html" title="Code Overview">Code Overview</A></LI>
+	<LI><A href="wire-protocol.html" title="Wire Protocol">Wire Protocol</A></LI>
+	<LI><A href="release-guide.html" title="Release Guide">Release Guide</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Tests"></A>Tests</H3>
+
+<UL class="alternate" type="square">
 	<LI><A href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">Maven2 Performance Plugin</A></LI>
+	<LI><A href="integration-tests.html" title="Integration Tests">Integration Tests</A></LI>
 	<LI><A href="benchmark-tests.html" title="Benchmark Tests">Benchmark Tests</A></LI>
 	<LI><A href="jmeter-performance-tests.html" title="JMeter Performance Tests">JMeter Performance Tests</A></LI>
-	<LI><A href="release-guide.html" title="Release Guide">Release Guide</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-ProjectReports"></A>Project Reports</H3>
+<UL class="alternate" type="square">
 	<LI><A href="junit-reports.html" title="JUnit Reports">JUnit Reports</A></LI>
 	<LI><SPAN class="nobr"><A href="http://activemq.codehaus.org/maven/clover/" title="Visit page outside Confluence" rel="nofollow">Clover Report<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></LI>
 	<LI><A href="source-xref.html" title="Source XRef">Source XRef</A></LI>
 	<LI><A href="test-source-xref.html" title="Test Source XRef">Test Source XRef</A></LI>
-	<LI><SPAN class="nobr"><A href="http://activemq.codehaus.org/maven/activemq.xsd.html" title="Visit page outside Confluence" rel="nofollow">XSD<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></LI>
+	<LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/" title="Visit page outside Confluence" rel="nofollow">GBuild<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></LI>
+	<LI><SPAN class="nobr"><A href="http://incubator.apache.org/activemq/maven/activemq-core/activemq.xsd.html" title="Visit page outside Confluence" rel="nofollow">XSD<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></LI>
 </UL>
 
 
 <H3><A name="Navigation-Toolsweuse"></A>Tools we use</H3>
 
 <P><SPAN class="nobr"><A href="http://www.yourkit.com/" title="Visit page outside Confluence" rel="nofollow"><IMG src="http://incubator.apache.org/activemq/images/yourkit.jpg" align="absmiddle" border="0"><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><BR>
-<SPAN class="nobr"><A href="http://goopen.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&title=width%3D120,height%3D40!&linkCreation=true&fromPageId=97" title="http://www.ej-technologies.com/products/jprofiler/overview.html" class="createlink"><IMG src="http://incubator.apache.org/activemq/images/logo_jprofiler01.gif" width="120" height="40" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+[]</P>
           </DIV>
         </TD>
         <TD valign="top">

Modified: incubator/activemq/site/jms-streams.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/jms-streams.html?rev=425825&r1=425824&r2=425825&view=diff
==============================================================================
--- incubator/activemq/site/jms-streams.html (original)
+++ incubator/activemq/site/jms-streams.html Wed Jul 26 13:04:17 2006
@@ -80,14 +80,14 @@
 <H3><A name="Navigation-Search"></A>Search</H3>
 
 
-<DIV style="padding:10px; padding-left:25; padding-bottom:0px">
-<FORM method="get" action="http://www.google.com/search" style="font-size: 10px">
-<INPUT type="hidden" name="ie" value="UTF-8">
-<INPUT type="hidden" name="oe" value="UTF-8">
-  <INPUT type="text" name="q" size="15" maxlength="255" value=""><BR>
-  <INPUT type="submit" name="btnG" value="Search">
-  <INPUT type="hidden" name="domains" value="incubator.apache.org/activemq">
-  <INPUT type="hidden" name="sitesearch" value="incubator.apache.org/activemq"> 
+<DIV style="padding: 10px 10px 0px 25px;">
+<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
+<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
+<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
+  <INPUT maxlength="255" name="q" size="15" type="text" value=""></INPUT><BR></BR>
+  <INPUT name="btnG" type="submit" value="Search"></INPUT>
+  <INPUT name="domains" type="hidden" value="incubator.apache.org/activemq"></INPUT>
+  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/activemq"></INPUT>
 </FORM>
 </DIV>
 
@@ -152,7 +152,7 @@
 	<LI><A href="interceptors.html" title="Interceptors">Interceptors</A></LI>
 	<LI><A href="clustering.html" title="Clustering">Clustering</A></LI>
 	<LI><A href="discovery.html" title="Discovery">Discovery</A></LI>
-	<LI><A href="wildcard.html" title="Wildcard">Wildcard Support</A></LI>
+	<LI><A href="wildcards.html" title="Wildcards">Wildcard Support</A></LI>
 	<LI><A href="composite-destinations.html" title="Composite Destinations">Composite Destinations</A></LI>
 	<LI><A href="" title="JMS Streams">JMS Streams</A></LI>
 	<LI><A href="advisory-message.html" title="Advisory Message">Advisory Message</A></LI>
@@ -233,28 +233,39 @@
 <UL class="alternate" type="square">
 	<LI><A href="source.html" title="Source">Source</A></LI>
 	<LI><A href="building.html" title="Building">Building</A></LI>
-	<LI><A href="code-overview.html" title="Code Overview">Code Overview</A></LI>
-	<LI><A href="wire-protocol.html" title="Wire Protocol">Wire Protocol</A></LI>
 	<LI><A href="developer-guide.html" title="Developer Guide">Developer Guide</A></LI>
 	<LI><A href="becoming-a-committer.html" title="Becoming a committer">Becoming a committer</A></LI>
-	<LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/" title="Visit page outside Confluence" rel="nofollow">GBuild<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></LI>
-	<LI><A href="integration-tests.html" title="Integration Tests">Integration Tests</A></LI>
+	<LI><A href="code-overview.html" title="Code Overview">Code Overview</A></LI>
+	<LI><A href="wire-protocol.html" title="Wire Protocol">Wire Protocol</A></LI>
+	<LI><A href="release-guide.html" title="Release Guide">Release Guide</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-Tests"></A>Tests</H3>
+
+<UL class="alternate" type="square">
 	<LI><A href="activemq-performance-module-users-manual.html" title="ActiveMQ Performance Module Users Manual">Maven2 Performance Plugin</A></LI>
+	<LI><A href="integration-tests.html" title="Integration Tests">Integration Tests</A></LI>
 	<LI><A href="benchmark-tests.html" title="Benchmark Tests">Benchmark Tests</A></LI>
 	<LI><A href="jmeter-performance-tests.html" title="JMeter Performance Tests">JMeter Performance Tests</A></LI>
-	<LI><A href="release-guide.html" title="Release Guide">Release Guide</A></LI>
+</UL>
+
+
+<H3><A name="Navigation-ProjectReports"></A>Project Reports</H3>
+<UL class="alternate" type="square">
 	<LI><A href="junit-reports.html" title="JUnit Reports">JUnit Reports</A></LI>
 	<LI><SPAN class="nobr"><A href="http://activemq.codehaus.org/maven/clover/" title="Visit page outside Confluence" rel="nofollow">Clover Report<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></LI>
 	<LI><A href="source-xref.html" title="Source XRef">Source XRef</A></LI>
 	<LI><A href="test-source-xref.html" title="Test Source XRef">Test Source XRef</A></LI>
-	<LI><SPAN class="nobr"><A href="http://activemq.codehaus.org/maven/activemq.xsd.html" title="Visit page outside Confluence" rel="nofollow">XSD<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></LI>
+	<LI><SPAN class="nobr"><A href="http://ci.gbuild.org/continuum/" title="Visit page outside Confluence" rel="nofollow">GBuild<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></LI>
+	<LI><SPAN class="nobr"><A href="http://incubator.apache.org/activemq/maven/activemq-core/activemq.xsd.html" title="Visit page outside Confluence" rel="nofollow">XSD<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></LI>
 </UL>
 
 
 <H3><A name="Navigation-Toolsweuse"></A>Tools we use</H3>
 
 <P><SPAN class="nobr"><A href="http://www.yourkit.com/" title="Visit page outside Confluence" rel="nofollow"><IMG src="http://incubator.apache.org/activemq/images/yourkit.jpg" align="absmiddle" border="0"><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><BR>
-<SPAN class="nobr"><A href="http://goopen.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&title=width%3D120,height%3D40!&linkCreation=true&fromPageId=97" title="http://www.ej-technologies.com/products/jprofiler/overview.html" class="createlink"><IMG src="http://incubator.apache.org/activemq/images/logo_jprofiler01.gif" width="120" height="40" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+[]</P>
           </DIV>
         </TD>
         <TD valign="top">