activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r376314 [12/14] - /incubator/activemq/site/
Date Thu, 09 Feb 2006 15:13:24 GMT
Modified: incubator/activemq/site/QoS
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/QoS?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/QoS (original)
+++ incubator/activemq/site/QoS 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/QuickLinks
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/QuickLinks?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/QuickLinks (original)
+++ incubator/activemq/site/QuickLinks 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/REST
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/REST?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/REST (original)
+++ incubator/activemq/site/REST 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/Release+Guide
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Release%2BGuide?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Release+Guide (original)
+++ incubator/activemq/site/Release+Guide 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">
@@ -203,20 +206,21 @@
     <p class="paragraph">
       <ol>
         <li>Grab the latest source from SVN <div class="code">
-            <div class="codeContent"><pre class="code-java">svn co svn+ssh:<span class="code-comment">//svn.activemq.org/scm/activemq/trunk/activemq
+            <div class="codeContent"><pre class="code-java">svn co svn+ssh:<span class="code-comment">// https://svn.apache.org/repos/asf/incubator/activemq/trunk
 </span>cd activemq</pre></div>
           </div>
+          <p>Wiki Markup</p>
         </li>
         <li>Change the version number: (we so need to make this step automatic) : <table class="confluenceTable">
             <tbody>
               <tr>
-                <td class="confluenceTd">project.xml</td>
+                <td class="confluenceTd"> project.xml </td>
               </tr>
               <tr>
-                <td class="confluenceTd">etc/project.xml</td>
+                <td class="confluenceTd"> etc/project.xml </td>
               </tr>
               <tr>
-                <td class="confluenceTd">the WireFormat version (if needed.)</td>
+                <td class="confluenceTd"> the WireFormat version (if needed.) </td>
               </tr>
             </tbody>
           </table>
@@ -224,11 +228,13 @@
         <li>Let Maven build, test, package, and deploy the binaries <div class="code">
             <div class="codeContent"><pre class="code-java">maven clean <span class="code-keyword">default</span> multiproject:deploy dist:deploy</pre></div>
           </div>
+          <p>&nbsp;</p>
         </li>
         <li>Tag the release using your local workspace to a new ACTIVEMQ_X_Y label <div class="code">
-            <div class="codeContent"><pre class="code-java">svn mkdir svn+ssh:<span class="code-comment">//svn.activemq.org/scm/activemq/tags/ACTIVEMQ_X_Y -m <span class="code-quote">&quot;ActiveMQ X.Y Release&quot;</span>
-</span>svn copy ../activemq svn+ssh:<span class="code-comment">//svn.activemq.org/scm/activemq/tags/ACTIVEMQ_X_Y/activemq -m <span class="code-quote">&quot;ActiveMQ X.Y Release&quot;</span></span></pre></div>
+            <div class="codeContent"><pre class="code-java">svn mkdir svn+ssh:<span class="code-comment">//https://svn.apache.org/repos/asf/incubator/activemq/tags/ACTIVEMQ_X_Y -m <span class="code-quote">&quot;ActiveMQ X.Y Release&quot;</span>
+</span>svn copy ../activemq svn+ssh:<span class="code-comment">//https://svn.apache.org/repos/asf/incubator/activemq/tags/ACTIVEMQ_X_Y/activemq -m <span class="code-quote">&quot;ActiveMQ X.Y Release&quot;</span></span></pre></div>
           </div>
+          <p>&nbsp;</p>
         </li>
         <li>Check that the binaries look fine.</li>
       </ol>

Modified: incubator/activemq/site/Replicated+Message+Store
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Replicated%2BMessage%2BStore?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Replicated+Message+Store (original)
+++ incubator/activemq/site/Replicated+Message+Store 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/Resource+Adapter
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Resource%2BAdapter?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Resource+Adapter (original)
+++ incubator/activemq/site/Resource+Adapter 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/Resource+Adapter+Properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Resource%2BAdapter%2BProperties?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Resource+Adapter+Properties (original)
+++ incubator/activemq/site/Resource+Adapter+Properties 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/Resource+Adapter+does+not+seem+to+pool+connections
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Resource%2BAdapter%2Bdoes%2Bnot%2Bseem%2Bto%2Bpool%2Bconnections?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Resource+Adapter+does+not+seem+to+pool+connections (original)
+++ incubator/activemq/site/Resource+Adapter+does+not+seem+to+pool+connections 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/Retroactive+Consumer
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Retroactive%2BConsumer?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Retroactive+Consumer (original)
+++ incubator/activemq/site/Retroactive+Consumer 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/Run+Broker
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Run%2BBroker?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Run+Broker (original)
+++ incubator/activemq/site/Run+Broker 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">
@@ -263,14 +266,14 @@
     <p>You can use the <a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a> to customize the Message Broker to suit your needs. You can run a broker from Maven as follows...</p>
     <p class="paragraph">
       <div class="code">
-        <div class="codeContent"><pre class="code-java">maven server -Dconfig=src/sample-conf/<span class="code-keyword">default</span>.xml</pre></div>
+        <div class="codeContent"><pre class="code-java">maven server -Dconfig=xbean:file:src/sample-conf/<span class="code-keyword">default</span>.xml</pre></div>
       </div>
     </p>
     <p>&nbsp;</p>
     <p>If your <a href="Getting+Started" title="Getting Started">classpath is setup correctly</a> you can achieve the same thing from the command line</p>
     <p class="paragraph">
       <div class="code">
-        <div class="codeContent"><pre class="code-java">java org.activemq.spring.Main src/sample-conf/<span class="code-keyword">default</span>.xml</pre></div>
+        <div class="codeContent"><pre class="code-java">java org.apache.activemq.broker.Main xbean:file:src/sample-conf/<span class="code-keyword">default</span>.xml</pre></div>
       </div>
     </p>
     <p>&nbsp;</p>

Modified: incubator/activemq/site/Running+a+3.x+Broker
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Running%2Ba%2B3.x%2BBroker?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Running+a+3.x+Broker (original)
+++ incubator/activemq/site/Running+a+3.x+Broker 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/SEDA
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/SEDA?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/SEDA (original)
+++ incubator/activemq/site/SEDA 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/Should+I+deploy+the+broker+inside+my+JVM+or+AppServer
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Should%2BI%2Bdeploy%2Bthe%2Bbroker%2Binside%2Bmy%2BJVM%2Bor%2BAppServer?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Should+I+deploy+the+broker+inside+my+JVM+or+AppServer (original)
+++ incubator/activemq/site/Should+I+deploy+the+broker+inside+my+JVM+or+AppServer 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/Should+I+use+XA
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Should%2BI%2Buse%2BXA?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Should+I+use+XA (original)
+++ incubator/activemq/site/Should+I+use+XA 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/Should+I+use+transactions
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Should%2BI%2Buse%2Btransactions?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Should+I+use+transactions (original)
+++ incubator/activemq/site/Should+I+use+transactions 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/Source
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Source?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Source (original)
+++ incubator/activemq/site/Source 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/Source+XRef
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Source%2BXRef?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Source+XRef (original)
+++ incubator/activemq/site/Source+XRef 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/Spring+Support
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Spring%2BSupport?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Spring+Support (original)
+++ incubator/activemq/site/Spring+Support 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">
@@ -198,13 +201,13 @@
 
           <div>
   <div id="Content">
-    <p>We fully support Spring for configuration of the JMS client side as well as for configuring the JMS Message Broker. </p>
+    <p>We fully support Spring for configuration of the JMS client side as well as for configuring the JMS Message Broker.</p>
     <h2><a name="SpringSupport-ConfiguringtheJMSclient"></a>Configuring the JMS client</h2>
-    <p>To configure an ActiveMQ JMS client in Spring it is just a simple matter of configuring an instance of ActiveMQConnectionFactory within a standard Spring XML configuration file like any other bean. There are <span class="nobr"><a href="http://activemq.org/checkout/activemq/modules/core/src/test/org/activemq/spring" rel="nofollow">several examples and test cases</a></span> available and <span class="nobr"><a href="http://activemq.org/checkout/activemq/modules/core/src/test/org/activemq/spring/spring.xml?r=HEAD" rel="nofollow">this one</a></span> shows how to construct an ActiveMQConnectionFactory in Spring which is then passed into a Spring JmsTemplate for use by some POJOs. </p>
+    <p>To configure an ActiveMQ JMS client in Spring it is just a simple matter of configuring an instance of ActiveMQConnectionFactory within a standard Spring XML configuration file like any other bean. There are <span class="nobr"><a href="http://activemq.org/checkout/activemq/modules/core/src/test/org/activemq/spring" rel="nofollow">several examples and test cases</a></span> available and <span class="nobr"><a href="http://activemq.org/checkout/activemq/modules/core/src/test/org/activemq/spring/spring.xml?r=HEAD" rel="nofollow">this one</a></span> shows how to construct an ActiveMQConnectionFactory in Spring which is then passed into a Spring JmsTemplate for use by some POJOs.</p>
     <p>e.g. the following fragment of XML shows us creating a JMS connection factory for ActiveMQ connecting to a remote broker on a specific host name and port.</p>
     <p class="paragraph">
       <div class="code">
-        <div class="codeContent"><pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">&quot;jmsFactory&quot;</span> class=<span class="code-quote">&quot;org.activemq.ActiveMQConnectionFactory&quot;</span>&gt;</span>
+        <div class="codeContent"><pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">&quot;jmsFactory&quot;</span> class=<span class="code-quote">&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;</span>&gt;</span>
     <span class="code-tag">&lt;property name=<span class="code-quote">&quot;brokerURL&quot;</span>&gt;</span>
       <span class="code-tag">&lt;value&gt;</span>tcp://localhost:61616<span class="code-tag">&lt;/value&gt;</span>
     <span class="code-tag">&lt;/property&gt;</span>
@@ -214,27 +217,27 @@
     <p>The following shows how to use Zeroconf to discover the available brokers to connect to.</p>
     <p class="paragraph">
       <div class="code">
-        <div class="codeContent"><pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">&quot;jmsFactory&quot;</span> class=<span class="code-quote">&quot;org.activemq.ActiveMQConnectionFactory&quot;</span>&gt;</span>
+        <div class="codeContent"><pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">&quot;jmsFactory&quot;</span> class=<span class="code-quote">&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;</span>&gt;</span>
     <span class="code-tag">&lt;property name=<span class="code-quote">&quot;brokerURL&quot;</span>&gt;</span>
       <span class="code-tag">&lt;value&gt;</span>zeroconf://_activemq.broker.development.<span class="code-tag">&lt;/value&gt;</span>
     <span class="code-tag">&lt;/property&gt;</span>
   <span class="code-tag">&lt;/bean&gt;</span></pre></div>
       </div>
     </p>
-    <p>From 1.1 of ActiveMQ onwards you can also use JNDI to configure ActiveMQ within Spring. <span class="nobr"><a href="http://activemq.org/checkout/activemq/modules/core/src/test/org/activemq/spring/spring-jndi.xml?r=HEAD" rel="nofollow">This example</a></span> shows how to configure Spring using ActiveMQ's <a href="JNDI+Support" title="JNDI Support">JNDI Support</a>.</p>
+    <p>From 1.1 of ActiveMQ onwards you can also use JNDI to configure ActiveMQ within Spring. <span class="nobr"><a href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/spring-jndi.xml" rel="nofollow">This example</a></span> shows how to configure Spring using ActiveMQ's <a href="JNDI+Support" title="JNDI Support">JNDI Support</a>.</p>
     <h2><a name="SpringSupport-WorkingwithSpring%27sJmsTemplate"></a>Working with Spring's JmsTemplate</h2>
     <p>Spring supports a handy abstraction, JmsTemplate, which allows you to hide some of the lower level JMS details when sending messages etc.</p>
     <p>Please be aware that there are a number of <a href="JmsTemplate+Gotchas" title="JmsTemplate Gotchas">JmsTemplate Gotchas</a> to be careful of.</p>
     <p>One thing to bear in mind with JmsTemplate is that by default it will create a new connection, session, producer for each message sent - then close them all down again. This is very inefficient! It is done like this to work in EJB containers which tend to use a special ConnectionFactory which does pooling.</p>
-    <p>We do have a pooling JMS ConnectionFactory for use inside a JCA / MDB container (org.activemq.ra.jms.ConnectionProxyFactory), when using our JCA Resource Adapter which will reuse the same JMS connection/session which is being used for inbound messages. </p>
+    <p>We do have a pooling JMS ConnectionFactory for use inside a JCA / MDB container (org.activemq.ra.InboundConnectionProxyFactory), when using our JCA Resource Adapter which will reuse the same JMS connection/session which is being used for inbound messages.</p>
     <p>If you are not using a JCA container to manage your JMS connections, we recommend you use our pooling JMS connection provider, (org.activemq.pool.PooledConnectionFactory) which will pool the JMS resources to work efficiently with Spring's JmsTemplate or with EJBs.</p>
     <p>e.g.</p>
     <p class="paragraph">
       <div class="code">
         <div class="codeContent"><pre class="code-xml"><span class="code-tag"><span class="code-comment">&lt;!-- a pooling based JMS provider --&gt;</span></span>
-  <span class="code-tag">&lt;bean id=<span class="code-quote">&quot;jmsFactory&quot;</span> class=<span class="code-quote">&quot;org.activemq.pool.PooledConnectionFactory&quot;</span>&gt;</span>
+  <span class="code-tag">&lt;bean id=<span class="code-quote">&quot;jmsFactory&quot;</span> class=<span class="code-quote">&quot;org.apache.activemq.pool.PooledConnectionFactory&quot;</span>&gt;</span>
     <span class="code-tag">&lt;property name=<span class="code-quote">&quot;connectionFactory&quot;</span>&gt;</span>
-      <span class="code-tag">&lt;bean class=<span class="code-quote">&quot;org.activemq.ActiveMQConnectionFactory&quot;</span>&gt;</span>
+      <span class="code-tag">&lt;bean class=<span class="code-quote">&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;</span>&gt;</span>
         <span class="code-tag">&lt;property name=<span class="code-quote">&quot;brokerURL&quot;</span>&gt;</span>
           <span class="code-tag">&lt;value&gt;</span>tcp://localhost:61616<span class="code-tag">&lt;/value&gt;</span>
         <span class="code-tag">&lt;/property&gt;</span>
@@ -251,20 +254,21 @@
       </div>
     </p>
     <h2><a name="SpringSupport-ConsumingJMSfrominsideSpring"></a>Consuming JMS from inside Spring</h2>
-    <p>We support full <em>message driven pojo</em> support in Spring by using the <a href="JCA+Container" title="JCA Container">JCA Container</a> module. This provides all the power of MDBs - efficient JMS consumption and pooling of the message listeners - but without requiring a full EJB container.</p>
+    <p>We support full <em>message driven pojo</em> support in Spring by using <span class="nobr"><a href="http://jencks.org" rel="nofollow">Jencks</a></span>. This provides all the power of MDBs - efficient JMS consumption and pooling of the message listeners - but without requiring a full EJB container.</p>
     <h2><a name="SpringSupport-Usinganembeddedbroker"></a>Using an embedded broker</h2>
     <p>To create an embedded broker inside Spring its easiest to do it explicitly as follows...</p>
     <p class="paragraph">
       <div class="code">
-        <div class="codeContent"><pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">&quot;broker&quot;</span> class=<span class="code-quote">&quot;org.activemq.spring.BrokerFactoryBean&quot;</span>&gt;</span>
-    <span class="code-tag">&lt;property name=<span class="code-quote">&quot;config&quot;</span> value=<span class="code-quote">&quot;classpath:foo/bar/broker.xml&quot;</span>/&gt;</span>
-  <span class="code-tag">&lt;/bean&gt;</span></pre></div>
+        <div class="codeContent"><pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">&quot;broker&quot;</span> class=<span class="code-quote">&quot;org.activemq.xbean.BrokerFactoryBean&quot;</span>&gt;</span>
+    <span class="code-tag">&lt;property name=<span class="code-quote">&quot;config&quot;</span> value=<span class="code-quote">&quot;classpath:org/activemq/xbean/activemq.xml&quot;</span> /&gt;</span>
+    <span class="code-tag">&lt;property name=<span class="code-quote">&quot;start&quot;</span> value=<span class="code-quote">&quot;true&quot;</span> /&gt;</span>
+<span class="code-tag">&lt;/bean&gt;</span></pre></div>
       </div>
     </p>
     <p>It is also possible to include an <a href="How+do+I+embed+a+Broker+inside+a+Connection" title="How do I embed a Broker inside a Connection">embedded Message Broker</a> inside the ActiveMQConnectionFactory which is configured via our <a href="Xml+Configuration" title="Xml Configuration">Xml Configuration</a> mechanism, all within a normal Spring configuration file. <span class="nobr"><a href="http://activemq.org/checkout/activemq/modules/core/src/test/org/activemq/spring/spring-embedded.xml?r=HEAD" rel="nofollow">This example</a></span> demonstrates this - the trick is to specify the <em>brokerContainerFactory</em> property on the ActiveMQConnectionFactory which references the XML Configuration for the Broker using a Spring resource. e.g. here's an example</p>
     <p class="paragraph">
       <div class="code">
-        <div class="codeContent"><pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">&quot;jmsFactory&quot;</span> class=<span class="code-quote">&quot;org.activemq.ActiveMQConnectionFactory&quot;</span>&gt;</span>
+        <div class="codeContent"><pre class="code-xml"><span class="code-tag">&lt;bean id=<span class="code-quote">&quot;jmsFactory&quot;</span> class=<span class="code-quote">&quot;org.apache.activemq.ActiveMQConnectionFactory&quot;</span>&gt;</span>
     <span class="code-tag">&lt;property name=<span class="code-quote">&quot;brokerURL&quot;</span>&gt;</span>
       <span class="code-tag">&lt;value&gt;</span>vm://localhost<span class="code-tag">&lt;/value&gt;</span>
     <span class="code-tag">&lt;/property&gt;</span>

Modified: incubator/activemq/site/Static+Transport+Reference
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Static%2BTransport%2BReference?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Static+Transport+Reference (original)
+++ incubator/activemq/site/Static+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/Stomp
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Stomp?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Stomp (original)
+++ incubator/activemq/site/Stomp 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/Subscription+Recovery+Policy
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Subscription%2BRecovery%2BPolicy?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Subscription+Recovery+Policy (original)
+++ incubator/activemq/site/Subscription+Recovery+Policy 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/Sun+JNDI
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Sun%2BJNDI?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Sun+JNDI (original)
+++ incubator/activemq/site/Sun+JNDI 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/Supporting+IO+Streams
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/Supporting%2BIO%2BStreams?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/Supporting+IO+Streams (original)
+++ incubator/activemq/site/Supporting+IO+Streams 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/TCP+Transport+Reference
URL: http://svn.apache.org/viewcvs/incubator/activemq/site/TCP%2BTransport%2BReference?rev=376314&r1=376313&r2=376314&view=diff
==============================================================================
--- incubator/activemq/site/TCP+Transport+Reference (original)
+++ incubator/activemq/site/TCP+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">



Mime
View raw message