Return-Path: 
 <commits-return-21409-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5C928E0C1
	for <apmail-activemq-commits-archive@www.apache.org>;
 Thu, 31 Jan 2013 15:53:12 +0000 (UTC)
Received: (qmail 20912 invoked by uid 500); 31 Jan 2013 15:53:12 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 20874 invoked by uid 500); 31 Jan 2013 15:53:12 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 20862 invoked by uid 99); 31 Jan 2013 15:53:12 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jan 2013 15:53:12 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jan 2013 15:53:09 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4BCD423889DE
	for <commits@activemq.apache.org>; Thu, 31 Jan 2013 15:52:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r848794 [2/2] - in
 /websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website:
 ./ blog/ blog/releases/ community/ documentation/ documentation/schema/
 images/ scripts/ styles/impact/ styles/impact/css/ versions/
Date: Thu, 31 Jan 2013 15:49:58 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130131155207.4BCD423889DE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/schema/apollo.xsd
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/schema/apollo.xsd (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/schema/apollo.xsd Thu Jan 31 15:49:57 2013
@@ -471,6 +471,8 @@
     </xs:choice></xs:choice>
     <xs:attribute name="tail_buffer" type="xs:string"/>
     <xs:attribute name="persistent" type="xs:boolean"/>
+    <xs:attribute name="round_robin" type="xs:boolean"/>
+    <xs:attribute name="message_group_graceful_handoff" type="xs:boolean"/>
     <xs:attribute name="swap" type="xs:boolean"/>
     <xs:attribute name="swap_range_size" type="xs:int"/>
     <xs:attribute name="quota" type="xs:string"/>
@@ -481,6 +483,7 @@
     <xs:attribute name="max_enqueue_rate" type="xs:string"/>
     <xs:attribute name="dlq" type="xs:string"/>
     <xs:attribute name="nak_limit" type="xs:int"/>
+    <xs:attribute name="dlq_expired" type="xs:boolean"/>
   </xs:complexType>
 
   <xs:complexType name="queueDTO">
@@ -535,6 +538,8 @@
     <xs:complexContent>
       <xs:extension base="tns:serviceStatusDTO">
         <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
+          <xs:element name="home_location" type="xs:string" minOccurs="0"/>
+          <xs:element name="base_location" type="xs:string" minOccurs="0"/>
           <xs:element ref="tns:jvm_metrics" minOccurs="0"/>
           <xs:element name="virtual_host" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
           <xs:element name="connector" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -673,7 +678,9 @@
   </xs:complexType>
 
   <xs:complexType name="entryStatusDTO">
-    <xs:sequence/>
+    <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
+      <xs:element name="acquirer" type="tns:queueConsumerLinkDTO" minOccurs="0"/>
+    </xs:choice></xs:choice>
     <xs:attribute name="seq" type="xs:long" use="required"/>
     <xs:attribute name="count" type="xs:int" use="required"/>
     <xs:attribute name="size" type="xs:int" use="required"/>
@@ -682,13 +689,21 @@
     <xs:attribute name="is_prefetched" type="xs:boolean" use="required"/>
   </xs:complexType>
 
-  <xs:complexType name="errorDTO">
-    <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
-      <xs:any processContents="lax" namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:choice></xs:choice>
-    <xs:attribute name="code" type="xs:string"/>
-    <xs:attribute name="message" type="xs:string"/>
-    <xs:attribute name="resource" type="xs:string"/>
+  <xs:complexType name="queueConsumerLinkDTO">
+    <xs:complexContent>
+      <xs:extension base="tns:linkDTO">
+        <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
+          <xs:element name="position" type="xs:long" minOccurs="0"/>
+          <xs:element name="acquired_count" type="xs:int" minOccurs="0"/>
+          <xs:element name="acquired_size" type="xs:long" minOccurs="0"/>
+          <xs:element name="total_ack_count" type="xs:long" minOccurs="0"/>
+          <xs:element name="total_nack_count" type="xs:long" minOccurs="0"/>
+          <xs:element name="ack_item_rate" type="xs:double" minOccurs="0"/>
+          <xs:element name="ack_size_rate" type="xs:double" minOccurs="0"/>
+        </xs:choice></xs:choice>
+        <xs:attribute name="waiting_on" type="xs:string"/>
+      </xs:extension>
+    </xs:complexContent>
   </xs:complexType>
 
   <xs:complexType name="linkDTO">
@@ -701,12 +716,46 @@
     <xs:attribute name="enqueue_tsr" type="xs:long" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="errorDTO">
+    <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
+      <xs:any processContents="lax" namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:choice></xs:choice>
+    <xs:attribute name="code" type="xs:string"/>
+    <xs:attribute name="message" type="xs:string"/>
+    <xs:attribute name="resource" type="xs:string"/>
+  </xs:complexType>
+
   <xs:complexType name="longIdListDTO">
     <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
       <xs:element name="item" type="tns:longIdLabeledDTO" minOccurs="0" maxOccurs="unbounded"/>
     </xs:choice></xs:choice>
   </xs:complexType>
 
+  <xs:complexType name="messageStatusDTO">
+    <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
+      <xs:element name="entry" type="tns:entryStatusDTO" minOccurs="0"/>
+      <xs:element name="expiration" type="xs:long"/>
+      <xs:element name="persistent" type="xs:boolean"/>
+      <xs:element name="codec" type="xs:string" minOccurs="0"/>
+      <xs:element name="headers">
+        <xs:complexType>
+          <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
+            <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
+              <xs:complexType>
+                <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
+                  <xs:element name="key" minOccurs="0" type="xs:string"/>
+                  <xs:element name="value" minOccurs="0" type="xs:anyType"/>
+                </xs:choice></xs:choice>
+              </xs:complexType>
+            </xs:element>
+          </xs:choice></xs:choice>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="base64_body" type="xs:string" minOccurs="0"/>
+      <xs:element name="body_truncated" type="xs:boolean"/>
+    </xs:choice></xs:choice>
+  </xs:complexType>
+
   <xs:complexType name="nullStoreDTO">
     <xs:complexContent>
       <xs:extension base="tns:store_type">
@@ -721,23 +770,6 @@
     <xs:attribute name="kind" type="xs:string"/>
   </xs:complexType>
 
-  <xs:complexType name="queueConsumerLinkDTO">
-    <xs:complexContent>
-      <xs:extension base="tns:linkDTO">
-        <xs:choice minOccurs="0" maxOccurs="unbounded"><xs:choice>
-          <xs:element name="position" type="xs:long"/>
-          <xs:element name="acquired_count" type="xs:int"/>
-          <xs:element name="acquired_size" type="xs:long"/>
-          <xs:element name="total_ack_count" type="xs:long"/>
-          <xs:element name="total_nack_count" type="xs:long"/>
-          <xs:element name="ack_item_rate" type="xs:double" minOccurs="0"/>
-          <xs:element name="ack_size_rate" type="xs:double" minOccurs="0"/>
-        </xs:choice></xs:choice>
-        <xs:attribute name="waiting_on" type="xs:string"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
   <xs:complexType name="queueStatusDTO">
     <xs:complexContent>
       <xs:extension base="tns:serviceStatusDTO">

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/stomp-manual.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/stomp-manual.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/stomp-manual.html Thu Jan 31 15:49:57 2013
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.5</a></li>
+<li><a href="../index.html">Apollo 1.6</a></li>
 <li><a href="../community/developers.html">Developers</a></li>
 <li><a href="../community/index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>
@@ -40,7 +40,7 @@
     </div>
     <div id="content">
       <div class="wrapper">
-<h1 id = "Apollo_1_5_STOMP_Protocol_Manual">Apollo 1.5 STOMP Protocol Manual</h1>
+<h1 id = "Apollo_1_6_STOMP_Protocol_Manual">Apollo 1.6 STOMP Protocol Manual</h1>
 
 <p><div class="toc"><ul style="list-style:none;">
   <li><a href="#Using_the_STOMP_Protocol">Using the STOMP Protocol</a></li>
@@ -58,6 +58,7 @@
     <li><a href="#Queue_Message_Sequences">Queue Message Sequences</a></li>
     <li><a href="#Using_Queue_Browsers_to_Implement_Durable_Topic_Subscriptions">Using Queue Browsers to Implement Durable Topic Subscriptions</a></li>
     <li><a href="#Exclusive_Subscriptions">Exclusive Subscriptions</a></li>
+    <li><a href="#Message_Groups">Message Groups</a></li>
     <li><a href="#Temporary_Destinations">Temporary Destinations</a></li>
     <li><a href="#Destination_Wildcards">Destination Wildcards</a></li>
     <li><a href="#Composite_Destinations">Composite Destinations</a></li>
@@ -625,6 +626,41 @@ destination:/queue/foo
 
 ^@</code></pre>
 
+<h3 id = "Message_Groups">Message Groups</h3>
+
+<p>Message Groups are an enhancement to the Exclusive Consumer feature to provide</p>
+
+<ul>
+<li>guaranteed ordering of the processing of related messages across a single queue</li>
+<li>load balancing of the processing of messages across multiple consumers</li>
+<li>high availability / auto-failover to other consumers if a JVM goes down</li>
+</ul>
+
+<p>Message Groups are logically like a parallel Exclusive Consumer. Rather 
+than all messages going to a single consumer, the stomp <code>message_group</code> header
+is used to define which message group the message belongs to. The Message Group 
+feature then ensures that all messages for the same message group will be sent to 
+the currently assigned consumer for the group.  The assigned consumer consumer
+for a message group may change but not before all messages sent to the previous
+consumer are acked or if the consumer is disconnected.</p>
+
+<p>Another way of explaining Message Groups is that it provides sticky load balancing 
+of messages across consumers; where the message group value is kinda like a HTTP 
+session ID or cookie value and the message broker is acting like a HTTP load balancer.</p>
+
+<p>Here is an example message with the message group set:</p>
+
+<pre><code>MESSAGE
+destination:/queue/PO.REQUEST
+message_group:hiram
+
+PO145
+^@</code></pre>
+
+<p>The broker uses consistent hashing to map message groups to consumers.  When you add another
+subscription to a queue, the broker will first wait for messages sent to previous subscriptions
+to be processed and then the broker rebalances the message groups across the attached consumers.</p>
+
 <h3 id = "Temporary_Destinations">Temporary Destinations</h3>
 
 <p>Temporary destinations are typically used to receive response messages in

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/user-manual.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/user-manual.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/user-manual.html Thu Jan 31 15:49:57 2013
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.5</a></li>
+<li><a href="../index.html">Apollo 1.6</a></li>
 <li><a href="../community/developers.html">Developers</a></li>
 <li><a href="../community/index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>
@@ -40,7 +40,7 @@
     </div>
     <div id="content">
       <div class="wrapper">
-<h1 id = "Apollo_1_5_User_Manual">Apollo 1.5 User Manual</h1>
+<h1 id = "Apollo_1_6_User_Manual">Apollo 1.6 User Manual</h1>
 
 <p><div class="toc"><ul style="list-style:none;">
   <li><a href="#Creating_a_Broker">Creating a Broker</a></li>
@@ -468,6 +468,14 @@ details.  Defaults to false.</p></li>
 freshly enqueued message.  Defaults to <code>640k</code>.</p></li>
 <li><p><code>persistent</code> : If set to false, then the queue will not persistently
 store it's message.  Defaults to true.</p></li>
+<li><p><code>message_group_graceful_handoff</code> : When set to true, the queue
+will drain message group consumers of messages before
+allowing new messages to dispatched to messages groups which have been 
+moved to a different consumer due to re-balancing. Defaults to true.</p></li>
+<li><p><code>round_robin</code> : Should the destination dispatch messages to consumers
+using round robin distribution strategy?  Defaults to true.
+If set to false, then messages will be dispatched to the first attached 
+consumers until those consumers start throttling the broker.</p></li>
 <li><p><code>swap</code> : If set to false, then the queue will not swap messages out of 
 memory.  Defaults to true.</p></li>
 <li><p><code>swap_range_size</code> : The number max number of flushed queue entries to load
@@ -505,6 +513,8 @@ number of times the message will be cons
 poison message and will get moved to the dead letter queue if that's
 configured or dropped.  If set to less than one, then the message
 will never be considered to be a poison message. Defaults to zero.</p></li>
+<li><p><code>dlq_expired</code>: Should expired messages be sent to the dead letter queue? <br/>
+Defaults to false.</p></li>
 <li><p><code>full_policy</code>: Once the queue is full, the <code>full_policy</code> 
 controls how the   queue behaves when additional messages attempt to 
 be enqueued onto the queue.</p>
@@ -1152,6 +1162,7 @@ host's message store.</p>
 <li><a href="stomp-manual.html">STOMP Protocol Manual</a></li>
 <li><a href="amqp-manual.html">AMQP Protocol Manual</a></li>
 <li><a href="openwire-manual.html">OpenWire Protocol Manual</a></li>
+<li><a href="mqtt-manual.html">MQTT Protocol Manual</a></li>
 </ul>
         <div></div>
       </div>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/verification.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/verification.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/verification.html Thu Jan 31 15:49:57 2013
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.5</a></li>
+<li><a href="../index.html">Apollo 1.6</a></li>
 <li><a href="../community/developers.html">Developers</a></li>
 <li><a href="../community/index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/download.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/download.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/download.html Thu Jan 31 15:49:57 2013
@@ -57,7 +57,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="index.html">Apollo 1.5</a></li>
+<li><a href="index.html">Apollo 1.6</a></li>
 <li><a href="community/developers.html">Developers</a></li>
 <li><a href="community/index.html">Community</a></li>
 <li><a href="download.html">Download</a></li>
@@ -80,43 +80,78 @@
     <div id="content">
       <div class="wrapper">
 <h2 id = "Get_the_latest_official_version">Get the latest official version</h2>
-<h3 id = "Apollo_1_5">Apollo 1.5</h3>
+<h3 id = "Apollo_1_6">Apollo 1.6</h3>
 
-<p><a href="blog/releases/release-1.5.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/index.html">Documentation</a></p>
+<p><a href="blog/releases/release-1.6.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/index.html">Documentation</a></p>
 <table class="download">
   <tr>
     <td>Binaries for Unix/Linux/OS X:</td>
     <td>
-      <a href="http://www.apache.org/dyn/closer.cgi?path=activemq/activemq-apollo/1.5/apache-apollo-1.5-unix-distro.tar.gz">apache-apollo-1.5-unix-distro.tar.gz</a>
+      <a href="http://www.apache.org/dyn/closer.cgi?path=activemq/activemq-apollo/1.6/apache-apollo-1.6-unix-distro.tar.gz">apache-apollo-1.6-unix-distro.tar.gz</a>
     </td>
     <td>
-      <a href="http://apache.org/dist/activemq/activemq-apollo/1.5/apache-apollo-1.5-unix-distro.tar.gz.asc">GPG Signature</a>
+      <a href="http://apache.org/dist/activemq/activemq-apollo/1.6/apache-apollo-1.6-unix-distro.tar.gz.asc">GPG Signature</a>
     </td>
   </tr>
   <tr>
     <td>Binaries for Windows:</td>
     <td>
-      <a href="http://www.apache.org/dyn/closer.cgi?path=activemq/activemq-apollo/1.5/apache-apollo-1.5-windows-distro.zip">apache-apollo-1.5-windows-distro.zip</a>
+      <a href="http://www.apache.org/dyn/closer.cgi?path=activemq/activemq-apollo/1.6/apache-apollo-1.6-windows-distro.zip">apache-apollo-1.6-windows-distro.zip</a>
     </td>
     <td>
-      <a href="http://apache.org/dist/activemq/activemq-apollo/1.5/apache-apollo-1.5-windows-distro.zip.asc">GPG Signature</a>
+      <a href="http://apache.org/dist/activemq/activemq-apollo/1.6/apache-apollo-1.6-windows-distro.zip.asc">GPG Signature</a>
     </td>
   </tr>
   <tr>
     <td>Source Code Distribution:</td>
     <td>
-      <a href="http://www.apache.org/dyn/closer.cgi?path=activemq/activemq-apollo/1.5/apollo-project-1.5-source-release.tar.gz">apollo-project-1.5-source-release.tar.gz</a>
+      <a href="http://www.apache.org/dyn/closer.cgi?path=activemq/activemq-apollo/1.6/apollo-project-1.6-source-release.tar.gz">apollo-project-1.6-source-release.tar.gz</a>
     </td>
     <td>
-      <a href="http://apache.org/dist/activemq/activemq-apollo/1.5/apollo-project-1.5-source-release.tar.gz.asc">GPG Signature</a>
+      <a href="http://apache.org/dist/activemq/activemq-apollo/1.6/apollo-project-1.6-source-release.tar.gz.asc">GPG Signature</a>
     </td>
   </tr>
 </table>
-<h2 class="accordion">
-  <a href="#">Older Versions</a>
-</h2>
+<div class="accordion" style="padding-top:1em;">
+  <a href="#">Show older versions...</a>
+</div>
 <div class="hide">
   <h3 class="accordion">
+    <a href="#">Apollo 1.5</a>
+  </h3>
+  <div class="hide">
+    <p><a href="blog/releases/release-1.5.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/index.html">Documentation</a></p>
+    <table class="download">
+      <tr>
+        <td>Binaries for Unix/Linux/OS X:</td>
+        <td>
+          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.5/apache-apollo-1.5-unix-distro.tar.gz">apache-apollo-1.5-unix-distro.tar.gz</a>
+        </td>
+        <td>
+          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.5/apache-apollo-1.5-unix-distro.tar.gz.asc">GPG Signature</a>
+        </td>
+      </tr>
+      <tr>
+        <td>Binaries for Windows:</td>
+        <td>
+          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.5/apache-apollo-1.5-windows-distro.zip">apache-apollo-1.5-windows-distro.zip</a>
+        </td>
+        <td>
+          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.5/apache-apollo-1.5-windows-distro.zip.asc">GPG Signature</a>
+        </td>
+      </tr>
+      <tr>
+        <td>Source Code Distribution:</td>
+        <td>
+          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.5/apollo-project-1.5-source-release.tar.gz">apollo-project-1.5-source-release.tar.gz</a>
+        </td>
+        <td>
+          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.5/apollo-project-1.5-source-release.tar.gz.asc">GPG Signature</a>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <h3 class="accordion">
     <a href="#">Apollo 1.4</a>
   </h3>
   <div class="hide">
@@ -291,216 +326,6 @@
       </tr>
     </table>
   </div>
-  <h3 class="accordion">
-    <a href="#">Apollo 1.0-beta6</a>
-  </h3>
-  <div class="hide">
-    <p><a href="blog/releases/release-1-0-beta6.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta6/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta6/website/documentation/index.html">Documentation</a></p>
-    <table class="download">
-      <tr>
-        <td>Binaries for Unix/Linux/OS X:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta6/apache-apollo-1.0-beta6-unix-distro.tar.gz">apache-apollo-1.0-beta6-unix-distro.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta6/apache-apollo-1.0-beta6-unix-distro.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Binaries for Windows:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta6/apache-apollo-1.0-beta6-windows-distro.zip">apache-apollo-1.0-beta6-windows-distro.zip</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta6/apache-apollo-1.0-beta6-windows-distro.zip.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Source Code Distribution:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta6/apollo-project-1.0-beta6-source-release.tar.gz">apollo-project-1.0-beta6-source-release.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta6/apollo-project-1.0-beta6-source-release.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <h3 class="accordion">
-    <a href="#">Apollo 1.0-beta5</a>
-  </h3>
-  <div class="hide">
-    <p><a href="blog/releases/release-1-0-beta5.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta5/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta5/website/documentation/index.html">Documentation</a></p>
-    <table class="download">
-      <tr>
-        <td>Binaries for Unix/Linux/OS X:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta5/apache-apollo-1.0-beta5-unix-distro.tar.gz">apache-apollo-1.0-beta5-unix-distro.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta5/apache-apollo-1.0-beta5-unix-distro.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Binaries for Windows:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta5/apache-apollo-1.0-beta5-windows-distro.zip">apache-apollo-1.0-beta5-windows-distro.zip</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta5/apache-apollo-1.0-beta5-windows-distro.zip.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Source Code Distribution:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta5/apollo-project-1.0-beta5-source-release.tar.gz">apollo-project-1.0-beta5-source-release.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta5/apollo-project-1.0-beta5-source-release.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <h3 class="accordion">
-    <a href="#">Apollo 1.0-beta4</a>
-  </h3>
-  <div class="hide">
-    <p><a href="blog/releases/release-1-0-beta4.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta4/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta4/website/documentation/index.html">Documentation</a></p>
-    <table class="download">
-      <tr>
-        <td>Binaries for Unix/Linux/OS X:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta4/apache-apollo-1.0-beta4-unix-distro.tar.gz">apache-apollo-1.0-beta4-unix-distro.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta4/apache-apollo-1.0-beta4-unix-distro.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Binaries for Windows:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta4/apache-apollo-1.0-beta4-windows-distro.zip">apache-apollo-1.0-beta4-windows-distro.zip</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta4/apache-apollo-1.0-beta4-windows-distro.zip.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Source Code Distribution:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta4/apollo-project-1.0-beta4-source-release.tar.gz">apollo-project-1.0-beta4-source-release.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta4/apollo-project-1.0-beta4-source-release.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <h3 class="accordion">
-    <a href="#">Apollo 1.0-beta3</a>
-  </h3>
-  <div class="hide">
-    <p><a href="blog/releases/release-1-0-beta3.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta3/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta3/website/documentation/index.html">Documentation</a></p>
-    <table class="download">
-      <tr>
-        <td>Binaries for Unix/Linux/OS X:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta3/apache-apollo-1.0-beta3-unix-distro.tar.gz">apache-apollo-1.0-beta3-unix-distro.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta3/apache-apollo-1.0-beta3-unix-distro.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Binaries for Windows:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta3/apache-apollo-1.0-beta3-windows-distro.zip">apache-apollo-1.0-beta3-windows-distro.zip</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta3/apache-apollo-1.0-beta3-windows-distro.zip.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Source Code Distribution:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta3/apollo-project-1.0-beta3-source-release.tar.gz">apollo-project-1.0-beta3-source-release.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta3/apollo-project-1.0-beta3-source-release.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <h3 class="accordion">
-    <a href="#">Apollo 1.0-beta2</a>
-  </h3>
-  <div class="hide">
-    <p><a href="blog/releases/release-1-0-beta2.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta2/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta2/website/documentation/index.html">Documentation</a></p>
-    <table class="download">
-      <tr>
-        <td>Binaries for Unix/Linux/OS X:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta2/apache-apollo-1.0-beta2-unix-distro.tar.gz">apache-apollo-1.0-beta2-unix-distro.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta2/apache-apollo-1.0-beta2-unix-distro.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Binaries for Windows:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta2/apache-apollo-1.0-beta2-windows-distro.zip">apache-apollo-1.0-beta2-windows-distro.zip</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta2/apache-apollo-1.0-beta2-windows-distro.zip.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Source Code Distribution:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta2/apollo-project-1.0-beta2-source-release.tar.gz">apollo-project-1.0-beta2-source-release.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta2/apollo-project-1.0-beta2-source-release.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-    </table>
-  </div>
-  <h3 class="accordion">
-    <a href="#">Apollo 1.0-beta1</a>
-  </h3>
-  <div class="hide">
-    <p><a href="blog/releases/release-1-0-beta1.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta1/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.0-beta1/website/documentation/index.html">Documentation</a></p>
-    <table class="download">
-      <tr>
-        <td>Binaries for Unix/Linux/OS X:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta1/apache-apollo-1.0-beta1-unix-distro.tar.gz">apache-apollo-1.0-beta1-unix-distro.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta1/apache-apollo-1.0-beta1-unix-distro.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Binaries for Windows:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta1/apache-apollo-1.0-beta1-windows-distro.zip">apache-apollo-1.0-beta1-windows-distro.zip</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta1/apache-apollo-1.0-beta1-windows-distro.zip.asc">GPG Signature</a>
-        </td>
-      </tr>
-      <tr>
-        <td>Source Code Distribution:</td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta1/apollo-project-1.0-beta1-source-release.tar.gz">apollo-project-1.0-beta1-source-release.tar.gz</a>
-        </td>
-        <td>
-          <a href="http://archive.apache.org/dist/activemq/activemq-apollo/1.0-beta1/apollo-project-1.0-beta1-source-release.tar.gz.asc">GPG Signature</a>
-        </td>
-      </tr>
-    </table>
-  </div>
 </div>
 <h2 id = "Development_Snapshot">Development Snapshot</h2>
 

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/images/module-deps-graph.png
==============================================================================
    (empty)

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/images/project-logo-vector.png
==============================================================================
    (empty)

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/images/project-logo.png
==============================================================================
    (empty)

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/images/rss.gif
==============================================================================
    (empty)

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/index.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/index.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/index.html Thu Jan 31 15:49:57 2013
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="index.html">Apollo 1.5</a></li>
+<li><a href="index.html">Apollo 1.6</a></li>
 <li><a href="community/developers.html">Developers</a></li>
 <li><a href="community/index.html">Community</a></li>
 <li><a href="download.html">Download</a></li>
@@ -44,7 +44,7 @@
           <img src="images/project-logo.png" alt="Apollo logo"/>
         </div>
         <div class="message">
-<h1>Apollo 1.5</h1>
+<h1>Apollo 1.6</h1>
 ActiveMQ's next generation of messaging
 
           <div></div>
@@ -63,18 +63,19 @@ multi-protocol broker and supports STOMP
 <h2 id = "Features">Features</h2>
 
 <ul>
-<li><a href="documentation/stomp-manual.html">STOMP Protocol Support</a></li>
-<li><a href="documentation/stomp-manual.html">AMQP Protocol Support</a></li>
+<li>STOMP Protocol Support</li>
+<li>AMQP Protocol Support</li>
 <li>MQTT Protocol Support</li>
-<li><a href="documentation/openwire-manual.html">OpenWire Protocol Support</a></li>
-<li><a href="documentation/user-manual.html#Destination&#95;Types">Topics and Queues</a></li>
-<li><a href="documentation/user-manual.html#Browsing&#95;Subscriptions">Queue Browsers</a></li>
-<li><a href="documentation/user-manual.html#Topic&#95;Durable&#95;Subscriptions">Durable Subscriptions on Topics</a></li>
+<li>OpenWire Protocol Support</li>
+<li><a href="documentation/stomp-manual.html#Destination&#95;Types">Topics and Queues</a></li>
+<li><a href="documentation/stomp-manual.html#Browsing&#95;Subscriptions">Queue Browsers</a></li>
+<li><a href="documentation/stomp-manual.html#Topic&#95;Durable&#95;Subscriptions">Durable Subscriptions on Topics</a></li>
 <li><a href="documentation/user-manual.html#Mirrored&#95;Queues">Mirrored Queues</a></li>
-<li><a href="documentation/user-manual.html#Reliable&#95;Messaging">Reliable Messaging</a></li>
-<li><a href="documentation/user-manual.html#Message&#95;Expiration">Message Expiration</a></li>
+<li><a href="documentation/stomp-manual.html#Reliable&#95;Messaging">Reliable Messaging</a></li>
+<li><a href="documentation/stomp-manual.html#Message&#95;Expiration">Message Expiration</a></li>
 <li><a href="documentation/architecture.html#Message&#95;Swapping">Message Swapping</a></li>
-<li><a href="documentation/user-manual.html#Message&#95;Selectors">Message Selectors</a></li>
+<li><a href="documentation/stomp-manual.html#Message&#95;Selectors">Message Selectors</a></li>
+<li><a href="documentation/stomp-manual.html#Message&#95;Groups">Message Groups</a></li>
 <li><a href="documentation/user-manual.html#Authentication">JAAS Authentication</a></li>
 <li><a href="documentation/user-manual.html#Authorization">ACL based Authorization</a></li>
 <li><a href="documentation/user-manual.html#Using&#95;SSL&#95;TLS">SSL/TLS Support</a> and Certificate based Authentication</li>
@@ -87,6 +88,10 @@ multi-protocol broker and supports STOMP
 <li><a href="documentation/getting-started.html">Getting Started Guide</a></li>
 <li><a href="documentation/user-manual.html">User Manual</a></li>
 <li><a href="documentation/migration-guide.html">Migration Guide</a></li>
+<li><a href="documentation/stomp-manual.html">STOMP Protocol Manual</a></li>
+<li><a href="documentation/openwire-manual.html">OpenWire Protocol Manual</a></li>
+<li><a href="documentation/amqp-manual.html">AMQP Protocol Manual</a></li>
+<li><a href="documentation/mqtt-manual.html">MQTT Protocol Manual</a></li>
 </ul>
         <div></div>
       </div>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/privacy-policy.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/privacy-policy.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/privacy-policy.html Thu Jan 31 15:49:57 2013
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="index.html">Apollo 1.5</a></li>
+<li><a href="index.html">Apollo 1.6</a></li>
 <li><a href="community/developers.html">Developers</a></li>
 <li><a href="community/index.html">Community</a></li>
 <li><a href="download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/scripts/jquery.js
==============================================================================
    (empty)

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/styles/impact/blog.template
==============================================================================
    (empty)

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/styles/impact/css/pygmentize.css
==============================================================================
    (empty)

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/styles/impact/css/site.css
==============================================================================
    (empty)

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/versions/index.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/versions/index.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/versions/index.html Thu Jan 31 15:49:57 2013
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.5</a></li>
+<li><a href="../index.html">Apollo 1.6</a></li>
 <li><a href="../community/developers.html">Developers</a></li>
 <li><a href="../community/index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>
@@ -45,66 +45,28 @@
 <p>We version our website content along with the project so that you
 can easily get to the documentation that's most appropriate for the 
 version of the project your using.</p>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.5/website/index.html">1.5 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.4/website/index.html">1.4 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.3/website/index.html">1.3 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.2/website/index.html">1.2 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.1/website/index.html">1.1 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.0/website/index.html">1.0 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.0-beta6/website/index.html">1.0-beta6 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.0-beta5/website/index.html">1.0-beta5 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.0-beta4/website/index.html">1.0-beta4 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.0-beta3/website/index.html">1.0-beta3 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.0-beta2/website/index.html">1.0-beta2 Website</a></li>
-</ul>
-<h3 id = "1_0_Release">1.0 Release</h3>
-
-<ul>
-<li><a href="http://activemq.apache.org/apollo/versions/1.0-beta1/website/index.html">1.0-beta1 Website</a></li>
-</ul>
+<ul></ul>
+<li>
+  <a href="http://activemq.apache.org/apollo/versions/1.6/website/index.html">1.6 Website</a>
+</li>
+<li>
+  <a href="http://activemq.apache.org/apollo/versions/1.5/website/index.html">1.5 Website</a>
+</li>
+<li>
+  <a href="http://activemq.apache.org/apollo/versions/1.4/website/index.html">1.4 Website</a>
+</li>
+<li>
+  <a href="http://activemq.apache.org/apollo/versions/1.3/website/index.html">1.3 Website</a>
+</li>
+<li>
+  <a href="http://activemq.apache.org/apollo/versions/1.2/website/index.html">1.2 Website</a>
+</li>
+<li>
+  <a href="http://activemq.apache.org/apollo/versions/1.1/website/index.html">1.1 Website</a>
+</li>
+<li>
+  <a href="http://activemq.apache.org/apollo/versions/1.0/website/index.html">1.0 Website</a>
+</li>
 <h1 id = "Nightly_Development_Snapshots">Nightly Development Snapshots</h1>
 
 <ul>