activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r376314 [11/14] - /incubator/activemq/site/
Date Thu, 09 Feb 2006 15:13:24 GMT
Added: incubator/activemq/site/MasterSlave
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/MasterSlave?rev=376314&view=auto
==============================================================================
--- incubator/activemq/site/MasterSlave (added)
+++ incubator/activemq/site/MasterSlave Thu Feb  9 07:12:56 2006
@@ -0,0 +1,286 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <head>
+    <link rel="stylesheet" href="site.css" type="text/css">
+
+
+
+    <title>ActiveMQ - MasterSlave</title>
+  </head>
+
+  <body>
+    <table width="100%" id="layout" style="padding:0px;margin0px;border-collapse:collapse;">
+      <tr>
+        <td colspan="3" style="padding:8px;">
+          <table width="100%" id="banner" style="padding:0px;margin:0px">
+            <tr id="header_row">
+              <td align="left" valign="middle" style="padding:0px;margin:0px;">
+                <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org/activemq" rel="nofollow"><img align="absmiddle" border=0 src="images/logo.gif"></a></span></span></span>
+
+              </td>
+              <td align="right" valign="middle" style="padding:0px;margin:0px;">
+                <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org" rel="nofollow"><img align="absmiddle" border=0 src="http://incubator.apache.org/images/apache-incubator-logo.png"></a></span></span></span>
+
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3" id="breadcrumbs">
+          <table width="100%" id="banner" style="padding:0px;margin:0px">
+            <tr>
+              <td align="left">
+                <a href="">Home</a>  | <a href="Navigation">Navigation</a> &gt; MasterSlave
+              </td>
+              <td align="right">
+                  <span id="Content"><span><a href="Download" title="Download">Download</a> | <span class="nobr"><a href="http://activemq.codehaus.org/maven/apidocs/" rel="nofollow">JavaDocs for 4.x</a></span> <span class="nobr"><a href="http://activemq.org/maven/activemq-3/activemq-core/apidocs/" rel="nofollow">3.x</a></span> | <a href="Source" title="Source">Source</a> | <span class="nobr"><a href="http://docs.codehaus.org/pages/listpages.action?key=ACTIVEMQ" rel="nofollow">Wiki</a></span> |<span class="nobr"><a href="irc://irc.codehaus.org/activemq" rel="nofollow">IRC</a></span> | <span class="nobr"><a href="http://servlet.uwyn.com/drone/log/hausbot/activemq" rel="nofollow">IRC Log</a></span> | <a href="Mailing+Lists" title="Mailing Lists">Mailing Lists</a> | <span class="nobr"><a href="http://forums.logicblaze.com/forums/show/1.page" rel="nofollow">Discussion Forum</a></span> | <span class="nobr"><a href="http://jira.logicblaze.com/jira/browse/AMQ" rel="nofollow">Support
 </a></span></span></span>
+
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td id="leftColumn" valign="top" style="padding-top: 0px;">
+          <span id="Content"><h3><a name="Navigation-Overview"></a>Overview</h3>
+  <ul class="alternate" type="square">
+    <li><a href="Home" title="Home">Home</a></li>
+    <li><a href="News" title="News">News</a></li>
+    <li><a href="Changes+in+4.0" title="Changes in 4.0">New in 4.0</a></li>
+    <li><a href="FAQ" title="FAQ">FAQ</a></li>
+    <li><a href="Articles" title="Articles">Articles</a></li>
+    <li><a href="Download" title="Download">Download</a></li>
+  </ul>
+  <h3><a name="Navigation-Community"></a>Community</h3>
+  <ul class="alternate" type="square">
+    <li><span class="nobr"><a href="http://forums.logicblaze.com/forums/show/1.page" rel="nofollow">Discussion Forum</a></span></li>
+    <li><a href="Mailing+Lists" title="Mailing Lists">Mailing Lists</a></li>
+    <li><span class="nobr"><a href="http://gmane.org/find.php?list=activemq" rel="nofollow">News Reader</a></span></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/pages/listpages.action?key=ACTIVEMQ" rel="nofollow">Wiki</a></span></li>
+    <li><a href="Projects+Using+ActiveMQ" title="Projects Using ActiveMQ">Projects Using ActiveMQ</a></li>
+    <li><a href="Users" title="Users">Users</a></li>
+    <li><a href="Contributing" title="Contributing">Contributing</a></li>
+    <li><a href="Team" title="Team">Team</a></li>
+  </ul>
+  <h3><a name="Navigation-UsingActiveMQ"></a>Using ActiveMQ</h3>
+  <ul class="alternate" type="square">
+    <li><a href="Getting+Started" title="Getting Started">Getting Started</a></li>
+    <li><a href="Installation" title="Installation">Installation</a></li>
+    <li><a href="Building" title="Building">Building</a></li>
+    <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
+    <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
+    <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
+    <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
+    <li><a href="Use+Cases" title="Use Cases">Use Cases</a></li>
+    <li><a href="Topologies" title="Topologies">Topologies</a></li>
+    <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
+    <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
+    <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
+  </ul>
+  <h3><a name="Navigation-Features"></a>Features</h3>
+  <ul class="alternate" type="square">
+    <li><a href="JMX" title="JMX">JMX</a></li>
+    <li><a href="Performance" title="Performance">Performance</a></li>
+    <li><a href="Protocols" title="Protocols">Protocols</a></li>
+    <li><a href="Persistence" title="Persistence">Persistence</a></li>
+    <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
+    <li><a href="Clustering" title="Clustering">Clustering</a></li>
+    <li><a href="Discovery" title="Discovery">Discovery</a></li>
+    <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
+    <li><a href="Composite+Destinations" title="Composite Destinations">Composite Destinations</a></li>
+    <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
+    <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
+    <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
+  </ul>
+  <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
+  <ul class="alternate" type="square">
+    <li><a href="Ajax" title="Ajax">Ajax</a></li>
+    <li><a href="Axis+Support" title="Axis Support">Axis Support</a></li>
+    <li><a href="C+Integration" title="C Integration">C Integration</a></li>
+    <li><a href="dot+Net" title="dot Net">.Net Integration</a></li>
+    <li><a href="Geronimo" title="Geronimo">Geronimo</a></li>
+    <li><a href="J2EE" title="J2EE">J2EE</a></li>
+    <li><a href="JBoss+Integration" title="JBoss Integration">JBoss Integration</a></li>
+    <li><a href="JNDI+Support" title="JNDI Support">JNDI Support</a></li>
+    <li><a href="OpenWire" title="OpenWire">OpenWire</a></li>
+    <li><a href="REST" title="REST">REST</a></li>
+    <li><a href="Spring+Support" title="Spring Support">Spring Support</a></li>
+    <li><a href="Stomp" title="Stomp">Stomp</a></li>
+    <li><a href="Tomcat" title="Tomcat">Tomcat</a></li>
+    <li><a href="WSIF" title="WSIF">WSIF</a></li>
+  </ul>
+  <h3><a name="Navigation-Utilities"></a>Utilities</h3>
+  <ul class="alternate" type="square">
+    <li><a href="JCA+Container" title="JCA Container">JCA Container</a></li>
+  </ul>
+  <h3><a name="Navigation-ExternalTools"></a>External Tools</h3>
+  <ul class="alternate" type="square">
+    <li><a href="Hermes+Jms" title="Hermes Jms">Hermes Jms</a></li>
+    <li><a href="Sun+JNDI" title="Sun JNDI">Sun JNDI</a></li>
+    <li><span class="nobr"><a href="http://jakarta.apache.org/jmeter" rel="nofollow">JMeter</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://servicemix.org/" rel="nofollow">ServiceMix</a></span></li>
+    <li><span class="nobr"><a href="http://lingo.codehaus.org/" rel="nofollow">Lingo</a></span></li>
+    <li><span class="nobr"><a href="http://jencks.org/" rel="nofollow">Jencks</a></span></li>
+    <li><span class="nobr"><a href="http://stomp.codehaus.org/" rel="nofollow">Stomp</a></span></li>
+    <li><span class="nobr"><a href="http://activecluster.codehaus.org/" rel="nofollow">ActiveCluster</a></span></li>
+    <li><span class="nobr"><a href="http://activespace.codehaus.org/" rel="nofollow">ActiveSpace</a></span></li>
+    <li><span class="nobr"><a href="http://activesoap.codehaus.org/" rel="nofollow">ActiveSOAP</a></span></li>
+    <li><span class="nobr"><a href="http://www.springframework.org/" rel="nofollow">Spring</a></span></li>
+    <li><span class="nobr"><a href="http://geronimo.apache.org/" rel="nofollow">Geronimo</a></span></li>
+  </ul>
+  <h3><a name="Navigation-Support"></a>Support</h3>
+  <ul class="alternate" type="square">
+    <li><span class="nobr"><a href="http://jira.logicblaze.com/jira/browse/AMQ" rel="nofollow">Issues</a></span></li>
+    <li><span class="nobr"><a href="http://jira.logicblaze.com/jira/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel" rel="nofollow">Roadmap</a></span></li>
+    <li><span class="nobr"><a href="http://jira.logicblaze.com/jira/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel" rel="nofollow">Change log</a></span></li>
+  </ul>
+  <h3><a name="Navigation-Developers"></a>Developers</h3>
+  <ul class="alternate" type="square">
+    <li><a href="Source" title="Source">Source</a></li>
+    <li><a href="Code+Overview" title="Code Overview">Code Overview</a></li>
+    <li><a href="Wire+Protocol" title="Wire Protocol">Wire Protocol</a></li>
+    <li><a href="ActiveMQ+4.0" title="ActiveMQ 4.0">ActiveMQ 4.0</a></li>
+    <li><a href="Becoming+a+committer" title="Becoming a committer">Becoming a committer</a></li>
+    <li><a href="Integration+Tests" title="Integration Tests">Integration Tests</a></li>
+    <li><a href="Benchmark+Tests" title="Benchmark Tests">Benchmark Tests</a></li>
+    <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">JMeter Performance Tests</a></li>
+    <li><a href="Release+Guide" title="Release Guide">Release Guide</a></li>
+    <li><a href="JUnit+Reports" title="JUnit Reports">JUnit Reports</a></li>
+    <li><span class="nobr"><a href="http://activemq.codehaus.org/maven/clover/" rel="nofollow">Clover Report</a></span></li>
+    <li><a href="Source+XRef" title="Source XRef">Source XRef</a></li>
+    <li><a href="Test+Source+XRef" title="Test Source XRef">Test Source XRef</a></li>
+    <li><span class="nobr"><a href="http://activemq.codehaus.org/maven/activemq.xsd.html" rel="nofollow">XSD</a></span></li>
+  </ul>
+  <h3><a name="Navigation-Toolsweuse"></a>Tools we use</h3><span><span class="nobr"><a href="http://www.yourkit.com" rel="nofollow"><img align="absmiddle" border=0 src="http://www.activemq.org/download/attachments/23786/yourkit.jpg"></a></span></span></span>
+
+            <h3 class="heading3">Feeds</h3>
+            <table border="0" cellspacing="4px">
+            <tr>
+              <td align="right">
+                <a href="http://docs.codehaus.org/spaces/rss.action?key=ACTIVEMQ&newPages=false"><img src="http://docs.codehaus.org/images/icons/rss.gif" border="0"></a><br/>
+              </td>
+              <td align="left">
+                <a href="http://docs.codehaus.org/spaces/rss.action?key=ACTIVEMQ&newPages=false">Site</a>
+              </td>
+            </tr>
+            <tr>
+              <td align="right">
+                <a href="http://docs.codehaus.org/spaces/blogrss.action?key=ACTIVEMQ"><img src="http://docs.codehaus.org/images/icons/rss.gif" border="0"></a>
+              </td>
+              <td align="left">
+                <a href="http://docs.codehaus.org/spaces/blogrss.action?key=ACTIVEMQ">News</a>
+              </td>
+            </tr>
+            </table>
+        </td>
+        <td id="rightColumn" valign="top">
+
+          <div id="page_title">
+            <table width="100%">
+              <tr>
+                <td>
+            MasterSlave 
+                </td>
+                <td align="right">
+            
+                </td>
+              </tr>
+            </table>
+          </div>
+
+
+          <div>
+  <div id="Content">
+    <p class="paragraph">
+      <table align="center" border=0 cellpadding=5 cellspacing="8px" class="noteMacro" width="85%">
+        <colgroup>
+          <col width=24>
+          <col>
+        </colgroup>
+        <tr>
+          <td valign="top"><img align="absmiddle" alt="" border=0 height=16 src="http://www.activemq.org/images/icons/emoticons/warning.gif" width=16></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 m5 release and above</p>
+          </td>
+        </tr>
+      </table>
+    </p>
+    <p>&nbsp;</p>
+    <h3><a name="MasterSlave-Introduction"></a>Introduction</h3>
+    <p>Master/Slave is now the recommended way for providing high availabilty and fault tolerance for Apache ActiveMQ.<br> A Master/Slave configuration is ideal for a shared nothing, fully replicated toplogy.</p>
+    <h3><a name="MasterSlave-Howitworks"></a>How it works</h3>
+    <ul>
+      <li>A slave of a master broker consumes all message states from the master - messages, acknowledgements and transactional states.<br> Whilst a Slave is actively connected to the Master - it does not allow or start any network or transport connectors, it's sole purpose is to duplicate the state of the master.</li>
+    </ul>
+    <ul>
+      <li>The master broker will only respond to a client when a message exchange has been successfully passed to the slave. For example, a commit<br> in a clients transaction will not complete until the master and the slave have processed the commit.</li>
+    </ul>
+    <ul>
+      <li>In the event the master fails (e.g. hardware failure) the slave has optionally two modes of operation <ol>
+          <li>starts all it's network and transport connectors - allowing clients connected to the master to resume on the slave.</li>
+          <li>or can be configured to close down. In this mode, the slave is simply used to duplicate state for the master.</li>
+        </ol>
+      </li>
+    </ul>
+    <ul>
+      <li>clients should only use a failover transport for connecting to the master broker - e.g. <b><em>failover://(tcp://masterhost:62001)</em></b><br> The master informs the failover transport on the client the <b><em>URI</em></b> of the slave broker, so in the event of failure the client will automatically<br> re-connect to the slave.</li>
+    </ul>
+    <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>
+    <p class="paragraph">
+      <table class="confluenceTable">
+        <tbody>
+          <tr>
+            <th class="confluenceTh"> Broker Property </th>
+            <th class="confluenceTh"> default </th>
+            <th class="confluenceTh"> Description </th>
+          </tr>
+          <tr>
+            <td class="confluenceTd"> masterConnectorURI </td>
+            <td class="confluenceTd"> null </td>
+            <td class="confluenceTd"> URI to the master broker e.g. <b><em>tcp://masterhost:62001</em></b></td>
+          </tr>
+          <tr>
+            <td class="confluenceTd"> shutdownOnMasterFailure </td>
+            <td class="confluenceTd"> false </td>
+            <td class="confluenceTd"> if true, the slave will shut down if the master fails </td>
+          </tr>
+        </tbody>
+      </table>
+    </p>
+  </div>
+</div>
+
+          &nbsp;
+        </td>
+      </tr>
+      <tr>
+        <td colspan="3" id="footer">
+          <table width="100%"> 
+            <tr>
+              <td align="left" valign="top">
+          
+              </td>
+              <td align="right" valign="top">
+          <a style="color:#999;" href="http://docs.codehaus.org/pages/editpage.action?spaceKey=ACTIVEMQ&title=MasterSlave">[ edit ]</a>
+              </td>
+            </tr>
+          <table>
+        </td>
+      </tr>
+    </table>
+  </body>
+
+</html>
+
+

Modified: incubator/activemq/site/Message+Groups
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Message%2BGroups?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Message+Groups (original)
+++ incubator/activemq/site/Message+Groups Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Message+Redelivery+and+DLQ+Handling
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Message%2BRedelivery%2Band%2BDLQ%2BHandling?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Message+Redelivery+and+DLQ+Handling (original)
+++ incubator/activemq/site/Message+Redelivery+and+DLQ+Handling Thu Feb  9 07:12:56 2006
@@ -18,7 +18,10 @@
                 <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org/activemq" rel="nofollow"><img align="absmiddle" border=0 src="images/logo.gif"></a></span></span></span>
 
               </td>
-              
+              <td align="right" valign="middle" style="padding:0px;margin:0px;">
+                <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org" rel="nofollow"><img align="absmiddle" border=0 src="http://incubator.apache.org/images/apache-incubator-logo.png"></a></span></span></span>
+
+              </td>
             </tr>
           </table>
         </td>
@@ -67,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -75,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -85,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -92,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Multicast+-+Watch+out+for+IPV6+vs+IPV4+support+on+your+operating+system+or+distribution+or+network
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Multicast%2B-%2BWatch%2Bout%2Bfor%2BIPV6%2Bvs%2BIPV4%2Bsupport%2Bon%2Byour%2Boperating%2Bsystem%2Bor%2Bdistribution%2Bor%2Bnetwork?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Multicast+-+Watch+out+for+IPV6+vs+IPV4+support+on+your+operating+system+or+distribution+or+network (original)
+++ incubator/activemq/site/Multicast+-+Watch+out+for+IPV6+vs+IPV4+support+on+your+operating+system+or+distribution+or+network Thu Feb  9 07:12:56 2006
@@ -18,7 +18,10 @@
                 <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org/activemq" rel="nofollow"><img align="absmiddle" border=0 src="images/logo.gif"></a></span></span></span>
 
               </td>
-              
+              <td align="right" valign="middle" style="padding:0px;margin:0px;">
+                <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org" rel="nofollow"><img align="absmiddle" border=0 src="http://incubator.apache.org/images/apache-incubator-logo.png"></a></span></span></span>
+
+              </td>
             </tr>
           </table>
         </td>
@@ -67,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -75,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -85,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -92,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Multiple+consumers+on+a+queue
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Multiple%2Bconsumers%2Bon%2Ba%2Bqueue?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Multiple+consumers+on+a+queue (original)
+++ incubator/activemq/site/Multiple+consumers+on+a+queue Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Navigation
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Navigation?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Navigation (original)
+++ incubator/activemq/site/Navigation Thu Feb  9 07:12:56 2006
@@ -18,7 +18,10 @@
                 <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org/activemq" rel="nofollow"><img align="absmiddle" border=0 src="images/logo.gif"></a></span></span></span>
 
               </td>
-              
+              <td align="right" valign="middle" style="padding:0px;margin:0px;">
+                <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org" rel="nofollow"><img align="absmiddle" border=0 src="http://incubator.apache.org/images/apache-incubator-logo.png"></a></span></span></span>
+
+              </td>
             </tr>
           </table>
         </td>
@@ -67,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -75,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -85,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -92,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">
@@ -222,6 +228,8 @@
       <li><a href="Building" title="Building">Building</a></li>
       <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
       <li><a href="Examples" title="Examples">Examples</a></li>
+      <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+      <li><a href="Hello+World" title="Hello World">Hello World</a></li>
       <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
       <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
       <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -230,8 +238,7 @@
       <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
       <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
       <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-      <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-      <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+      <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
     </ul>
     <h3><a name="Navigation-Features"></a>Features</h3>
     <ul class="alternate" type="square">
@@ -240,6 +247,7 @@
       <li><a href="Protocols" title="Protocols">Protocols</a></li>
       <li><a href="Persistence" title="Persistence">Persistence</a></li>
       <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+      <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
       <li><a href="Clustering" title="Clustering">Clustering</a></li>
       <li><a href="Discovery" title="Discovery">Discovery</a></li>
       <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -247,6 +255,7 @@
       <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
       <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
       <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+      <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
     </ul>
     <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
     <ul class="alternate" type="square">

Modified: incubator/activemq/site/Networks+of+Brokers
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Networks%2Bof%2BBrokers?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Networks+of+Brokers (original)
+++ incubator/activemq/site/Networks+of+Brokers Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/News
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/News?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/News (original)
+++ incubator/activemq/site/News Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/No+suitable+driver
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/No%2Bsuitable%2Bdriver?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/No+suitable+driver (original)
+++ incubator/activemq/site/No+suitable+driver Thu Feb  9 07:12:56 2006
@@ -18,7 +18,10 @@
                 <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org/activemq" rel="nofollow"><img align="absmiddle" border=0 src="images/logo.gif"></a></span></span></span>
 
               </td>
-              
+              <td align="right" valign="middle" style="padding:0px;margin:0px;">
+                <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org" rel="nofollow"><img align="absmiddle" border=0 src="http://incubator.apache.org/images/apache-incubator-logo.png"></a></span></span></span>
+
+              </td>
             </tr>
           </table>
         </td>
@@ -67,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -75,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -85,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -92,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/NoClassDefFoundError+-+org.springframework.core.io.Resource
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/NoClassDefFoundError%2B-%2Borg.springframework.core.io.Resource?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/NoClassDefFoundError+-+org.springframework.core.io.Resource (original)
+++ incubator/activemq/site/NoClassDefFoundError+-+org.springframework.core.io.Resource Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/OpenWire
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/OpenWire?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/OpenWire (original)
+++ incubator/activemq/site/OpenWire Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/OpenWire+C+Client
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/OpenWire%2BC%2BClient?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/OpenWire+C+Client (original)
+++ incubator/activemq/site/OpenWire+C+Client Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/OpenWire+CPP+Client
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/OpenWire%2BCPP%2BClient?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/OpenWire+CPP+Client (original)
+++ incubator/activemq/site/OpenWire+CPP+Client Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/OpenWire+dotNet
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/OpenWire%2BdotNet?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/OpenWire+dotNet (original)
+++ incubator/activemq/site/OpenWire+dotNet Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Outbound+Communication
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Outbound%2BCommunication?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Outbound+Communication (original)
+++ incubator/activemq/site/Outbound+Communication Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Peer+Transport+Reference
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Peer%2BTransport%2BReference?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Peer+Transport+Reference (original)
+++ incubator/activemq/site/Peer+Transport+Reference Thu Feb  9 07:12:56 2006
@@ -18,7 +18,10 @@
                 <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org/activemq" rel="nofollow"><img align="absmiddle" border=0 src="images/logo.gif"></a></span></span></span>
 
               </td>
-              
+              <td align="right" valign="middle" style="padding:0px;margin:0px;">
+                <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org" rel="nofollow"><img align="absmiddle" border=0 src="http://incubator.apache.org/images/apache-incubator-logo.png"></a></span></span></span>
+
+              </td>
             </tr>
           </table>
         </td>
@@ -67,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -75,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -85,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -92,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Per+Destination+Policies
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Per%2BDestination%2BPolicies?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Per+Destination+Policies (original)
+++ incubator/activemq/site/Per+Destination+Policies Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Performance
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Performance?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Performance (original)
+++ incubator/activemq/site/Performance Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Persistence
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Persistence?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Persistence (original)
+++ incubator/activemq/site/Persistence Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">
@@ -211,13 +214,19 @@
         <div class="codeContent"><pre class="code-java">activemq.persistenceAdapter</pre></div>
       </div>
     </p>
-    <p>When running the broker from the command line, we look for the activemq.xml on the classpath unless you specify one to use. e.g.</p>
+    <p>When running the broker from the command line, we look for the activemq.xml on the classpath unless you specify one to use. e.g.<br><b>AMQ 4.x</b></p>
+    <p class="paragraph">
+      <div class="code">
+        <div class="codeContent"><pre class="code-java">activemq xbean:file:myconfig.xml</pre></div>
+      </div>
+    </p>
+    <p><b>AMQ 3.x</b></p>
     <p class="paragraph">
       <div class="code">
         <div class="codeContent"><pre class="code-java">activemq myconfig.xml</pre></div>
       </div>
     </p>
-    <p>or just</p>
+    <p>or just<br><b>AMQ3.x/AMQ4.x</b></p>
     <p class="paragraph">
       <div class="code">
         <div class="codeContent"><pre class="code-java">activemq</pre></div>
@@ -227,13 +236,13 @@
     <p class="paragraph">
       <div class="code">
         <div class="codeContent"><pre class="code-java">&lt;beans xmlns=<span class="code-quote">&quot;http:<span class="code-comment">//activemq.org/config/1.0&quot;</span>&gt;
-</span>  
+</span>
   &lt;broker useJmx=<span class="code-quote">&quot;<span class="code-keyword">true</span>&quot;</span>&gt;
 
-	&lt;!-- In ActiveMQ 4, you can setup destination policies --&gt;  
+ &lt;!-- In ActiveMQ 4, you can setup destination policies --&gt;
     &lt;destinationPolicy&gt;
       &lt;policyMap&gt;&lt;policyEntries&gt;
-        
+
           &lt;policyEntry topic=<span class="code-quote">&quot;FOO.&gt;&quot;</span>&gt;
             &lt;dispatchPolicy&gt;
               &lt;strictOrderDispatchPolicy /&gt;
@@ -245,34 +254,50 @@
 
       &lt;/policyEntries&gt;&lt;/policyMap&gt;
     &lt;/destinationPolicy&gt;
-  
-  
+
+
     &lt;persistenceAdapter&gt;
       &lt;journaledJDBC journalLogFiles=<span class="code-quote">&quot;5&quot;</span> dataDirectory=<span class="code-quote">&quot;../activemq-data&quot;</span>/&gt;
 
     &lt;/persistenceAdapter&gt;
-  
+
     &lt;transportConnectors&gt;
        &lt;transportConnector uri=<span class="code-quote">&quot;tcp:<span class="code-comment">//localhost:61616&quot;</span> discoveryUri=<span class="code-quote">&quot;multicast://<span class="code-keyword">default</span>&quot;</span>/&gt;
-</span>       
+</span>
        &lt;transportConnector uri=<span class="code-quote">&quot;stomp:<span class="code-comment">//localhost:61617&quot;</span>/&gt;
 </span>    &lt;/transportConnectors&gt;
-    
+
     &lt;networkConnectors&gt;
       &lt;!-- by <span class="code-keyword">default</span> just auto discover the other brokers --&gt;
       &lt;networkConnector uri=<span class="code-quote">&quot;multicast:<span class="code-comment">//<span class="code-keyword">default</span>&quot;</span>/&gt;
-</span>      &lt;!--  
+</span>      &lt;!--
       &lt;networkConnector uri=<span class="code-quote">&quot;<span class="code-keyword">static</span>:<span class="code-comment">//(tcp://host1:61616,tcp://host2:61616)&quot;</span>/&gt;
 </span>      --&gt;
     &lt;/networkConnectors&gt;
-    
+
   &lt;/broker&gt;
 &lt;/beans&gt;</pre></div>
       </div>
     </p>
     <p>For more details see the <a href="Getting+Started" title="Getting Started">Getting Started</a> guide.</p>
     <h2><a name="Persistence-JDBCPersistencewithoutJournaling"></a>JDBC Persistence without Journaling</h2>
-    <p>To enable JDBC persistence of JMS messages without journaling, we need to change the message broker's default persistence configuration from</p>
+    <p>To enable JDBC persistence of JMS messages without journaling, we need to change the message broker's default persistence configuration from<br><b>AMQ 4.x</b></p>
+    <p class="paragraph">
+      <div class="code">
+        <div class="codeContent"><pre class="code-java">&lt;persistenceAdapter&gt;
+      &lt;journaledJDBC journalLogFiles=<span class="code-quote">&quot;5&quot;</span> dataDirectory=<span class="code-quote">&quot;../activemq-data&quot;</span>/&gt;
+&lt;/persistenceAdapter&gt;</pre></div>
+      </div>
+    </p>
+    <p>to</p>
+    <p class="paragraph">
+      <div class="code">
+        <div class="codeContent"><pre class="code-java">&lt;persistenceAdapter&gt;
+      &lt;jdbcPersistenceAdapter/&gt;
+&lt;/persistenceAdapter&gt;</pre></div>
+      </div>
+    </p>
+    <p><b>For AMQ 3.x</b></p>
     <p class="paragraph">
       <div class="code">
         <div class="codeContent"><pre class="code-java">&lt;persistence&gt;

Modified: incubator/activemq/site/Persistence+Questions
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Persistence%2BQuestions?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Persistence+Questions (original)
+++ incubator/activemq/site/Persistence+Questions Thu Feb  9 07:12:56 2006
@@ -18,7 +18,10 @@
                 <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org/activemq" rel="nofollow"><img align="absmiddle" border=0 src="images/logo.gif"></a></span></span></span>
 
               </td>
-              
+              <td align="right" valign="middle" style="padding:0px;margin:0px;">
+                <span id="Content"><span><span class="nobr"><a href="http://incubator.apache.org" rel="nofollow"><img align="absmiddle" border=0 src="http://incubator.apache.org/images/apache-incubator-logo.png"></a></span></span></span>
+
+              </td>
             </tr>
           </table>
         </td>
@@ -67,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -75,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -85,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -92,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Projects+Using+ActiveMQ
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Projects%2BUsing%2BActiveMQ?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Projects+Using+ActiveMQ (original)
+++ incubator/activemq/site/Projects+Using+ActiveMQ Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">

Modified: incubator/activemq/site/Protocols
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Protocols?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Protocols (original)
+++ incubator/activemq/site/Protocols Thu Feb  9 07:12:56 2006
@@ -70,6 +70,8 @@
     <li><a href="Building" title="Building">Building</a></li>
     <li><a href="Run+Broker" title="Run Broker">Running a Broker</a></li>
     <li><a href="Examples" title="Examples">Examples</a></li>
+    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
+    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
     <li><a href="How+can+I+monitor+ActiveMQ" title="How can I monitor ActiveMQ">Monitoring the Broker</a></li>
     <li><a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a></li>
     <li><a href="Xml+Reference" title="Xml Reference">Xml Reference</a></li>
@@ -78,8 +80,7 @@
     <li><a href="Configuring+Transports" title="Configuring Transports">Configuring Transports</a></li>
     <li><a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">Embedded Brokers</a></li>
     <li><a href="JMeter+Performance+Tests" title="JMeter Performance Tests">Performance Testing</a></li>
-    <li><a href="Web+Samples" title="Web Samples">Web Samples</a></li>
-    <li><a href="Hello+World" title="Hello World">Hello World</a></li>
+    <li><span class="nobr"><a href="http://docs.codehaus.org/x/yK4" rel="nofollow">Command Line Tools Reference</a></span></li>
   </ul>
   <h3><a name="Navigation-Features"></a>Features</h3>
   <ul class="alternate" type="square">
@@ -88,6 +89,7 @@
     <li><a href="Protocols" title="Protocols">Protocols</a></li>
     <li><a href="Persistence" title="Persistence">Persistence</a></li>
     <li><a href="JDBC+Support" title="JDBC Support">JDBC Support</a></li>
+    <li><a href="MasterSlave" title="MasterSlave">MasterSlave</a></li>
     <li><a href="Clustering" title="Clustering">Clustering</a></li>
     <li><a href="Discovery" title="Discovery">Discovery</a></li>
     <li><a href="Networks+of+Brokers" title="Networks of Brokers">Networks of Brokers</a></li>
@@ -95,6 +97,7 @@
     <li><a href="JMS+Streams" title="JMS Streams">JMS Streams</a></li>
     <li><a href="Advisory+Message" title="Advisory Message">Advisory Message</a></li>
     <li><a href="Resource+Adapter" title="Resource Adapter">JCA 1.5 Resource Adapter</a></li>
+    <li><a href="JMS+to+JMS+Bridge" title="JMS to JMS Bridge">JMS to JMS Bridge</a></li>
   </ul>
   <h3><a name="Navigation-Connectivitiy"></a>Connectivitiy</h3>
   <ul class="alternate" type="square">



Mime
View raw message