activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r907321 - 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 Tue, 29 Apr 2014 14:35:02 GMT
Author: chirino
Date: Tue Apr 29 14:35:01 2014
New Revision: 907321

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/blog/releases/release-1.7.html
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.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/blog/releases/release-1.6.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/mqtt-manual.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/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 Tue Apr 29 14:35:01 2014
@@ -34,7 +34,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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>
@@ -62,6 +62,59 @@
       <div class="wrapper">
 <h1>Apollo Blog <a href="index.rss"><img src="../images/rss.gif"/></a></h1>
 <div class="post">
+  <a href="releases/release-1.7.html">
+    <h2>Apollo 1.7</h2>
+  </a>
+  <div class="details">Posted by Hiram Chirino on Wednesday, February 26, 2014</div>
+<p>The <a href="http://activemq.apache.org">Apache ActiveMQ Project</a> is pleased to announce the 
+availability of Apollo 1.7. ActiveMQ Apollo is a faster, more reliable, easier 
+to maintain messaging broker built from the foundations of the original ActiveMQ. </p>
+
+<p>This release fixes several bugs:</p>
+
+<ul>
+<li>[APLO-287] - SSL errors with Java 7 (Diffie-Hellman cypher suite sessions)</li>
+<li>[APLO-305] - Wrong exist status codes in the init scripts!</li>
+<li>[APLO-308] - Filesystem permissions in released package are broken..</li>
+<li>[APLO-310] - Wildcard durable subs do not receive messages from topics created after the durable sub is created.</li>
+<li>[APLO-315] - Apollo should protect itself against clients that send many frames with receipt requests, but which do not read the socket for those receipts.</li>
+<li>[APLO-319] - Don't auto delete Topics if it's holding retained messages</li>
+<li>[APLO-320] - Occasionally on restart 'Invalid log position:' warning messages get logged</li>
+<li>[APLO-328] - cors_origin configuration attribute of the the web connectors not properly setting the Access-Control-Allow-Headers</li>
+<li>[APLO-330] - Support using a different Authorizer Authenticator implementations.</li>
+<li>[APLO-338] - PeriodStat buffer in Broker grows infinitely</li>
+<li>[APLO-339] - java.nio.channels.CancelledKeyException</li>
+<li>[APLO-346] - Debug log doesn't log a deleting queue</li>
+<li>[APLO-347] - Action not Authorized Errors when viewing admin interface over HTTPS</li>
+<li>[APLO-349] - Empty STOMP Header Name is Allowed</li>
+</ul>
+
+<p>And introduces improvements like:</p>
+
+<ul>
+<li>[APLO-296] - Support configuring the LevelDB auto compaction frequency</li>
+<li>[APLO-312] - Apollo fails to bumb up the ulimit!</li>
+<li>[APLO-325] - Allow larger text messages on websocket connection</li>
+<li>[APLO-348] - Decouple cli argument parsing from the Karaf version used using Airline to parse the args</li>
+<li>[APLO-213] - Support an option to set the JMSXUserID openwire header based on the authenticated user.</li>
+<li>[APLO-313] - Avoid blocking producers if consumers are not likely to catch up within a few seconds.</li>
+<li>[APLO-314] - If the leveldb paranoid_checks option is enabled, verify the integrity of index when it's copied/checkpointed
+<ul>
+<li>[APLO-301] - Add a &ldquo;ttl&rdquo; header to control message expiration</li>
+</ul></li>
+</ul>
+
+<p>For further information see:</p>
+
+<ul>
+<li><a href="http://activemq.apache.org/apollo/download.html">Download</a></li>
+<li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12322515&amp;styleName=Text&amp;projectId=12311310&amp;Create=Create">Issues Fixed</a></li>
+<li><a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation">Documentation</a></li>
+</ul>
+
+<p><a href="http://activemq.apache.org/community/index.html">Feedback</a> is always welcomed!</p>
+</div>
+<div class="post">
   <a href="releases/release-1.6.html">
     <h2>Apollo 1.6</h2>
   </a>

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 Tue Apr 29 14:35:01 2014
@@ -4,10 +4,60 @@
           <title>The Apollo Blog</title>
           <link>http://activemq.apache.org/apollo/blog/</link>
           <description>ActiveMQ's next generation of messaging</description>
-          <pubDate>Fri, 24 Jan 2014 10:06:28 -0500</pubDate>
-          <lastBuildDate>Fri, 24 Jan 2014 10:06:28 -0500</lastBuildDate>
+          <pubDate>Tue, 29 Apr 2014 10:33:50 -0400</pubDate>
+          <lastBuildDate>Tue, 29 Apr 2014 10:33:50 -0400</lastBuildDate>
           <generator>Scalate - http://scalate.fusesource.org/</generator>
           <item>
+              <title>Apollo 1.7</title>
+              <link>http://activemq.apache.org/apollo/blog/releases/release-1.7.html</link>
+              <description>&lt;p&gt;The &lt;a href=&quot;http://activemq.apache.org&quot;&gt;Apache ActiveMQ Project&lt;/a&gt; is pleased to announce the 
+availability of Apollo 1.7. ActiveMQ Apollo is a faster, more reliable, easier 
+to maintain messaging broker built from the foundations of the original ActiveMQ. &lt;/p&gt;
+
+&lt;p&gt;This release fixes several bugs:&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;[APLO-287] - SSL errors with Java 7 (Diffie-Hellman cypher suite sessions)&lt;/li&gt;
+&lt;li&gt;[APLO-305] - Wrong exist status codes in the init scripts!&lt;/li&gt;
+&lt;li&gt;[APLO-308] - Filesystem permissions in released package are broken..&lt;/li&gt;
+&lt;li&gt;[APLO-310] - Wildcard durable subs do not receive messages from topics created after the durable sub is created.&lt;/li&gt;
+&lt;li&gt;[APLO-315] - Apollo should protect itself against clients that send many frames with receipt requests, but which do not read the socket for those receipts.&lt;/li&gt;
+&lt;li&gt;[APLO-319] - Don't auto delete Topics if it's holding retained messages&lt;/li&gt;
+&lt;li&gt;[APLO-320] - Occasionally on restart 'Invalid log position:' warning messages get logged&lt;/li&gt;
+&lt;li&gt;[APLO-328] - cors_origin configuration attribute of the the web connectors not properly setting the Access-Control-Allow-Headers&lt;/li&gt;
+&lt;li&gt;[APLO-330] - Support using a different Authorizer Authenticator implementations.&lt;/li&gt;
+&lt;li&gt;[APLO-338] - PeriodStat buffer in Broker grows infinitely&lt;/li&gt;
+&lt;li&gt;[APLO-339] - java.nio.channels.CancelledKeyException&lt;/li&gt;
+&lt;li&gt;[APLO-346] - Debug log doesn't log a deleting queue&lt;/li&gt;
+&lt;li&gt;[APLO-347] - Action not Authorized Errors when viewing admin interface over HTTPS&lt;/li&gt;
+&lt;li&gt;[APLO-349] - Empty STOMP Header Name is Allowed&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;And introduces improvements like:&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;[APLO-296] - Support configuring the LevelDB auto compaction frequency&lt;/li&gt;
+&lt;li&gt;[APLO-312] - Apollo fails to bumb up the ulimit!&lt;/li&gt;
+&lt;li&gt;[APLO-325] - Allow larger text messages on websocket connection&lt;/li&gt;
+&lt;li&gt;[APLO-348] - Decouple cli argument parsing from the Karaf version used using Airline to parse the args&lt;/li&gt;
+&lt;li&gt;[APLO-213] - Support an option to set the JMSXUserID openwire header based on the authenticated user.&lt;/li&gt;
+&lt;li&gt;[APLO-313] - Avoid blocking producers if consumers are not likely to catch up within a few seconds.&lt;/li&gt;
+&lt;li&gt;[APLO-314] - If the leveldb paranoid_checks option is enabled, verify the integrity of index when it's copied/checkpointed
+&lt;ul&gt;
+&lt;li&gt;[APLO-301] - Add a &amp;ldquo;ttl&amp;rdquo; header to control message expiration&lt;/li&gt;
+&lt;/ul&gt;&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;For further information see:&lt;/p&gt;
+
+&lt;ul&gt;
+&lt;li&gt;&lt;a href=&quot;http://activemq.apache.org/apollo/download.html&quot;&gt;Download&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12322515&amp;amp;styleName=Text&amp;amp;projectId=12311310&amp;amp;Create=Create&quot;&gt;Issues Fixed&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href=&quot;http://activemq.apache.org/apollo/versions/1.7/website/documentation&quot;&gt;Documentation&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;&lt;a href=&quot;http://activemq.apache.org/community/index.html&quot;&gt;Feedback&lt;/a&gt; is always welcomed!&lt;/p&gt;</description>
+            </item><item>
               <title>Apollo 1.6</title>
               <link>http://activemq.apache.org/apollo/blog/releases/release-1.6.html</link>
               <description>&lt;p&gt;The &lt;a href=&quot;http://activemq.apache.org&quot;&gt;Apache ActiveMQ Project&lt;/a&gt; is pleased to announce the 

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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.6.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.6.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.6.html Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../../index.html">Apollo 1.6</a></li>
+<li><a href="../../index.html">Apollo 1.7</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/blog/releases/release-1.7.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.7.html (added)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/blog/releases/release-1.7.html Tue Apr 29 14:35:01 2014
@@ -0,0 +1,94 @@
+<!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>Apollo 1.7</title>
+  </head>
+  <body>
+    <div id="navigation">
+      <div class="wrapper">
+<ul>
+<li><a href="../../index.html">Apollo 1.7</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">
+<p>The <a href="http://activemq.apache.org">Apache ActiveMQ Project</a> is pleased to announce the 
+availability of Apollo 1.7. ActiveMQ Apollo is a faster, more reliable, easier 
+to maintain messaging broker built from the foundations of the original ActiveMQ. </p>
+
+<p>This release fixes several bugs:</p>
+
+<ul>
+<li>[APLO-287] - SSL errors with Java 7 (Diffie-Hellman cypher suite sessions)</li>
+<li>[APLO-305] - Wrong exist status codes in the init scripts!</li>
+<li>[APLO-308] - Filesystem permissions in released package are broken..</li>
+<li>[APLO-310] - Wildcard durable subs do not receive messages from topics created after the durable sub is created.</li>
+<li>[APLO-315] - Apollo should protect itself against clients that send many frames with receipt requests, but which do not read the socket for those receipts.</li>
+<li>[APLO-319] - Don't auto delete Topics if it's holding retained messages</li>
+<li>[APLO-320] - Occasionally on restart 'Invalid log position:' warning messages get logged</li>
+<li>[APLO-328] - cors_origin configuration attribute of the the web connectors not properly setting the Access-Control-Allow-Headers</li>
+<li>[APLO-330] - Support using a different Authorizer Authenticator implementations.</li>
+<li>[APLO-338] - PeriodStat buffer in Broker grows infinitely</li>
+<li>[APLO-339] - java.nio.channels.CancelledKeyException</li>
+<li>[APLO-346] - Debug log doesn't log a deleting queue</li>
+<li>[APLO-347] - Action not Authorized Errors when viewing admin interface over HTTPS</li>
+<li>[APLO-349] - Empty STOMP Header Name is Allowed</li>
+</ul>
+
+<p>And introduces improvements like:</p>
+
+<ul>
+<li>[APLO-296] - Support configuring the LevelDB auto compaction frequency</li>
+<li>[APLO-312] - Apollo fails to bumb up the ulimit!</li>
+<li>[APLO-325] - Allow larger text messages on websocket connection</li>
+<li>[APLO-348] - Decouple cli argument parsing from the Karaf version used using Airline to parse the args</li>
+<li>[APLO-213] - Support an option to set the JMSXUserID openwire header based on the authenticated user.</li>
+<li>[APLO-313] - Avoid blocking producers if consumers are not likely to catch up within a few seconds.</li>
+<li>[APLO-314] - If the leveldb paranoid_checks option is enabled, verify the integrity of index when it's copied/checkpointed
+<ul>
+<li>[APLO-301] - Add a &ldquo;ttl&rdquo; header to control message expiration</li>
+</ul></li>
+</ul>
+
+<p>For further information see:</p>
+
+<ul>
+<li><a href="http://activemq.apache.org/apollo/download.html">Download</a></li>
+<li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12322515&amp;styleName=Text&amp;projectId=12311310&amp;Create=Create">Issues Fixed</a></li>
+<li><a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation">Documentation</a></li>
+</ul>
+
+<p><a href="http://activemq.apache.org/community/index.html">Feedback</a> is always welcomed!</p>
+        <div></div>
+      </div>
+    </div>
+  </body>
+</html>

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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.6/maven/">Maven Site Reports</a></li>
+<li><a href="http://activemq.apache.org/apollo/versions/1.7/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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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_6_AMQP_Protocol_Manual">Apollo 1.6 AMQP Protocol Manual</h1>
+<h1 id = "Apollo_1_7_AMQP_Protocol_Manual">Apollo 1.7 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>

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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_6_Extending_Guide">Apollo 1.6 Extending Guide</h1>
+<h1 id = "Apollo_1_7_Extending_Guide">Apollo 1.7 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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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,12 +80,12 @@ 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"><pre name='code' class='brush: text; gutter: false;'><code>tar -zxvf apache-apollo-1.6-unix-distro.tar.gz</code></pre></div></div><div class="compare-right"><h3>Windows</h3><div class="syntax"><pre name='code' class='brush: text; gutter: false;'><code>jar -xvf apache-apollo-1.6-windows-distro.zip
+<div class="wide"><div class="compare"><div class="compare-left"><h3>Unix/Linux/OS X</h3><div class="syntax"><pre name='code' class='brush: text; gutter: false;'><code>tar -zxvf apache-apollo-1.7-unix-distro.tar.gz</code></pre></div></div><div class="compare-right"><h3>Windows</h3><div class="syntax"><pre name='code' class='brush: text; gutter: false;'><code>jar -xvf apache-apollo-1.7-windows-distro.zip
 </code></pre></div></div><br class="clear"/></div>
 </div></li>
 </ol>
 
-<p>The distribution will be extracted into a directory called, <code>apache-apollo-1.6</code>.
+<p>The distribution will be extracted into a directory called, <code>apache-apollo-1.7</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>

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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/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 Tue Apr 29 14:35:01 2014
@@ -54,7 +54,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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_6_Management_API">Apollo 1.6 Management API</h1>
+<h1 id = "Apollo_1_7_Management_API">Apollo 1.7 Management API</h1>
 
 <p><div class="toc"><ul style="list-style:none;">
   <li><a href="#Overview">Overview</a></li>
@@ -307,7 +307,7 @@ parameter to define the order in which t
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerStatusDTO.html">
         BrokerStatusDTO
       </a>
     </code>
@@ -324,7 +324,7 @@ parameter to define the order in which t
   &quot;id&quot;: &quot;default&quot;,
   &quot;state&quot;: &quot;STARTED&quot;,
   &quot;state_since&quot;: 1314573353753,
-  &quot;version&quot;: &quot;1.6&quot;,
+  &quot;version&quot;: &quot;1.7&quot;,
   &quot;jvm_metrics&quot;: {
     &quot;heap_memory&quot;: {
       &quot;used&quot;: 22165160,
@@ -383,7 +383,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -446,7 +446,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -473,7 +473,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -500,7 +500,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -539,11 +539,11 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html">
         VirtualHostStatusDTO
       </a>
       <div></div>
@@ -571,7 +571,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/VirtualHostStatusDTO.html">
         VirtualHostStatusDTO
       </a>
     </code>
@@ -615,7 +615,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -643,7 +643,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -671,7 +671,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -699,7 +699,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateDestMetricsDTO.html">
         AggregateDestMetricsDTO
       </a>
     </code>
@@ -727,7 +727,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/StoreStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/StoreStatusDTO.html">
         StoreStatusDTO
       </a>
  sub class (depends on the store implementation)
@@ -789,11 +789,11 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
       <div></div>
@@ -821,7 +821,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
     </code>
@@ -991,11 +991,11 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/TopicStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/TopicStatusDTO.html">
         TopicStatusDTO
       </a>
       <div></div>
@@ -1023,7 +1023,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/TopicStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/TopicStatusDTO.html">
         TopicStatusDTO
       </a>
     </code>
@@ -1170,7 +1170,7 @@ topic is being used by any clients.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
     </code>
@@ -1198,11 +1198,11 @@ spool messages being sent to the <code>{
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
       <div></div>
@@ -1230,7 +1230,7 @@ spool messages being sent to the <code>{
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/QueueStatusDTO.html">
         QueueStatusDTO
       </a>
     </code>
@@ -1269,11 +1269,11 @@ spool messages being sent to the <code>{
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ServiceStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ServiceStatusDTO.html">
         ServiceStatusDTO
       </a>
       <div></div>
@@ -1301,7 +1301,7 @@ spool messages being sent to the <code>{
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ServiceStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ServiceStatusDTO.html">
         ServiceStatusDTO
       </a>
     </code>
@@ -1391,7 +1391,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateConnectionMetricsDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/AggregateConnectionMetricsDTO.html">
         AggregateConnectionMetricsDTO
       </a>
     </code>
@@ -1418,11 +1418,11 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/DataPageDTO.html">
         DataPageDTO
       </a>
       paging
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ConnectionStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ConnectionStatusDTO.html">
         ConnectionStatusDTO
       </a>
       <div></div>
@@ -1450,7 +1450,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ConnectionStatusDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/ConnectionStatusDTO.html">
         ConnectionStatusDTO
       </a>
     </code>
@@ -1557,7 +1557,7 @@ included n the result.</p>
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerDTO.html">
         BrokerDTO
       </a>
     </code>
@@ -1586,7 +1586,7 @@ and then password fields are cleared.</p
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/BrokerDTO.html">
         BrokerDTO
       </a>
     </code>
@@ -1700,7 +1700,7 @@ the latter case, the content type is exp
     <code>
       200
       <and></and>
-      <a href="http://activemq.apache.org/apollo/versions/1.6/website/documentation/api/apollo-dto/org/apache/activemq/apollo/dto/PrincipalDTO.html">
+      <a href="http://activemq.apache.org/apollo/versions/1.7/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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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/mqtt-manual.html
==============================================================================
--- websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/mqtt-manual.html (original)
+++ websites/production/activemq/content/apollo/versions/99-trunk-SNAPSHOT/website/documentation/mqtt-manual.html Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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_6_MQTT_Protocol_Manual">Apollo 1.6 MQTT Protocol Manual</h1>
+<h1 id = "Apollo_1_7_MQTT_Protocol_Manual">Apollo 1.7 MQTT Protocol Manual</h1>
 
 <p><div class="toc"><ul style="list-style:none;">
   <li><a href="#The_MQTT_Protocol">The MQTT Protocol</a></li>

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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_6_OpenWire_Protocol_Manual">Apollo 1.6 OpenWire Protocol Manual</h1>
+<h1 id = "Apollo_1_7_OpenWire_Protocol_Manual">Apollo 1.7 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>
@@ -109,6 +109,7 @@ be closed. Default is <code>30000</code>
 <li><code>max_inactivity_duration_initial_delay</code> : Amount of time to delay between determining the socket should be closed
 and actually closing it. Default is <code>30000</code></li>
 <li><code>max_frame_size</code> : Size in bytes of the largest frame that can be sent to the broker. Default is <code>100MB</code></li>
+<li><code>add_jmsxuserid</code> : If set to <code>false</code>, disables setting the JMSXUserID header on received messages.  Default is <code>true</code>.</li>
 </ul>
 
 <p>An example of configuring the OpenWire protocol</p>

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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/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 Tue Apr 29 14:35:01 2014
@@ -1110,6 +1110,7 @@
         <xs:attribute name="max_inactivity_duration_initial_delay" type="xs:long"/>
         <xs:attribute name="max_frame_size" type="xs:long"/>
         <xs:attribute name="buffer_size" type="xs:string"/>
+        <xs:attribute name="add_jmsxuserid" type="xs:boolean"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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_6_STOMP_Protocol_Manual">Apollo 1.6 STOMP Protocol Manual</h1>
+<h1 id = "Apollo_1_7_STOMP_Protocol_Manual">Apollo 1.7 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>
@@ -291,9 +291,12 @@ redelivered to another subscribed client
 <h3 id = "Message_Expiration">Message Expiration</h3>
 
 <p>Apollo supports expiring old messages.  Unconsumed expired messages 
-are automatically removed from the queue.  You just need to specify when
-the message expires by setting the <code>expires</code> message header.  The expiration
-time must be specified as the number of milliseconds since the Unix epoch.</p>
+are automatically removed from the queue.  There's two way to specify
+when the message will be expired.  Y</p>
+
+<p>The first way to configure the expiration is by setting the <code>expires</code> message 
+header.  The expiration time must be specified as the number of milliseconds 
+since the Unix epoch.</p>
 
 <p>Example:</p>
 
@@ -304,6 +307,20 @@ expires:1308690148000
 this message will expire on Tue Jun 21 17:02:28 EDT 2011
 ^@</code></pre>
 
+<p>The first way to configure the expiration is by setting the <code>ttl</code> message 
+header.  The ttl will be intereted to mean the number of milliseconds from
+when the server receives the message.  The broker will add an <code>expires</code>
+header to the message on your behalf.</p>
+
+<p>Example:</p>
+
+<pre><code>SEND
+destination:/queue/a
+ttl:2000
+
+This message will expire in 2 seconds.
+^@</code></pre>
+
 <h3 id = "Subscription_Flow_Control">Subscription Flow Control</h3>
 
 <p>You can add a <code>credit</code> header to the <code>SUBSCRIBE</code> frame to control the

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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_6_User_Manual">Apollo 1.6 User Manual</h1>
+<h1 id = "Apollo_1_7_User_Manual">Apollo 1.7 User Manual</h1>
 
 <p><div class="toc"><ul style="list-style:none;">
   <li><a href="#Creating_a_Broker">Creating a Broker</a></li>

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -57,7 +57,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="index.html">Apollo 1.6</a></li>
+<li><a href="index.html">Apollo 1.7</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,35 +80,35 @@
     <div id="content">
       <div class="wrapper">
 <h2 id = "Get_the_latest_official_version">Get the latest official version</h2>
-<h3 id = "Apollo_1_6">Apollo 1.6</h3>
+<h3 id = "Apollo_1_7">Apollo 1.7</h3>
 
-<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>
+<p><a href="blog/releases/release-1.7.html">Release Notes</a> | <a href="http://activemq.apache.org/apollo/versions/1.7/website/documentation/getting-started.html">Installation Instructions</a> | <a href="http://activemq.apache.org/apollo/versions/1.7/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.6/apache-apollo-1.6-unix-distro.tar.gz">apache-apollo-1.6-unix-distro.tar.gz</a>
+      <a href="http://www.apache.org/dyn/closer.cgi?path=activemq/activemq-apollo/1.7/apache-apollo-1.7-unix-distro.tar.gz">apache-apollo-1.7-unix-distro.tar.gz</a>
     </td>
     <td>
-      <a href="http://apache.org/dist/activemq/activemq-apollo/1.6/apache-apollo-1.6-unix-distro.tar.gz.asc">GPG Signature</a>
+      <a href="http://apache.org/dist/activemq/activemq-apollo/1.7/apache-apollo-1.7-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.6/apache-apollo-1.6-windows-distro.zip">apache-apollo-1.6-windows-distro.zip</a>
+      <a href="http://www.apache.org/dyn/closer.cgi?path=activemq/activemq-apollo/1.7/apache-apollo-1.7-windows-distro.zip">apache-apollo-1.7-windows-distro.zip</a>
     </td>
     <td>
-      <a href="http://apache.org/dist/activemq/activemq-apollo/1.6/apache-apollo-1.6-windows-distro.zip.asc">GPG Signature</a>
+      <a href="http://apache.org/dist/activemq/activemq-apollo/1.7/apache-apollo-1.7-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.6/apollo-project-1.6-source-release.tar.gz">apollo-project-1.6-source-release.tar.gz</a>
+      <a href="http://www.apache.org/dyn/closer.cgi?path=activemq/activemq-apollo/1.7/apollo-project-1.7-source-release.tar.gz">apollo-project-1.7-source-release.tar.gz</a>
     </td>
     <td>
-      <a href="http://apache.org/dist/activemq/activemq-apollo/1.6/apollo-project-1.6-source-release.tar.gz.asc">GPG Signature</a>
+      <a href="http://apache.org/dist/activemq/activemq-apollo/1.7/apollo-project-1.7-source-release.tar.gz.asc">GPG Signature</a>
     </td>
   </tr>
 </table>
@@ -117,6 +117,41 @@
 </div>
 <div class="hide">
   <h3 class="accordion">
+    <a href="#">Apollo 1.6</a>
+  </h3>
+  <div class="hide">
+    <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://archive.apache.org/dist/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://archive.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://archive.apache.org/dist/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://archive.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://archive.apache.org/dist/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://archive.apache.org/dist/activemq/activemq-apollo/1.6/apollo-project-1.6-source-release.tar.gz.asc">GPG Signature</a>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <h3 class="accordion">
     <a href="#">Apollo 1.5</a>
   </h3>
   <div class="hide">

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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="index.html">Apollo 1.6</a></li>
+<li><a href="index.html">Apollo 1.7</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.6</h1>
+<h1>Apollo 1.7</h1>
 ActiveMQ's next generation of messaging
 
           <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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="index.html">Apollo 1.6</a></li>
+<li><a href="index.html">Apollo 1.7</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 Tue Apr 29 14:35:01 2014
@@ -31,7 +31,7 @@
     <div id="navigation">
       <div class="wrapper">
 <ul>
-<li><a href="../index.html">Apollo 1.6</a></li>
+<li><a href="../index.html">Apollo 1.7</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>
@@ -47,6 +47,9 @@ can easily get to the documentation that
 version of the project your using.</p>
 <ul></ul>
 <li>
+  <a href="http://activemq.apache.org/apollo/versions/1.7/website/index.html">1.7 Website</a>
+</li>
+<li>
   <a href="http://activemq.apache.org/apollo/versions/1.6/website/index.html">1.6 Website</a>
 </li>
 <li>



Mime
View raw message