You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/10/27 20:52:57 UTC

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

Modified: incubator/activemq/site/spring-support.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/spring-support.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/spring-support.html (original)
+++ incubator/activemq/site/spring-support.html Fri Oct 27 11:52:41 2006
@@ -36,7 +36,7 @@
         <TR>
           <TD align="left" valign="middle" nowrap="">
             <DIV id="site-breadcrumbs">
-<A href="home.html" title="ActiveMQ">ActiveMQ</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="connectivity.html" title="Connectivity">Connectivity</A>&nbsp;&gt;&nbsp;<A href="" title="Spring Support">Spring Support</A>
+<A href="home.html" title="ActiveMQ">ActiveMQ</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="connectivity.html" title="Connectivity">Connectivity</A>&nbsp;&gt;&nbsp;<A href="containers.html" title="Containers">Containers</A>&nbsp;&gt;&nbsp;<A href="" title="Spring Support">Spring Support</A>
             </DIV>
           </TD>
           <TD align="right" valign="middle" nowrap="">
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 
@@ -279,7 +280,9 @@
 
 <P>If you are using the new <SPAN class="nobr"><A href="http://static.springframework.org/spring/docs/2.0.x/reference/xsd-config.html" title="Visit page outside Confluence" rel="nofollow">XML Schema-based configuration<SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN> of Spring 2.0 and ActiveMQ 4.1 or later (and xbean-spring 2.6 or later) you can embed the ActiveMQ broker XML inside any regular Spring.xml file without requiring the above factory bean. e.g. here is an <SPAN class="nobr"><A href="http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml" title="Visit page outside Confluence" rel="nofollow">example<SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN> of a regular Spring XML file in S
 pring 2.0 which also configures a broker.</P>
 <DIV class="code"><DIV class="codeContent">
-<PRE class="code-xml">&lt;beans xmlns=<SPAN class="code-quote">&quot;http://www.springframework.org/schema/beans&quot;</SPAN> <SPAN class="code-keyword">xmlns:amq</SPAN>=<SPAN class="code-quote">&quot;http://activemq.org/config/1.0&quot;</SPAN>
+<PRE class="code-xml">&lt;beans 
+  xmlns=<SPAN class="code-quote">&quot;http://www.springframework.org/schema/beans&quot;</SPAN> 
+  <SPAN class="code-keyword">xmlns:amq</SPAN>=<SPAN class="code-quote">&quot;http://activemq.org/config/1.0&quot;</SPAN>
   <SPAN class="code-keyword">xmlns:xsi</SPAN>=<SPAN class="code-quote">&quot;http://www.w3.org/2001/XMLSchema-instance&quot;</SPAN>
   xsi:schemaLocation=&quot;http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
   http://activemq.org/config/1.0 http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-incubator-SNAPSHOT.xsd&quot;&gt;
@@ -310,6 +313,10 @@
     <SPAN class="code-tag">&lt;/property&gt;</SPAN>
   <SPAN class="code-tag">&lt;/bean&gt;</SPAN>
 
+  <SPAN class="code-tag">&lt;bean id=<SPAN class="code-quote">&quot;consumerJmsTemplate&quot;</SPAN> class=<SPAN class="code-quote">&quot;org.springframework.jms.core.JmsTemplate&quot;</SPAN>&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;connectionFactory&quot;</SPAN> ref=<SPAN class="code-quote">&quot;jmsFactory&quot;</SPAN>/&gt;</SPAN>
+  <SPAN class="code-tag">&lt;/bean&gt;</SPAN>
+
   <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- a sample POJO which uses a Spring JmsTemplate --&gt;</SPAN></SPAN>
   <SPAN class="code-tag">&lt;bean id=<SPAN class="code-quote">&quot;producer&quot;</SPAN> class=<SPAN class="code-quote">&quot;org.apache.activemq.spring.SpringProducer&quot;</SPAN>&gt;</SPAN>
     <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;template&quot;</SPAN>&gt;</SPAN>
@@ -327,7 +334,7 @@
 
   <SPAN class="code-tag"><SPAN class="code-comment">&lt;!-- a sample POJO consumer --&gt;</SPAN></SPAN>
   <SPAN class="code-tag">&lt;bean id=<SPAN class="code-quote">&quot;consumer&quot;</SPAN> class=<SPAN class="code-quote">&quot;org.apache.activemq.spring.SpringConsumer&quot;</SPAN>&gt;</SPAN>
-    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;template&quot;</SPAN> ref=<SPAN class="code-quote">&quot;myJmsTemplate&quot;</SPAN>/&gt;</SPAN>
+    <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;template&quot;</SPAN> ref=<SPAN class="code-quote">&quot;consumerJmsTemplate&quot;</SPAN>/&gt;</SPAN>
     <SPAN class="code-tag">&lt;property name=<SPAN class="code-quote">&quot;destination&quot;</SPAN> ref=<SPAN class="code-quote">&quot;destination&quot;</SPAN>/&gt;</SPAN>
   <SPAN class="code-tag">&lt;/bean&gt;</SPAN>
 
@@ -407,8 +414,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=mfork00">Michael Fork</A> on Aug 19, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=211&originalId=9703">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Oct 28, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=211&originalId=14431">view change</A>)
                       <SPAN id="show" class="inline-control-link"><A href="" onclick="showComment(); return false;">show comment</A></SPAN>
         <SPAN id="hide" class="inline-control-link" style="display:none;"><A href="" onclick="hideComment(); return false;">hide comment</A></SPAN>
           <DIV id="versionComment" class="noteMacro" style="display:none; padding: 5px;">

Modified: incubator/activemq/site/sqlserver.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/sqlserver.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/sqlserver.html (original)
+++ incubator/activemq/site/sqlserver.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/ssl-transport-reference.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/ssl-transport-reference.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/ssl-transport-reference.html (original)
+++ incubator/activemq/site/ssl-transport-reference.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/static-transport-reference.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/static-transport-reference.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/static-transport-reference.html (original)
+++ incubator/activemq/site/static-transport-reference.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/stomp.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/stomp.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/stomp.html (original)
+++ incubator/activemq/site/stomp.html Fri Oct 27 11:52:41 2006
@@ -36,7 +36,7 @@
         <TR>
           <TD align="left" valign="middle" nowrap="">
             <DIV id="site-breadcrumbs">
-<A href="home.html" title="ActiveMQ">ActiveMQ</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="connectivity.html" title="Connectivity">Connectivity</A>&nbsp;&gt;&nbsp;<A href="" title="Stomp">Stomp</A>
+<A href="home.html" title="ActiveMQ">ActiveMQ</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="connectivity.html" title="Connectivity">Connectivity</A>&nbsp;&gt;&nbsp;<A href="protocols.html" title="Protocols">Protocols</A>&nbsp;&gt;&nbsp;<A href="" title="Stomp">Stomp</A>
             </DIV>
           </TD>
           <TD align="right" valign="middle" nowrap="">
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 
@@ -273,14 +274,14 @@
 
 <H3><A name="Stomp-WorkingwithDestinationswithStomp"></A>Working with Destinations with Stomp</H3>
 
-<P>Note that the prefix in stomp <B>/queue/</B> or <B>/topic/</B> is removed from the string before passing it to ActiveMQ as a JMS destination. Also note that the default separator in MOM systems is . (DOT). So <B>FOO.BAR</B> is the normal syntax of a MOM queue - the Stomp equivalent would be &#42;/queue/FOO.BAR&#42;</P>
-<TABLE cellpadding="5" width="85%" cellspacing="8px" class="warningMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://goopen.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">Be careful about starting destinations with /</B><BR>
-<P>If in Stomp world you use <B>/queue/foo/bar</B> then in a JMS world the queue would be called <B>foo/bar</B> not <B>/foo/bar</B>.</P></TD></TR></TABLE>
+<P>Note that the prefix in stomp <B>/queue/</B> or <B>/topic/</B> is removed from the string before passing it to ActiveMQ as a JMS destination. Also note that the default separator in MOM systems is . (DOT). So <B>FOO.BAR</B> is the normal syntax of a MOM queue - the Stomp equivalent would be <B>/queue/FOO.BAR</B></P>
 
-<H3><A name="Stomp-WorkingwithJMSText%2FBytesMessagesandStomp"></A>Working with JMS Text/Bytes Messages and Stomp</H3>
+<TABLE cellpadding="5" width="85%" cellspacing="8px" class="warningMacro" border="0" align="center"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="http://goopen.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B class="strong">Be careful about starting destinations with /</B><BR><BR>
+If in Stomp world you use <B>/queue/foo/bar</B> then in a JMS world the queue would be called <B>foo/bar</B> not <B>/foo/bar</B>.</TD></TR></TABLE>
 
-<P>Stomp is a very simple protocol - that&apos;s part of the beauty of it!  As such, it does not have knowledge of JMS messages such as TextMessages or BytesMessages.  The protocol does however support a content-length header.  To provide more robust interaction between Stomp and JMS clients, ActiveMQ keys off of the inclusion of this header to determine what message type to create when sending from Stomp to JMS.  The logic is simple:</P>
+<H3><A name="Stomp-WorkingwithJMSText%2FBytesMessagesandStomp"></A>Working with JMS Text/Bytes Messages and Stomp</H3>
 
+<P>Stomp is a very simple protocol - that&apos;s part of the beauty of it&#33; As such, it does not have knowledge of JMS messages such as TextMessages or BytesMessages. The protocol does however support a content-length header. To provide more robust interaction between Stomp and JMS clients, ActiveMQ keys off of the inclusion of this header to determine what message type to create when sending from Stomp to JMS. The logic is simple:</P>
 <TABLE class="confluenceTable"><TBODY>
 <TR>
 <TH class="confluenceTh"> Inclusion of content-length header </TH>
@@ -295,8 +296,7 @@
 <TD class="confluenceTd"> TextMessage </TD>
 </TR>
 </TBODY></TABLE>
-
-<P>This same logic can be followed when going from JMS to Stomp, as well.  A Stomp client could be written to key off of the inclusion of the content-length header to determine what type of message structure to provide to the user. </P>
+<P>This same logic can be followed when going from JMS to Stomp, as well. A Stomp client could be written to key off of the inclusion of the content-length header to determine what type of message structure to provide to the user.</P>
 
 <H3><A name="Stomp-UsingJMSsemanticswithStomp"></A>Using JMS semantics with Stomp</H3>
 
@@ -367,7 +367,7 @@
 <TD class="confluenceTd"> CONNECT </TD>
 <TD class="confluenceTd"> client-id </TD>
 <TD class="confluenceTd"> string </TD>
-<TD class="confluenceTd"> Specifies the JMS Client ID which is used in combination to the activemqq.subscriptionName to denote a durable subscriber </TD>
+<TD class="confluenceTd"> Specifies the JMS Client ID which is used in combination to the activemq.subcriptionName to denote a durable subscriber </TD>
 </TR>
 <TR>
 <TD class="confluenceTd"> SUBSCRIBE </TD>
@@ -419,9 +419,10 @@
 </TR>
 <TR>
 <TD class="confluenceTd"> SUBSCRIBE </TD>
-<TD class="confluenceTd"> activemq.subscriptionName </TD>
+<TD class="confluenceTd"> activemq.subcriptionName </TD>
 <TD class="confluenceTd"> string </TD>
-<TD class="confluenceTd"> For durable topic subscriptions you must specify the same clientId on the connection and subscriberName on the subscribe </TD>
+<TD class="confluenceTd"> For durable topic subscriptions you must specify the same clientId on the connection and subcriptionName on the subscribe.&nbsp;<BR>
+Note the spelling: subcriptionName NOT subscriptionName.&nbsp; This is not intuitive, but it is how it is implemented for now. </TD>
 </TR>
 </TBODY></TABLE></DIV>
           
@@ -433,8 +434,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Jul 04, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=207&originalId=8947">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Oct 28, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=207&originalId=14455">view change</A>)
               
       (<A href="http://goopen.org/confluence/pages/editpage.action?pageId=207">edit page</A>)
     </DIV>

Modified: incubator/activemq/site/stp.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/stp.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/stp.html (original)
+++ incubator/activemq/site/stp.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/structured-message-properties-and-mapmessages.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/structured-message-properties-and-mapmessages.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/structured-message-properties-and-mapmessages.html (original)
+++ incubator/activemq/site/structured-message-properties-and-mapmessages.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/subscription-recovery-policy.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/subscription-recovery-policy.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/subscription-recovery-policy.html (original)
+++ incubator/activemq/site/subscription-recovery-policy.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/sun-jndi.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/sun-jndi.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/sun-jndi.html (original)
+++ incubator/activemq/site/sun-jndi.html Fri Oct 27 11:52:41 2006
@@ -36,7 +36,7 @@
         <TR>
           <TD align="left" valign="middle" nowrap="">
             <DIV id="site-breadcrumbs">
-<A href="home.html" title="ActiveMQ">ActiveMQ</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="connectivity.html" title="Connectivity">Connectivity</A>&nbsp;&gt;&nbsp;<A href="" title="Sun JNDI">Sun JNDI</A>
+<A href="home.html" title="ActiveMQ">ActiveMQ</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="connectivity.html" title="Connectivity">Connectivity</A>&nbsp;&gt;&nbsp;<A href="containers.html" title="Containers">Containers</A>&nbsp;&gt;&nbsp;<A href="" title="Sun JNDI">Sun JNDI</A>
             </DIV>
           </TD>
           <TD align="right" valign="middle" nowrap="">
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 
@@ -361,8 +362,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Aug 14, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=45&originalId=9664">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Oct 28, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=45&originalId=14430">view change</A>)
               
       (<A href="http://goopen.org/confluence/pages/editpage.action?pageId=45">edit page</A>)
     </DIV>

Modified: incubator/activemq/site/support.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/support.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/support.html (original)
+++ incubator/activemq/site/support.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/supporting-io-streams.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/supporting-io-streams.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/supporting-io-streams.html (original)
+++ incubator/activemq/site/supporting-io-streams.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/svn.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/svn.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/svn.html (original)
+++ incubator/activemq/site/svn.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/tcp-transport-reference.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/tcp-transport-reference.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/tcp-transport-reference.html (original)
+++ incubator/activemq/site/tcp-transport-reference.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/team.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/team.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/team.html (original)
+++ incubator/activemq/site/team.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/terminology.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/terminology.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/terminology.html (original)
+++ incubator/activemq/site/terminology.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 
@@ -347,25 +348,25 @@
               <a href="javascript:hideChildren()">Hide Children</a></span>
           </div>
           <div class="greybox" id="children" style="display: none;">
-                                      <a href="http://goopen.org/confluence/display/ACTIVEMQ/Latency" title="Latency">Latency</a>
+                                      <a href="http://goopen.org/confluence/display/ACTIVEMQ/DR" title="DR">DR</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
-                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/HA" title="HA">HA</a>
+                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/SEDA" title="SEDA">SEDA</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
-                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/QoS" title="QoS">QoS</a>
+                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/Throughput" title="Throughput">Throughput</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                           <a href="http://goopen.org/confluence/display/ACTIVEMQ/MOM" title="MOM">MOM</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
-                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/Throughput" title="Throughput">Throughput</a>
+                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/QoS" title="QoS">QoS</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
-                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/SEDA" title="SEDA">SEDA</a>
+                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/HA" title="HA">HA</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
-                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/DR" title="DR">DR</a>
+                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/Latency" title="Latency">Latency</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                       </div>

Modified: incubator/activemq/site/test-source-xref.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/test-source-xref.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/test-source-xref.html (original)
+++ incubator/activemq/site/test-source-xref.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/the-broker-will-not-start.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/the-broker-will-not-start.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/the-broker-will-not-start.html (original)
+++ incubator/activemq/site/the-broker-will-not-start.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/the-jms-connector.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/the-jms-connector.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/the-jms-connector.html (original)
+++ incubator/activemq/site/the-jms-connector.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/the-proxy-connector.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/the-proxy-connector.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/the-proxy-connector.html (original)
+++ incubator/activemq/site/the-proxy-connector.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/the-vm-transport-starts-a-broker-before-my-configured-broker-starts.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/the-vm-transport-starts-a-broker-before-my-configured-broker-starts.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/the-vm-transport-starts-a-broker-before-my-configured-broker-starts.html (original)
+++ incubator/activemq/site/the-vm-transport-starts-a-broker-before-my-configured-broker-starts.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/throughput.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/throughput.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/throughput.html (original)
+++ incubator/activemq/site/throughput.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/tips-for-getting-help.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/tips-for-getting-help.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/tips-for-getting-help.html (original)
+++ incubator/activemq/site/tips-for-getting-help.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 

Modified: incubator/activemq/site/tomcat.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/tomcat.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/tomcat.html (original)
+++ incubator/activemq/site/tomcat.html Fri Oct 27 11:52:41 2006
@@ -36,7 +36,7 @@
         <TR>
           <TD align="left" valign="middle" nowrap="">
             <DIV id="site-breadcrumbs">
-<A href="home.html" title="ActiveMQ">ActiveMQ</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="connectivity.html" title="Connectivity">Connectivity</A>&nbsp;&gt;&nbsp;<A href="" title="Tomcat">Tomcat</A>
+<A href="home.html" title="ActiveMQ">ActiveMQ</A>&nbsp;&gt;&nbsp;<A href="home.html" title="Home">Home</A>&nbsp;&gt;&nbsp;<A href="connectivity.html" title="Connectivity">Connectivity</A>&nbsp;&gt;&nbsp;<A href="containers.html" title="Containers">Containers</A>&nbsp;&gt;&nbsp;<A href="" title="Tomcat">Tomcat</A>
             </DIV>
           </TD>
           <TD align="right" valign="middle" nowrap="">
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 
@@ -342,8 +343,8 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Jun 16, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=49&originalId=8775">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Oct 28, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=49&originalId=14429">view change</A>)
               
       (<A href="http://goopen.org/confluence/pages/editpage.action?pageId=49">edit page</A>)
     </DIV>

Modified: incubator/activemq/site/tools.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/tools.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/tools.html (original)
+++ incubator/activemq/site/tools.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="topologies.html" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 
@@ -262,13 +263,13 @@
               <a href="javascript:hideChildren()">Hide Children</a></span>
           </div>
           <div class="greybox" id="children" style="display: none;">
-                                      <a href="http://goopen.org/confluence/display/ACTIVEMQ/Web+Console" title="Web Console">Web Console</a>
+                                      <a href="http://goopen.org/confluence/display/ACTIVEMQ/Hermes+Screenshot" title="Hermes Screenshot">Hermes Screenshot</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                           <a href="http://goopen.org/confluence/display/ACTIVEMQ/Hermes+Jms" title="Hermes Jms">Hermes Jms</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
-                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/Hermes+Screenshot" title="Hermes Screenshot">Hermes Screenshot</a>
+                          <a href="http://goopen.org/confluence/display/ACTIVEMQ/Web+Console" title="Web Console">Web Console</a>
               <span class="smalltext">(ActiveMQ)</span>
               <br>
                       </div>

Added: incubator/activemq/site/topologies.data/BrokerTopology-1.png
URL: http://svn.apache.org/viewvc/incubator/activemq/site/topologies.data/BrokerTopology-1.png?view=auto&rev=468495
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/site/topologies.data/BrokerTopology-1.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/activemq/site/topologies.data/BrokerTopology-1.png.jpeg
URL: http://svn.apache.org/viewvc/incubator/activemq/site/topologies.data/BrokerTopology-1.png.jpeg?view=auto&rev=468495
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/site/topologies.data/BrokerTopology-1.png.jpeg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/activemq/site/topologies.html
URL: http://svn.apache.org/viewvc/incubator/activemq/site/topologies.html?view=diff&rev=468495&r1=468494&r2=468495
==============================================================================
--- incubator/activemq/site/topologies.html (original)
+++ incubator/activemq/site/topologies.html Fri Oct 27 11:52:41 2006
@@ -132,6 +132,7 @@
 
 <UL class="alternate" type="square">
 	<LI><A href="ajax.html" title="Ajax">Ajax</A></LI>
+	<LI><A href="amqp.html" title="AMQP">AMQP</A></LI>
 	<LI><A href="axis-support.html" title="Axis Support">Axis Support</A></LI>
 	<LI><A href="c-integration.html" title="C Integration">C Integration</A></LI>
 	<LI><A href="activemq-c-clients.html" title="ActiveMQ C++ Clients">C+&#43; Integration</A></LI>
@@ -149,6 +150,7 @@
 	<LI><A href="tomcat.html" title="Tomcat">Tomcat</A></LI>
 	<LI><A href="unix-service.html" title="Unix Service">Unix Service</A></LI>
 	<LI><A href="weblogic-integration.html" title="WebLogic Integration">WebLogic Integration</A></LI>
+	<LI><A href="xmpp.html" title="XMPP">XMPP</A></LI>
 	<LI><A href="connectivity.html" title="Connectivity">More ...</A></LI>
 </UL>
 
@@ -159,15 +161,14 @@
 	<LI><A href="getting-started.html" title="Getting Started">Getting Started</A></LI>
 	<LI><A href="initial-configuration.html" title="Initial Configuration">Initial Configuration</A></LI>
 	<LI><A href="run-broker.html" title="Run Broker">Running a Broker</A></LI>
+	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="activemq-command-line-tools-reference.html" title="ActiveMQ Command Line Tools Reference">Command Line Tools</A></LI>
 	<LI><A href="configuring-transports.html" title="Configuring Transports">Configuring Transports</A></LI>
 	<LI><A href="examples.html" title="Examples">Examples</A></LI>
+	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
 	<LI><A href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">Monitoring the Broker</A></LI>
 	<LI><A href="xml-configuration.html" title="Xml Configuration">Xml Configuration</A></LI>
 	<LI><A href="xml-reference.html" title="Xml Reference">Xml Reference</A></LI>
-	<LI><A href="web-samples.html" title="Web Samples">Web Samples</A></LI>
-	<LI><A href="" title="Topologies">Topologies</A></LI>
-	<LI><A href="how-do-i-embed-a-broker-inside-a-connection.html" title="How do I embed a Broker inside a Connection">Embedded Brokers</A></LI>
 	<LI><A href="using-activemq.html" title="Using ActiveMQ">More ...</A></LI>
 </UL>
 
@@ -251,9 +252,9 @@
 <!--          
             <div class="pagetitle">Topologies</div>
 -->
-            <DIV class="wiki-content"><P>ActiveMQ supports a wide range of different deployment topologies as well as <A href="protocols.html" title="Protocols">protocols</A> &amp; wire formats. The following diagram shows a federated network of brokers with a few different kinds of topology.</P>
+            <DIV class="wiki-content"><P>ActiveMQ supports a wide range of different deployment topologies as well as <A href="uri-protocols.html" title="URI Protocols">protocols</A> &amp; wire formats. The following diagram shows a federated network of brokers with a few different kinds of topology.</P>
 
-<P><SPAN class="nobr"><A href="http://activemq.org/BrokerTopology.pdf" title="Visit page outside Confluence" rel="nofollow"><IMG src="http://activemq.org/BrokerTopology-1.png" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
+<P><SPAN class="nobr"><A href="http://activemq.org/BrokerTopology.pdf" title="Visit page outside Confluence" rel="nofollow"><IMG src="topologies.data/BrokerTopology-1.png" align="absmiddle" border="0"><SUP><IMG class="rendericon" src="http://goopen.org/confluence/images/icons/linkext7.gif" height="0" width="0" align="absmiddle" alt="" border="0"></SUP></A></SPAN></P>
 
 <P>Which topology you choose is up to you. We&apos;ll now describe a few of these protocols in a little more detail.</P>
 
@@ -332,13 +333,13 @@
     </DIV>
     <DIV id="site-footer">
           Added by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A>,
-    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=stephanseufert">Stephan Seufert</A> on Aug 28, 2006
-                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=26&originalId=13326">view change</A>)
+    last edited by     <A href="http://goopen.org/confluence/users/viewuserprofile.action?username=jstrachan">James Strachan</A> on Oct 28, 2006
+                  &nbsp;(<A href="http://goopen.org/confluence/pages/diffpages.action?pageId=26&originalId=14442">view change</A>)
                       <SPAN id="show" class="inline-control-link"><A href="" onclick="showComment(); return false;">show comment</A></SPAN>
         <SPAN id="hide" class="inline-control-link" style="display:none;"><A href="" onclick="hideComment(); return false;">hide comment</A></SPAN>
           <DIV id="versionComment" class="noteMacro" style="display:none; padding: 5px;">
       <B>Comment:</B>
-      Removed a typo<BR>
+      Fixed typo in image<BR>
       <SPAN class="smalltext"><A href="http://goopen.org/confluence/pages/viewpreviouspageversions.action?pageId=26">View page history</A></SPAN>
   </DIV>