activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r848794 [1/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 GMT
Author: chirino
Date: Thu Jan 31 15:49:57 2013
New Revision: 848794

Log:
[maven-svn-wagon] websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website

Added:
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/mqtt-manual.html
Modified:
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/.DS_Store
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/.DS_Store
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/index.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/index.rss
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta1.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta2.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta3.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta4.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta5.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta6.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.0.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.1.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.2.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.3.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.4.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.5.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/building.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/contributing.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/developers.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/faq.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/index.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/release-guide.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/site.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/source.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/support.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/amqp-manual.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/architecture.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/extending-guide.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/getting-started.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/index.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/management-api.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/migration-guide.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/module-organization.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/openwire-manual.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/performance-scaling.html
    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/stomp-manual.html
    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/verification.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/download.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/images/module-deps-graph.png
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/images/project-logo-vector.png
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/images/project-logo.png
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/images/rss.gif
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/index.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/privacy-policy.html
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/scripts/jquery.js
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/styles/impact/blog.template
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/styles/impact/css/pygmentize.css
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/styles/impact/css/site.css
    websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/versions/index.html

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

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

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/index.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/index.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/index.html Thu Jan 31 15:49:57 2013
@@ -34,7 +34,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/blog/index.rss
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/index.rss (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/index.rss Thu Jan 31 15:49:57 2013
@@ -4,8 +4,8 @@
           <title>The Apollo Blog</title>
           <link>http://activemq.apache.org/apollo/blog/</link>
           <description>ActiveMQ's next generation of messaging</description>
-          <pubDate>Thu, 6 Dec 2012 13:54:04 -0500</pubDate>
-          <lastBuildDate>Thu, 6 Dec 2012 13:54:04 -0500</lastBuildDate>
+          <pubDate>Thu, 31 Jan 2013 10:42:57 -0500</pubDate>
+          <lastBuildDate>Thu, 31 Jan 2013 10:42:57 -0500</lastBuildDate>
           <generator>Scalate - http://scalate.fusesource.org/</generator>
           <item>
               <title>Apollo 1.5</title>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta1.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta1.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta1.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/blog/releases/release-1-0-beta2.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta2.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta2.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/blog/releases/release-1-0-beta3.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta3.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta3.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/blog/releases/release-1-0-beta4.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta4.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta4.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/blog/releases/release-1-0-beta5.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta5.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta5.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/blog/releases/release-1-0-beta6.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta6.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1-0-beta6.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/blog/releases/release-1.0.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.0.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.0.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/blog/releases/release-1.1.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.1.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.1.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/blog/releases/release-1.2.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.2.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.2.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/blog/releases/release-1.3.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.3.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.3.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/blog/releases/release-1.4.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.4.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.4.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/blog/releases/release-1.5.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.5.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.5.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/community/building.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/building.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/building.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="developers.html">Developers</a></li>
 <li><a href="index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/contributing.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/contributing.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/contributing.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="developers.html">Developers</a></li>
 <li><a href="index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/developers.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/developers.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/developers.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="developers.html">Developers</a></li>
 <li><a href="index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>
@@ -60,7 +60,7 @@
 <li><a href="building.html">Building</a></li>
 <li><a href="contributing.html">Contributing</a></li>
 <li><a href="release-guide.html">Release Guide</a></li>
-<li><a href="http://activemq.apache.org/apollo/versions/1.5/maven/">Maven Site Reports</a></li>
+<li><a href="http://activemq.apache.org/apollo/versions/1.6/maven/">Maven Site Reports</a></li>
 </ul>
 
 <h1 id = "Architecture_Notes">Architecture Notes</h1>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/faq.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/faq.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/faq.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="developers.html">Developers</a></li>
 <li><a href="index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/index.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/index.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/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="developers.html">Developers</a></li>
 <li><a href="index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/release-guide.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/release-guide.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/release-guide.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="developers.html">Developers</a></li>
 <li><a href="index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/site.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/site.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/site.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="developers.html">Developers</a></li>
 <li><a href="index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/source.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/source.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/source.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="developers.html">Developers</a></li>
 <li><a href="index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/support.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/support.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/community/support.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="developers.html">Developers</a></li>
 <li><a href="index.html">Community</a></li>
 <li><a href="../download.html">Download</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/amqp-manual.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/amqp-manual.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/amqp-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_AMQP_Protocol_Manual">Apollo 1.5 AMQP Protocol Manual</h1>
+<h1 id = "Apollo_1_6_AMQP_Protocol_Manual">Apollo 1.6 AMQP Protocol Manual</h1>
 
 <p><div class="toc"><ul style="list-style:none;">
   <li><a href="#Using_the_AMQP_Protocol">Using the AMQP Protocol</a></li>
@@ -103,8 +103,8 @@ closed before the socket is closed/reset
 headers are parsed and interpreted.  The supported attributes are:</p>
 
 <ul>
-<li><code>queue_prefix</code> : Defaults to <code>/queue/</code></li>
-<li><code>topic_prefix</code> : Defaults to <code>/topic/</code></li>
+<li><code>queue_prefix</code> : Defaults to <code>queue://</code></li>
+<li><code>topic_prefix</code> : Defaults to <code>topic://</code></li>
 <li><code>path_separator</code> : Defaults to <code>.</code></li>
 <li><code>destination_separator</code> : Defaults to <code>,</code></li>
 <li><code>any_child_wildcard</code> : Defaults to <code>*</code></li>
@@ -148,8 +148,8 @@ can reconnect and consume the queued mes
 at a later time.</p>
 
 <p>If you want to send or subscribe to a queue, topic, or durable
-subscription the AMQP address should be prefixed with <code>/queue/</code>,
-<code>/topic/</code> or <code>/dsub/</code> respectively.</p>
+subscription the AMQP address should be prefixed with <code>queue://</code>,
+<code>topic://</code> or <code>dsub://</code> respectively.</p>
 
 <!-- TODO: not supported yet via AMQP protocol
 ### Topic Retained Messages
@@ -203,12 +203,12 @@ durable property must be set to DURABLE 
 source expiry policy to LINK_DETACH and then close the link.</p>
 
 <p>If the durable subscription already exists you can address it directly using
-<code>/dsub/</code> prefix on the <code>destination</code> header. For example, send a message to
+<code>dsub://</code> prefix on the <code>destination</code> header. For example, send a message to
 the previously created <code>mysub</code> durable subscription, you would message to
-the target address of <code>/dsub/mysub</code>.</p>
+the target address of <code>dsub://mysub</code>.</p>
 
 <p>Similarly, you can also receive messages from the durable subscription by using 
-the source address of <code>/dsub/mysub</code>,</p>
+the source address of <code>dsub://mysub</code>,</p>
 
 <p>Unlike typical AMQP link id's which are local to the AMQP client's
 connection, the durable subscription id's are global across a virtual host. If
@@ -403,8 +403,8 @@ information you're interested in.</p>
 You might use some kind of destination naming conventions such as:</p>
 
 <ul>
-<li><code>/topic/PRICE.STOCK.NASDAQ.IBM</code> to publish IBM's price on NASDAQ and</li>
-<li><code>/topic/PRICE.STOCK.NYSE.SUNW</code> to publish Sun's price on the New York Stock Exchange</li>
+<li><code>topic://PRICE.STOCK.NASDAQ.IBM</code> to publish IBM's price on NASDAQ and</li>
+<li><code>topic://PRICE.STOCK.NYSE.SUNW</code> to publish Sun's price on the New York Stock Exchange</li>
 </ul>
 
 <p>A subscriber could then use exact destinations to subscribe to exactly the
@@ -414,12 +414,12 @@ matches to the destinations to subscribe
 <p>For example using the example above, these subscriptions are possible</p>
 
 <ul>
-<li><code>/topic/PRICE.**</code> : Any price for any product on any exchange</li>
-<li><code>/topic/PRICE.STOCK.**</code> : Any price for a stock on any exchange</li>
-<li><code>/topic/PRICE.STOCK.NASDAQ.*</code> : Any stock price on NASDAQ</li>
-<li><code>/topic/PRICE.STOCK.*.IBM</code> : Any IBM stock price on any exchange</li>
-<li><code>/topic/PRICE.STOCK.*.I*</code> : Any stock price starting with 'I' on any exchange</li>
-<li><code>/topic/PRICE.STOCK.*.*{[0-9]}</code> : Any stock price that ends in a digit on any exchange</li>
+<li><code>topic://PRICE.**</code> : Any price for any product on any exchange</li>
+<li><code>topic://PRICE.STOCK.**</code> : Any price for a stock on any exchange</li>
+<li><code>topic://PRICE.STOCK.NASDAQ.*</code> : Any stock price on NASDAQ</li>
+<li><code>topic://PRICE.STOCK.*.IBM</code> : Any IBM stock price on any exchange</li>
+<li><code>topic://PRICE.STOCK.*.I*</code> : Any stock price starting with 'I' on any exchange</li>
+<li><code>topic://PRICE.STOCK.*.*{[0-9]}</code> : Any stock price that ends in a digit on any exchange</li>
 </ul>
 
 <p>Destination wildcards can only be used in a SUBSCRIBE frame.</p>
@@ -429,7 +429,7 @@ matches to the destinations to subscribe
 <p>You can use composite destinations to send or subscribe to multiple
 destinations at one time. You use separator of <code>,</code> between destination
 names.  For example to send one message to 2 queues and 1 topic, you would
-use an address of '/queue/a,/queue/b,/topic/c'</p>
+use an address of 'queue://a,queue://b,topic://c'</p>
 
 <h3 id = "Message_Selectors">Message Selectors</h3>
 

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/architecture.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/architecture.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/architecture.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/documentation/extending-guide.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/extending-guide.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/extending-guide.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_Extending_Guide">Apollo 1.5 Extending Guide</h1>
+<h1 id = "Apollo_1_6_Extending_Guide">Apollo 1.6 Extending Guide</h1>
 
 <p><div class="toc"><ul style="list-style:none;">
   <li><a href="#Overview">Overview</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/getting-started.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/getting-started.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/getting-started.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>
@@ -80,31 +80,31 @@ that the broker is operating correctly.<
 most appropriate for your operating system.</p></li>
 <li><p>Extract the distribution archive:</p>
 
-<div class="wide"><div class="compare"><div class="compare-left"><h3>Unix/Linux/OS X</h3><div class="syntax"><div class="highlight"><pre>tar -zxvf apache-apollo-1.5-unix-distro.tar.gz&#x000A;</pre></div>&#x000A;</div></div><div class="compare-right"><h3>Windows</h3><div class="syntax"><div class="highlight"><pre>jar -xvf apache-apollo-1.5-windows-distro.zip&#x000A;</pre></div>&#x000A;</div></div><br class="clear"/></div>
+<div class="wide"><div class="compare"><div class="compare-left"><h3>Unix/Linux/OS X</h3><div class="syntax"><div class="highlight"><pre>tar -zxvf apache-apollo-1.6-unix-distro.tar.gz&#x000A;</pre></div>&#x000A;</div></div><div class="compare-right"><h3>Windows</h3><div class="syntax"><div class="highlight"><pre>jar -xvf apache-apollo-1.6-windows-distro.zip&#x000A;</pre></div>&#x000A;</div></div><br class="clear"/></div>
 </div></li>
 </ol>
 
-<p>The distribution will be extracted into a directory called, <code>apache-apollo-1.5</code>.
-The rest of dis document will refer the full path to this directory as <code>${APOLLO_HOME}</code>.</p>
+<p>The distribution will be extracted into a directory called, <code>apache-apollo-1.6</code>.
+The rest of this document will refer to the full path to this directory as <code>${APOLLO_HOME}</code>.</p>
 
 <h3 id = "Optional_Windows_Prerequisites">Optional Windows Prerequisites</h3>
 
-<p>If your on Windows Vista, Server 2008, or later you should install the MS VC++ 2010 Redistributable
+<p>If you're on Windows Vista, Server 2008, or later you should install the MS VC++ 2010 Redistributable
 package so that Apollo can use the JNI implementation of LevelDB.  </p>
 
 <ul>
-<li>If your running a 32 bit JVM, install: <a href="http://www.microsoft.com/en-us/download/details.aspx?id=5555">Microsoft Visual C++ 2010 Redistributable Package (x86)</a></li>
-<li>If your running a 64 bit JVM, install: <a href="http://www.microsoft.com/en-us/download/details.aspx?id=14632">Microsoft Visual C++ 2010 Redistributable Package (x64)</a></li>
+<li>If you're running a 32 bit JVM, install: <a href="http://www.microsoft.com/en-us/download/details.aspx?id=5555">Microsoft Visual C++ 2010 Redistributable Package (x86)</a></li>
+<li>If you're running a 64 bit JVM, install: <a href="http://www.microsoft.com/en-us/download/details.aspx?id=14632">Microsoft Visual C++ 2010 Redistributable Package (x64)</a></li>
 </ul>
 
 <h3 id = "Creating_a_Broker_Instance">Creating a Broker Instance</h3>
 
 <p>A broker instance is the directory containing all the configuration and runtime
-data such as logs and data files associated with a broker process.  It is recommended that
+data, such as logs and data files, associated with a broker process.  It is recommended that
 you do <em>not</em> create the instance directory under <code>${APOLLO_HOME}</code>.  This separation is
 encouraged so that you can more easily upgrade when the next version of Apollo is released.</p>
 
-<p>On unix systems, it is a common convention to store this kind of runtime data under 
+<p>On Unix systems, it is a common convention to store this kind of runtime data under 
 the <code>/var/lib</code> directory.  For example, to create an instance at '/var/lib/mybroker', run:</p>
 
 <pre><code>cd /var/lib

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/index.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/index.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/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>
@@ -59,6 +59,7 @@
 <li><a href="stomp-manual.html">STOMP Protocol Manual</a></li>
 <li><a href="openwire-manual.html">OpenWire Protocol Manual</a></li>
 <li><a href="amqp-manual.html">AMQP Protocol Manual</a></li>
+<li><a href="mqtt-manual.html">MQTT Protocol Manual</a></li>
 <li><a href="migration-guide.html">Migration Guide</a></li>
 <li><a href="management-api.html">Management API</a></li>
 <li><a href="../community/developers.html">Contributor Documentation</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/management-api.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/management-api.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/management-api.html Thu Jan 31 15:49:57 2013
@@ -54,7 +54,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>
@@ -63,7 +63,7 @@
     </div>
     <div id="content">
       <div class="wrapper">
-<h1 id = "Apollo_1_5_Management_API">Apollo 1.5 Management API</h1>
+<h1 id = "Apollo_1_6_Management_API">Apollo 1.6 Management API</h1>
 
 <p><div class="toc"><ul style="list-style:none;">
   <li><a href="#Overview">Overview</a></li>
@@ -246,7 +246,7 @@ parameter to define the order in which t
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerStatusDTO.html">
         BrokerStatusDTO
       </a>
     </code>
@@ -258,7 +258,7 @@ parameter to define the order in which t
 
 <p><code>curl -u "admin:password" http://localhost:61680/broker.json</code></p>
 
-<div class="syntax"><div class="highlight"><pre><span class="p">{</span>&#x000A;  <span class="s2">&quot;id&quot;</span><span class="o">:</span> <span class="s2">&quot;default&quot;</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;state&quot;</span><span class="o">:</span> <span class="s2">&quot;STARTED&quot;</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;state_since&quot;</span><span class="o">:</span> <span class="mi">1314573353753</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;version&quot;</span><span class="o">:</span> <span class="s2">&quot;1.5&quot;</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;jvm_metrics&quot;</span><span class="o">:</span> <span class="p">{</span>&#x000A;    <span class="s2">&quot;heap_memory&quot;</span><span class="o">:</span> <span class="p">{</span>&#x000A;      <span class="s2">&quot;used&quot;</span><span class="o">:</span> <span class="mi">22165160</span><span class="p">,</span>&
 #x000A;      <span class="s2">&quot;alloc&quot;</span><span class="o">:</span> <span class="mi">162201600</span><span class="p">,</span>&#x000A;      <span class="s2">&quot;max&quot;</span><span class="o">:</span> <span class="mi">954466304</span>&#x000A;    <span class="p">},</span>&#x000A;    <span class="s2">&quot;non_heap_memory&quot;</span><span class="o">:</span> <span class="p">{</span>&#x000A;      <span class="s2">&quot;used&quot;</span><span class="o">:</span> <span class="mi">44522128</span><span class="p">,</span>&#x000A;      <span class="s2">&quot;alloc&quot;</span><span class="o">:</span> <span class="mi">45944832</span><span class="p">,</span>&#x000A;      <span class="s2">&quot;max&quot;</span><span class="o">:</span> <span class="mi">136314880</span>&#x000A;    <span class="p">},</span>&#x000A;    <span class="s2">&quot;classes_loaded&quot;</span><span class="o">:</span> <span class="mi">5776</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;
 classes_unloaded&quot;</span><span class="o">:</span> <span class="mi">0</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;threads_current&quot;</span><span class="o">:</span> <span class="mi">21</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;threads_peak&quot;</span><span class="o">:</span> <span class="mi">22</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_arch&quot;</span><span class="o">:</span> <span class="s2">&quot;x86_64&quot;</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_name&quot;</span><span class="o">:</span> <span class="s2">&quot;Mac OS X 10.7&quot;</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_memory_total&quot;</span><span class="o">:</span> <span class="mi">8589934592</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_memory_free&quot;</span><span class="o">:</span> <span class="mi">3339231232</span><span class="p">,</span>&#x000A;    <span class
 ="s2">&quot;os_swap_total&quot;</span><span class="o">:</span> <span class="mi">0</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_swap_free&quot;</span><span class="o">:</span> <span class="mi">2147483648</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_fd_open&quot;</span><span class="o">:</span> <span class="mi">111</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_fd_max&quot;</span><span class="o">:</span> <span class="mi">10240</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_load_average&quot;</span><span class="o">:</span> <span class="mf">0.99267578125</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_cpu_time&quot;</span><span class="o">:</span> <span class="mi">5630000000</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_processors&quot;</span><span class="o">:</span> <span class="mi">4</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;runt
 ime_name&quot;</span><span class="o">:</span> <span class="s2">&quot;86739@chirino-mbp.local&quot;</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;jvm_name&quot;</span><span class="o">:</span> <span class="s2">&quot;Java HotSpot(TM) 64-Bit Server VM 1.6.0_26 (Apple Inc.)&quot;</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;uptime&quot;</span><span class="o">:</span> <span class="mi">37761</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;start_time&quot;</span><span class="o">:</span> <span class="mi">1314573351000</span>&#x000A;  <span class="p">},</span>&#x000A;  <span class="s2">&quot;current_time&quot;</span><span class="o">:</span> <span class="mi">1314573388707</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;virtual_hosts&quot;</span><span class="o">:</span> <span class="p">[</span><span class="s2">&quot;default&quot;</span><span class="p">],</span>&#x000A;  <span class="s2">&quot;connectors&quot;</span><
 span class="o">:</span> <span class="p">[</span><span class="s2">&quot;tls&quot;</span><span class="p">,</span> <span class="s2">&quot;tcp&quot;</span><span class="p">],</span>&#x000A;  <span class="s2">&quot;connection_counter&quot;</span><span class="o">:</span> <span class="mi">0</span>&#x000A;<span class="p">}</span>&#x000A;</pre></div>&#x000A;</div>
+<div class="syntax"><div class="highlight"><pre><span class="p">{</span>&#x000A;  <span class="s2">&quot;id&quot;</span><span class="o">:</span> <span class="s2">&quot;default&quot;</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;state&quot;</span><span class="o">:</span> <span class="s2">&quot;STARTED&quot;</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;state_since&quot;</span><span class="o">:</span> <span class="mi">1314573353753</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;version&quot;</span><span class="o">:</span> <span class="s2">&quot;1.6&quot;</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;jvm_metrics&quot;</span><span class="o">:</span> <span class="p">{</span>&#x000A;    <span class="s2">&quot;heap_memory&quot;</span><span class="o">:</span> <span class="p">{</span>&#x000A;      <span class="s2">&quot;used&quot;</span><span class="o">:</span> <span class="mi">22165160</span><span class="p">,</span>&
 #x000A;      <span class="s2">&quot;alloc&quot;</span><span class="o">:</span> <span class="mi">162201600</span><span class="p">,</span>&#x000A;      <span class="s2">&quot;max&quot;</span><span class="o">:</span> <span class="mi">954466304</span>&#x000A;    <span class="p">},</span>&#x000A;    <span class="s2">&quot;non_heap_memory&quot;</span><span class="o">:</span> <span class="p">{</span>&#x000A;      <span class="s2">&quot;used&quot;</span><span class="o">:</span> <span class="mi">44522128</span><span class="p">,</span>&#x000A;      <span class="s2">&quot;alloc&quot;</span><span class="o">:</span> <span class="mi">45944832</span><span class="p">,</span>&#x000A;      <span class="s2">&quot;max&quot;</span><span class="o">:</span> <span class="mi">136314880</span>&#x000A;    <span class="p">},</span>&#x000A;    <span class="s2">&quot;classes_loaded&quot;</span><span class="o">:</span> <span class="mi">5776</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;
 classes_unloaded&quot;</span><span class="o">:</span> <span class="mi">0</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;threads_current&quot;</span><span class="o">:</span> <span class="mi">21</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;threads_peak&quot;</span><span class="o">:</span> <span class="mi">22</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_arch&quot;</span><span class="o">:</span> <span class="s2">&quot;x86_64&quot;</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_name&quot;</span><span class="o">:</span> <span class="s2">&quot;Mac OS X 10.7&quot;</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_memory_total&quot;</span><span class="o">:</span> <span class="mi">8589934592</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_memory_free&quot;</span><span class="o">:</span> <span class="mi">3339231232</span><span class="p">,</span>&#x000A;    <span class
 ="s2">&quot;os_swap_total&quot;</span><span class="o">:</span> <span class="mi">0</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_swap_free&quot;</span><span class="o">:</span> <span class="mi">2147483648</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_fd_open&quot;</span><span class="o">:</span> <span class="mi">111</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_fd_max&quot;</span><span class="o">:</span> <span class="mi">10240</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_load_average&quot;</span><span class="o">:</span> <span class="mf">0.99267578125</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_cpu_time&quot;</span><span class="o">:</span> <span class="mi">5630000000</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;os_processors&quot;</span><span class="o">:</span> <span class="mi">4</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;runt
 ime_name&quot;</span><span class="o">:</span> <span class="s2">&quot;86739@chirino-mbp.local&quot;</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;jvm_name&quot;</span><span class="o">:</span> <span class="s2">&quot;Java HotSpot(TM) 64-Bit Server VM 1.6.0_26 (Apple Inc.)&quot;</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;uptime&quot;</span><span class="o">:</span> <span class="mi">37761</span><span class="p">,</span>&#x000A;    <span class="s2">&quot;start_time&quot;</span><span class="o">:</span> <span class="mi">1314573351000</span>&#x000A;  <span class="p">},</span>&#x000A;  <span class="s2">&quot;current_time&quot;</span><span class="o">:</span> <span class="mi">1314573388707</span><span class="p">,</span>&#x000A;  <span class="s2">&quot;virtual_hosts&quot;</span><span class="o">:</span> <span class="p">[</span><span class="s2">&quot;default&quot;</span><span class="p">],</span>&#x000A;  <span class="s2">&quot;connectors&quot;</span><
 span class="o">:</span> <span class="p">[</span><span class="s2">&quot;tls&quot;</span><span class="p">,</span> <span class="s2">&quot;tcp&quot;</span><span class="p">],</span>&#x000A;  <span class="s2">&quot;connection_counter&quot;</span><span class="o">:</span> <span class="mi">0</span>&#x000A;<span class="p">}</span>&#x000A;</pre></div>&#x000A;</div>
 
 <p>You can the <code>?connections=true</code> query parameter to have a list of connections
 included n the result.</p>
@@ -280,7 +280,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -311,7 +311,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -338,7 +338,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -365,7 +365,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -404,11 +404,11 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html">
         VirtualHostStatusDTO
       </a>
       <div></div>
@@ -436,7 +436,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html">
         VirtualHostStatusDTO
       </a>
     </code>
@@ -467,7 +467,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -495,7 +495,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -523,7 +523,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -551,7 +551,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -579,7 +579,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/StoreStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/StoreStatusDTO.html">
         StoreStatusDTO
       </a>
  sub class (depends on the store implementation)
@@ -611,11 +611,11 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
       <div></div>
@@ -643,7 +643,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
     </code>
@@ -725,11 +725,11 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/TopicStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/TopicStatusDTO.html">
         TopicStatusDTO
       </a>
       <div></div>
@@ -757,7 +757,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/TopicStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/TopicStatusDTO.html">
         TopicStatusDTO
       </a>
     </code>
@@ -840,7 +840,7 @@ topic is being used by any clients.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
     </code>
@@ -868,11 +868,11 @@ spool messages being sent to the <code>{
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
       <div></div>
@@ -900,7 +900,7 @@ spool messages being sent to the <code>{
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
     </code>
@@ -939,11 +939,11 @@ spool messages being sent to the <code>{
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ServiceStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ServiceStatusDTO.html">
         ServiceStatusDTO
       </a>
       <div></div>
@@ -971,7 +971,7 @@ spool messages being sent to the <code>{
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ServiceStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ServiceStatusDTO.html">
         ServiceStatusDTO
       </a>
     </code>
@@ -1051,7 +1051,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateConnectionMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateConnectionMetricsDTO.html">
         AggregateConnectionMetricsDTO
       </a>
     </code>
@@ -1078,11 +1078,11 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ConnectionStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ConnectionStatusDTO.html">
         ConnectionStatusDTO
       </a>
       <div></div>
@@ -1110,7 +1110,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ConnectionStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ConnectionStatusDTO.html">
         ConnectionStatusDTO
       </a>
     </code>
@@ -1199,7 +1199,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerDTO.html">
         BrokerDTO
       </a>
     </code>
@@ -1228,7 +1228,7 @@ and then password fields are cleared.</p
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerDTO.html">
         BrokerDTO
       </a>
     </code>
@@ -1342,7 +1342,7 @@ the latter case, the content type is exp
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.5/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/PrincipalDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/PrincipalDTO.html">
         PrincipalDTO
       </a>
 array

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/migration-guide.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/migration-guide.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/migration-guide.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/documentation/module-organization.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/module-organization.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/module-organization.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>

Added: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/mqtt-manual.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/mqtt-manual.html (added)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/mqtt-manual.html Thu Jan 31 15:49:57 2013
@@ -0,0 +1,285 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd"> 
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  Architecture
+-->
+<html lang="en">
+  <head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+    <meta content="ActiveMQ's next generation of messaging" name="description"/>
+    <meta content="messaging,stomp,jms,activemq,apollo" name="keywords"/>
+    <meta content="Apollo" name="author"/>
+    <script src="../scripts/jquery.js"></script>
+    <link type="text/css" rel="stylesheet" href="../styles/impact/css/pygmentize.css"/>
+    <link type="text/css" rel="stylesheet" href="../styles/impact/css/site.css"/>
+    <title></title>
+  </head>
+  <body>
+    <div id="navigation">
+      <div class="wrapper">
+<ul>
+<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>
+</ul>        <div></div>
+      </div>
+    </div>
+    <div id="content">
+      <div class="wrapper">
+<h1 id = "Apollo_1_6_MQTT_Protocol_Manual">Apollo 1.6 MQTT Protocol Manual</h1>
+
+<p><div class="toc"><ul style="list-style:none;">
+  <li><a href="#The_MQTT_Protocol">The MQTT Protocol</a></li>
+  <li><ul style="list-style:none;">
+    <li><a href="#MQTT_Protocol_Options">MQTT Protocol Options</a></li>
+    <li><a href="#Client_Libraries">Client Libraries</a></li>
+    <li><a href="#Connecting">Connecting</a></li>
+    <li><a href="#Destination_Types">Destination Types</a></li>
+    <li><a href="#Clean_Sessions">Clean Sessions</a></li>
+    <li><a href="#Topic_Retained_Messages">Topic Retained Messages</a></li>
+    <li><a href="#Last_Will_and_Testament_Message">Last Will and Testament Message</a></li>
+    <li><a href="#Reliable_Messaging">Reliable Messaging</a></li>
+    <li><ul style="list-style:none;">
+      <li><a href="#At_Most_Once">At Most Once</a></li>
+      <li><a href="#At_Least_Once">At Least Once</a></li>
+      <li><a href="#Exactly_Once">Exactly Once</a></li>
+    </ul></li>
+    <li><a href="#Wildcard_Subscriptions">Wildcard Subscriptions</a></li>
+    <li><a href="#Keep_Alive">Keep Alive</a></li>
+    <li><a href="#Destination_Name_Restrictions">Destination Name Restrictions</a></li>
+  </ul></li>
+</ul></div></p>
+
+<h2 id = "The_MQTT_Protocol">The MQTT Protocol</h2>
+
+<p>Apollo allows clients to connect using the MQTT which is an open-source protocol specification
+intended for limited-resource devices on unreliable networks using a publish-subscribe domain.
+These types of devices usually require a small footprint and are not well suited for text-based protocols such as
+HTTP or STOMP or even traditional binary protocols such as Openwire or AMQP. MQTT is a compact binary protocol that
+is optimized for these types of limited devices and unreliable networks.</p>
+
+<p>In previous releases, MQTT was supported in Apollo as a separate plugin. As of now, that plugin has become part
+of the main development trunk and MQTT support is available out of the box without any other configuration or
+packaging of third-party plugins.</p>
+
+<p>Since MQTT is a wire-level protocol, any client that implements the protocol should be able to connect to Apollo
+and also interoperate with other MQTT-compatibe message brokers.</p>
+
+<p>To learn more about the details of MQTT, see <a href="http://public.dhe.ibm.com/software/dw/webservices/ws-mqtt/mqtt-v3r1.html">the MQTT Specification</a></p>
+
+<h3 id = "MQTT_Protocol_Options">MQTT Protocol Options</h3>
+
+<p>To start using the MQTT protocol, use a valid MQTT v3.1 client and connect to the port on which Apollo is listening.
+Apollo will do protocol detection and will automatically recognize the MQTT payloads and treat the connection
+as an MQTT connection. You don't have to open a special port for MQTT (or STOMP, Openwire, AMQP, etc. they can
+all be auto-detected). To force specific protocols over a certain connector there are two ways you can do this.
+You can choose to not use protocol detection at all and set the connector to be specifically for mqtt:</p>
+
+<div class="syntax"><div class="highlight"><pre><span class="nt">&lt;connector</span> <span class="na">id=</span><span class="s">&quot;tcp&quot;</span> <span class="na">bind=</span><span class="s">&quot;tcp://0.0.0.0:61613&quot;</span> <span class="na">protocol=</span><span class="s">&quot;mqtt&quot;</span><span class="nt">/&gt;</span>&#x000A;</pre></div>&#x000A;</div>
+
+<p>Alternatively, you can limit which protocols can be &ldquo;detected&rdquo; using the <code>&lt;detect&gt;</code> configuration element like this:</p>
+
+<div class="syntax"><div class="highlight"><pre><span class="nt">&lt;connector</span> <span class="na">id=</span><span class="s">&quot;tcp&quot;</span> <span class="na">bind=</span><span class="s">&quot;tcp://0.0.0.0:61613&quot;</span><span class="nt">&gt;</span>&#x000A;  <span class="nt">&lt;detect</span> <span class="na">protocols=</span><span class="s">&quot;mqtt openwire&quot;</span> <span class="nt">/&gt;</span>&#x000A;<span class="nt">&lt;/connector&gt;</span>&#x000A;</pre></div>&#x000A;</div>
+
+<p>The <code>protocols</code> attribute in the <code>&lt;detect&gt;</code> element takes space delimited protoco values.
+The <code>protocol</code> attribtue of the <code>&lt;connector&gt;</code> element takes a single protocol, not space delimited. It defaults to
+<code>any</code></p>
+
+<p>If you wish to tune the MQTT defaults, you can use the <code>mqtt</code> configuration element within the <code>connector</code> element
+in the <code>apollo.xml</code> configuration file :</p>
+
+<div class="syntax"><div class="highlight"><pre><span class="nt">&lt;connector</span> <span class="na">id=</span><span class="s">&quot;tcp&quot;</span> <span class="na">bind=</span><span class="s">&quot;tcp://0.0.0.0:61613&quot;</span><span class="nt">&gt;</span>&#x000A;  <span class="nt">&lt;mqtt</span> <span class="na">max_message_length=</span><span class="s">&quot;1000&quot;</span> <span class="nt">/&gt;</span>&#x000A;<span class="nt">&lt;/connector&gt;</span>&#x000A;</pre></div>&#x000A;</div>
+
+<p>The <code>mqtt</code> element supports the following configuration attributes:</p>
+
+<ul>
+<li><code>max_message_length</code> : The size (in bytes) of the largest message that can be sent to the broker. Defaults to 100MB</li>
+<li><code>protocol_filters</code> : A filter which can filter frames being sent/received to and from a client.  It can modify the frame or even drop it.</li>
+<li><code>die_delay</code> : How long after a connection is deemed to be &ldquo;dead&rdquo; before the connection actually closes; default: 5000ms</li>
+</ul>
+
+<p>The mqtt configuration element can also be used to control how the destination
+headers are parsed and interpreted.  The supported attributes are:</p>
+
+<ul>
+<li><code>queue_prefix</code> : a tag used to identify destination types; default: null</li>
+<li><code>path_separator</code> : used to separate segments in a destination name; default: <code>/</code></li>
+<li><code>any_child_wildcard</code> : indicate all child-level destinations that match the wildcard; default: <code>+</code></li>
+<li><code>any_descendant_wildcard</code> : indicate destinations that match the wildcard recursively; default: <code>#</code></li>
+<li><code>regex_wildcard_start</code> : pattern used to identify the start of a regex</li>
+<li><code>regex_wildcard_end</code> : pattern used to identify the end of a regex</li>
+<li><code>part_pattern</code> : allows you to specify a regex that constrains the naming of topics. default: <code>[ a-zA-Z0-9\_\-\%\~\:\(\)]+</code></li>
+</ul>
+
+<h3 id = "Client_Libraries">Client Libraries</h3>
+
+<p>Apollo supports v3.1 of the MQTT protocol. The following clients will work:</p>
+
+<ul>
+<li>Java : <a href="https://github.com/fusesource/mqtt-client">mqtt-client</a>, <a href="https://github.com/AlbinTheander/MeQanTT">MeQanTT</a></li>
+<li>C : <a href="http://mosquitto.org/man/libmosquitto-3.html">libmosquitto</a></li>
+<li>Erlang : <a href="https://github.com/squaremo/erlmqtt">erlmqtt</a>, <a href="http://code.google.com/p/my-mqtt4erl/">my-mqtt4erl</a></li>
+<li>.NET : <a href="http://sourceforge.net/projects/mqttdotnet/">MQTTDotNet</a>, <a href="https://github.com/markallanson/nmqtt">nMQTT</a></li>
+<li>Perl : <a href="https://github.com/beanz/net-mqtt-perl">net-mqtt-perl</a>, [anyevent-mqtt-perl]https://github.com/beanz/anyevent-mqtt-perl()</li>
+<li>Python : <a href="https://github.com/iwanbk/nyamuk">nyamuk</a></li>
+<li>Ruby : <a href="https://github.com/njh/ruby-mqtt">mqtt-ruby</a>, <a href="https://rubygems.org/gems/em-mqtt">ruby-em-mqtt</a></li>
+<li>Javascript : <a href="http://ceit.uq.edu.au/content/simple-mqtt-cient-nodejs">Node.js MQTT Client</a></li>
+<li>Delphi : <a href="http://jamiei.com/blog/code/mqtt-client-library-for-delphi/">TMQTTCLient</a></li>
+<li>Device specific: <a href="http://knolleary.net/arduino-client-for-mqtt/">Arduino</a>, <a href="http://ceit.uq.edu.au/content/mqttclient-mbed-version-20">mbed</a>, <a href="http://github.com/njh/NanodeMQTT/">Nanode</a>, Netduino</li>
+</ul>
+
+<p>To see an up-to-date listing of client libraries, please
+<a href="http://mqtt.org/software">the MQTT website for its software</a> listings</p>
+
+<p>The Apollo distribution ships with an <code>examples</code> directory
+where you can find some simple examples of how to use some of those
+clients to send and receive messages from a broker instance.</p>
+
+<h3 id = "Connecting">Connecting</h3>
+
+<p>The default broker configuration secures access to the broker so that only
+the <code>admin</code> user can connect.  The default password for the <code>admin</code> user
+is <code>password</code>.</p>
+
+<p>MQTT clients cannot specify a Virtual Host (see <a href="user-manual.html#Virtual&#95;Hosts">the section on Virtual Hosts in the user guide</a>)
+so the default virtual host will be used. This is usually the first Virtual Host defined in the Apollo.xml configuration
+file.</p>
+
+<h3 id = "Destination_Types">Destination Types</h3>
+
+<p>The MQTT protocol is a publish/subscribe protocol. It does not permit true point-to-point messaging
+achieved using Queues. Therefore Apollo allows only the use of Topics for MQTT messaging.
+The concept of a subscription and durable subscription to Topics is similar to what you'd find in
+other protocols and is controlled by the MQTT CONNECT frame's <code>clean session</code> attribute.</p>
+
+<h3 id = "Clean_Sessions">Clean Sessions</h3>
+
+<p>When a client sends a connect frame with the <code>clean session</code> flag set to cleared (false), any previously used session with
+the same client_id will be re-used. This means while the client was away, that subscription could have received
+messages. This is the equivalent of a durable subscription in Apollo.</p>
+
+<p>If the <code>clean session</code> flag is set (true), then a new session will be started and any sessions tha may have been
+lingering would be removed. This is equivalent to a normal topic subscription in Apollo.</p>
+
+<h3 id = "Topic_Retained_Messages">Topic Retained Messages</h3>
+
+<p>If a message has been published with the retain flag set, then
+the message will be 'remembered' by the topic so that if a new
+subscription arrives, the last retained message is sent
+to the subscription.  For example if you're publishing
+measurements and you want the last mesasurement published to
+always be available to a client that subscribes to the topic,
+you can set the retain flag on the PUBLISH frame.</p>
+
+<p>Note: retained messages are not retained between broker restarts for
+Quality of Service setting of AT MOST ONCE (QoS=0).</p>
+
+<h3 id = "Last_Will_and_Testament_Message">Last Will and Testament Message</h3>
+
+<p>You can set a <code>will</code> message and assocaited QoS for the message when a client
+first connects to Apollo. The will message is basically a message that
+will only get sent if there is an unexpected error with the connection and it must be dropped.
+This can be useful in situations where you have devices that could drop but
+when they do, you want to know. So if a medical sensor client drops from the broker,
+a will message could be sent to an &ldquo;alarm&rdquo; Topic and handled by the system as
+a high-priority alert.</p>
+
+<h3 id = "Reliable_Messaging">Reliable Messaging</h3>
+
+<p>MQTT allows a client to publish a message with the following Quality of Service parameters (QoS):</p>
+
+<ul>
+<li>At Most Once (QoS=0)</li>
+<li>At Least Once (QoS=1)</li>
+<li>Exactly Once (QoS=2)</li>
+</ul>
+
+<h4 id = "At_Most_Once">At Most Once</h4>
+
+<p>This QoS will attempt to deliver the message to a client, but it will
+have the lowest reliability of the three options. If you publish
+with a QoS=0, At Most Once, then the broker will not send back an Ack
+saying it received the message, nor will it retry if the broker fails.
+This QoS is most similar to non-persistent messages in, for example, JMS.</p>
+
+<h4 id = "At_Least_Once">At Least Once</h4>
+
+<p>This QoS setting will ensure that the message is delivered at least once to
+clients. When publishing with this setting, Apollo will send back
+a PUBACK frame which acknowledges that the broker has received the message
+and has taken &ldquo;ownership&rdquo; for delivering the message. If the client that
+published the message with QoS=1 does not recieve the PUBACK in a specified
+period of time, the client may wish to re-publish the message again with the
+DUP flag set on the PUBLISH frame. It's possible the broker received the
+first attempt to publish the message and subsequently published it to
+listening clients. So if the PUBACK got lost somehwere and the client
+sends the message again, there will be no duplicate detection, and the
+broker will send the message again to the topic's subscribers.</p>
+
+<h4 id = "Exactly_Once">Exactly Once</h4>
+
+<p>This QoS is the strongest level of reliability afforded by the MQTT
+protocol. This assures the publisher that its message will not only
+get to its intended subscribers, but that the message will not be duplicated
+as it could with QoS=1. This QoS, however, comes with increased network
+overhead.</p>
+
+<p>When a message is published, the broker will store the message ID and
+send the message to the Topic where it would be persisted if there are
+any durable subscriptions. It will then send the PUBREC frame back to
+the client implying the broker has received the message. At this point
+the broker will expect the client to send the PUBREL frame to clear
+the message ID from its session state and complete the send with the
+broker sending a PUBCOMP.</p>
+
+<h3 id = "Wildcard_Subscriptions">Wildcard Subscriptions</h3>
+
+<p>Wild cards can be used in destination names when subscribing as a consumer. This allows you to subscribe
+to multiple destinations or hierarchy of destinations.</p>
+
+<ul>
+<li><code>/</code> is used to separate names in a path</li>
+<li><code>+</code> is used to match any name in a path</li>
+<li><code>#</code> is used to recursively match path names</li>
+</ul>
+
+<p>For example using the above, these subscriptions are possible</p>
+
+<ul>
+<li><code>PRICE/#</code> : Any price for any product on any exchange</li>
+<li><code>PRICE/STOCK/#</code> : Any price for a stock on any exchange</li>
+<li><code>PRICE/STOCK/NASDAQ/+</code> : Any stock price on NASDAQ</li>
+<li><code>PRICE/STOCK/+/IBM</code> : Any IBM stock price on any exchange</li>
+</ul>
+
+<h3 id = "Keep_Alive">Keep Alive</h3>
+
+<p>Apollo will only set a keep-alive/heart-beat monitor if the client has specified a <code>keepAlive</code> value in the
+CONNECT frame. If one is specified, the actual value used by Apollo will be 1.5 * the keep alive value. This is
+in keeping with the MQTT spec.</p>
+
+<h3 id = "Destination_Name_Restrictions">Destination Name Restrictions</h3>
+
+<p>Destination names are restricted to using the characters <code>a-z</code>, <code>A-Z</code>, <code>0-9</code>,
+<code>_</code>, <code>-</code> <code>%</code>, <code>~</code>, <code>:</code>, ' ', '(', ')' or <code>.</code> in addition to composite separator <code>,</code> and the wild
+card <code>*</code>.  Any other characters must be UTF-8 and then URL encoded if you wish to
+preserve their significance.</p>
+        <div></div>
+      </div>
+    </div>
+  </body>
+</html>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/openwire-manual.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/openwire-manual.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/openwire-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_OpenWire_Protocol_Manual">Apollo 1.5 OpenWire Protocol Manual</h1>
+<h1 id = "Apollo_1_6_OpenWire_Protocol_Manual">Apollo 1.6 OpenWire Protocol Manual</h1>
 
 <p><div class="toc"><ul style="list-style:none;">
   <li><a href="#Using_the_OpenWire_Protocol">Using the OpenWire Protocol</a></li>

Modified: websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/performance-scaling.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/performance-scaling.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/performance-scaling.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>



Mime
View raw message