You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by bu...@apache.org on 2013/01/04 22:20:56 UTC

svn commit: r845027 [2/3] - in /websites/production/activemq/content: ./ cache/ cms/ integrating-apache-activemq-with-jboss.data/ nms/ polo-page.data/

Modified: websites/production/activemq/content/cms/sitemap.html
==============================================================================
--- websites/production/activemq/content/cms/sitemap.html (original)
+++ websites/production/activemq/content/cms/sitemap.html Fri Jan  4 21:20:56 2013
@@ -72,7 +72,7 @@
         <tr>
         <td valign="top" width="100%">
           <div class="wiki-content maincontent">
-<ul><li><a shape="rect" href="activemq-cpp-stomp.html" title="ActiveMQ-CPP Stomp">ActiveMQ-CPP Stomp</a></li><li><a shape="rect" href="community.html" title="Community">Community</a><ul><li><a shape="rect" href="faq.html" title="FAQ">FAQ</a><ul><li><a shape="rect" href="activemq-cpp-usage-faqs.html" title="ActiveMQ-CPP Usage FAQs">ActiveMQ-CPP Usage FAQs</a><ul><li><a shape="rect" href="how-do-i-use-the-ssl-transport.html" title="How do I use the SSL Transport">How do I use the SSL Transport</a></li></ul></li><li><a shape="rect" href="building-faqs.html" title="Building FAQs">Building FAQs</a><ul><li><a shape="rect" href="general-build-issues.html" title="General Build Issues">General Build Issues</a></li><li><a shape="rect" href="openssl-support.html" title="OpenSSL Support">OpenSSL Support</a><ul><li><a shape="rect" href="enable-openssl-support-with-autotools.html" title="Enable OpenSSL support with autotools">Enable OpenSSL support with autotools</a></li><li><a shape="rec
 t" href="how-do-i-prevent-autoconf-from-enabling-openssl-support.html" title="How do I prevent autoconf from enabling OpenSSL support">How do I prevent autoconf from enabling OpenSSL support</a></li><li><a shape="rect" href="how-to-enable-ssl-support-on-windows.html" title="How to enable SSL support on Windows">How to enable SSL support on Windows</a></li></ul></li><li><a shape="rect" href="solaris-platform.html" title="Solaris Platform">Solaris Platform</a><ul><li><a shape="rect" href="errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.html" title="Errors from libstd++.la on Solaris 10 using the GNU Compiler">Errors from libstd++.la on Solaris 10 using the GNU Compiler</a></li><li><a shape="rect" href="errors-saying-no-rule-to-make-target.html" title="Errors saying &quot;no rule to make target&quot;">Errors saying "no rule to make target"</a></li><li><a shape="rect" href="using-the-solaris-cc-compiler.html" title="Using the Solaris CC compiler">Using the Solaris CC c
 ompiler</a></li></ul></li></ul></li><li><a shape="rect" href="discussion-forums.html" title="Discussion Forums">Discussion Forums</a><ul><li><a shape="rect" href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li></ul></li><li><a shape="rect" href="general.html" title="General">General</a><ul><li><a shape="rect" href="are-there-more-faq-entries.html" title="Are there more FAQ Entries">Are there more FAQ Entries</a></li><li><a shape="rect" href="what-is-activemq-cpp.html" title="What is ActiveMQ CPP">What is ActiveMQ CPP</a></li></ul></li></ul></li><li><a shape="rect" href="privacy-policy.html" title="Privacy Policy">Privacy Policy</a></li></ul></li><li><a shape="rect" href="configuring.html" title="Configuring">Configuring</a></li><li><a shape="rect" href="developers.html" title="Developers">Developers</a><ul><li><a shape="rect" href="building.html" title="Building">Building</a></li><li><a shape="rect" href="creating-distributions.html" title="Creating Distribu
 tions">Creating Distributions</a></li><li><a shape="rect" href="source.html" title="Source">Source</a></li></ul></li><li><a shape="rect" href="example.html" title="Example">Example</a></li><li><a shape="rect" href="overview.html" title="Overview">Overview</a><ul><li><a shape="rect" href="cms-api-overview.html" title="CMS API Overview">CMS API Overview</a></li><li><a shape="rect" href="download.html" title="Download">Download</a><ul><li><a shape="rect" href="activemq-cpp-22-release.html" title="ActiveMQ CPP 2.2 Release">ActiveMQ CPP 2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-10-release.html" title="ActiveMQ-CPP 1.0 Release">ActiveMQ-CPP 1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-11-release.html" title="ActiveMQ-CPP 1.1 Release">ActiveMQ-CPP 1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-201-release.html" title="ActiveMQ-CPP 2.0.1 Release">ActiveMQ-CPP 2.0.1 Release</a></li><li><a shape="rect" href="activemq-cpp-20-release.html" titl
 e="ActiveMQ-CPP 2.0 Release">ActiveMQ-CPP 2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-211-release.html" title="ActiveMQ-CPP 2.1.1 Release">ActiveMQ-CPP 2.1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-212-release.html" title="ActiveMQ-CPP 2.1.2 Release">ActiveMQ-CPP 2.1.2 Release</a></li><li><a shape="rect" href="activemq-cpp-213-release.html" title="ActiveMQ-CPP 2.1.3 Release">ActiveMQ-CPP 2.1.3 Release</a></li><li><a shape="rect" href="activemq-cpp-21-release.html" title="ActiveMQ-CPP 2.1 Release">ActiveMQ-CPP 2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-221-release.html" title="ActiveMQ-CPP 2.2.1 Release">ActiveMQ-CPP 2.2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-222-release.html" title="ActiveMQ-CPP 2.2.2 Release">ActiveMQ-CPP 2.2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-223-release.html" title="ActiveMQ-CPP 2.2.3 Release">ActiveMQ-CPP 2.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-224-
 release.html" title="ActiveMQ-CPP 2.2.4 Release">ActiveMQ-CPP 2.2.4 Release</a></li><li><a shape="rect" href="activemq-cpp-225-release.html" title="ActiveMQ-CPP 2.2.5 Release">ActiveMQ-CPP 2.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-226-release.html" title="ActiveMQ-CPP 2.2.6 Release">ActiveMQ-CPP 2.2.6 Release</a></li><li><a shape="rect" href="activemq-cpp-301-release.html" title="ActiveMQ-CPP 3.0.1 Release">ActiveMQ-CPP 3.0.1 Release</a></li><li><a shape="rect" href="activemq-cpp-30-release.html" title="ActiveMQ-CPP 3.0 Release">ActiveMQ-CPP 3.0 Release</a></li><li><a shape="rect" href="activemq-cpp-310-release.html" title="ActiveMQ-CPP 3.1.0 Release">ActiveMQ-CPP 3.1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-311-release.html" title="ActiveMQ-CPP 3.1.1 Release">ActiveMQ-CPP 3.1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-312-release.html" title="ActiveMQ-CPP 3.1.2 Release">ActiveMQ-CPP 3.1.2 Release</a></li><li><a shape="rect" h
 ref="activemq-cpp-313-release.html" title="ActiveMQ-CPP 3.1.3 Release">ActiveMQ-CPP 3.1.3 Release</a></li><li><a shape="rect" href="activemq-cpp-320-release.html" title="ActiveMQ-CPP 3.2.0 Release">ActiveMQ-CPP 3.2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-321-release.html" title="ActiveMQ-CPP 3.2.1 Release">ActiveMQ-CPP 3.2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-322-release.html" title="ActiveMQ-CPP 3.2.2 Release">ActiveMQ-CPP 3.2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-323-release.html" title="ActiveMQ-CPP 3.2.3 Release">ActiveMQ-CPP 3.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-324-release.html" title="ActiveMQ-CPP 3.2.4 Release">ActiveMQ-CPP 3.2.4 Release</a></li><li><a shape="rect" href="activemq-cpp-325-release.html" title="ActiveMQ-CPP 3.2.5 Release">ActiveMQ-CPP 3.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-330-release.html" title="ActiveMQ-CPP 3.3.0 Release">ActiveMQ-CPP 3.3.0 Release</a
 ></li><li><a shape="rect" href="activemq-cpp-340-release.html" title="ActiveMQ-CPP 3.4.0 Release">ActiveMQ-CPP 3.4.0 Release</a></li><li><a shape="rect" href="activemq-cpp-341-release.html" title="ActiveMQ-CPP 3.4.1 Release">ActiveMQ-CPP 3.4.1 Release</a></li><li><a shape="rect" href="activemq-cpp-342-release.html" title="ActiveMQ-CPP 3.4.2 Release">ActiveMQ-CPP 3.4.2 Release</a></li><li><a shape="rect" href="activemq-cpp-343-release.html" title="ActiveMQ-CPP 3.4.3 Release">ActiveMQ-CPP 3.4.3 Release</a></li><li><a shape="rect" href="activemq-cpp-344-release.html" title="ActiveMQ-CPP 3.4.4 Release">ActiveMQ-CPP 3.4.4 Release</a></li><li><a shape="rect" href="activemq-cpp-345-release.html" title="ActiveMQ-CPP 3.4.5 Release">ActiveMQ-CPP 3.4.5 Release</a></li><li><a shape="rect" href="activemq-cpp-libtool-and-packaging-notes.html" title="ActiveMQ-CPP, libtool and packaging notes">ActiveMQ-CPP, libtool and packaging notes</a><ul><li><a shape="rect" href="activemq-cpp-product-ve
 rsion-number.html" title="ActiveMQ-CPP product version number">ActiveMQ-CPP product version number</a></li></ul></li><li><a shape="rect" href="cms-api-10-release.html" title="CMS API 1.0 Release">CMS API 1.0 Release</a></li><li><a shape="rect" href="cms-api-11-release.html" title="CMS API 1.1 Release">CMS API 1.1 Release</a></li><li><a shape="rect" href="cms-api-12-release.html" title="CMS API 1.2 Release">CMS API 1.2 Release</a></li></ul></li><li><a shape="rect" href="getting-started.html" title="Getting Started">Getting Started</a></li><li><a shape="rect" href="tutorials.html" title="Tutorials">Tutorials</a><ul><li><a shape="rect" href="handling-advisory-messages.html" title="Handling Advisory Messages">Handling Advisory Messages</a></li></ul></li></ul></li><li><a shape="rect" href="site.html" title="Site">Site</a><ul><li><a shape="rect" href="banner.html" title="Banner">Banner</a></li><li><a shape="rect" href="navigation.html" title="Navigation">Navigation</a><ul><li><a s
 hape="rect" href="api.html" title="API">API</a></li><li><a shape="rect" href="connectivity.html" title="Connectivity">Connectivity</a></li><li><a shape="rect" href="news.html" title="News">News</a></li><li><a shape="rect" href="openwire-support.html" title="OpenWire Support">OpenWire Support</a></li><li><a shape="rect" href="stomp-support.html" title="Stomp Support">Stomp Support</a></li><li><a shape="rect" href="support.html" title="Support">Support</a></li><li><a shape="rect" href="using-activemq-cpp.html" title="Using ActiveMQ-CPP">Using ActiveMQ-CPP</a></li></ul></li><li><a shape="rect" href="quicklinks.html" title="QuickLinks">QuickLinks</a></li><li><a shape="rect" href="siteindex.html" title="SiteIndex">SiteIndex</a></li><li><a shape="rect" href="sitemap.html" title="SiteMap">SiteMap</a></li></ul></li></ul>
+<ul><li><a shape="rect" href="activemq-cpp-stomp.html" title="ActiveMQ-CPP Stomp">ActiveMQ-CPP Stomp</a></li><li><a shape="rect" href="community.html" title="Community">Community</a><ul><li><a shape="rect" href="faq.html" title="FAQ">FAQ</a><ul><li><a shape="rect" href="activemq-cpp-usage-faqs.html" title="ActiveMQ-CPP Usage FAQs">ActiveMQ-CPP Usage FAQs</a><ul><li><a shape="rect" href="how-do-i-use-the-ssl-transport.html" title="How do I use the SSL Transport">How do I use the SSL Transport</a></li></ul></li><li><a shape="rect" href="building-faqs.html" title="Building FAQs">Building FAQs</a><ul><li><a shape="rect" href="general-build-issues.html" title="General Build Issues">General Build Issues</a></li><li><a shape="rect" href="openssl-support.html" title="OpenSSL Support">OpenSSL Support</a><ul><li><a shape="rect" href="enable-openssl-support-with-autotools.html" title="Enable OpenSSL support with autotools">Enable OpenSSL support with autotools</a></li><li><a shape="rec
 t" href="how-do-i-prevent-autoconf-from-enabling-openssl-support.html" title="How do I prevent autoconf from enabling OpenSSL support">How do I prevent autoconf from enabling OpenSSL support</a></li><li><a shape="rect" href="how-to-enable-ssl-support-on-windows.html" title="How to enable SSL support on Windows">How to enable SSL support on Windows</a></li></ul></li><li><a shape="rect" href="solaris-platform.html" title="Solaris Platform">Solaris Platform</a><ul><li><a shape="rect" href="errors-from-libstdla-on-solaris-10-using-the-gnu-compiler.html" title="Errors from libstd++.la on Solaris 10 using the GNU Compiler">Errors from libstd++.la on Solaris 10 using the GNU Compiler</a></li><li><a shape="rect" href="errors-saying-no-rule-to-make-target.html" title="Errors saying &quot;no rule to make target&quot;">Errors saying "no rule to make target"</a></li><li><a shape="rect" href="using-the-solaris-cc-compiler.html" title="Using the Solaris CC compiler">Using the Solaris CC c
 ompiler</a></li></ul></li></ul></li><li><a shape="rect" href="discussion-forums.html" title="Discussion Forums">Discussion Forums</a><ul><li><a shape="rect" href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li></ul></li><li><a shape="rect" href="general.html" title="General">General</a><ul><li><a shape="rect" href="are-there-more-faq-entries.html" title="Are there more FAQ Entries">Are there more FAQ Entries</a></li><li><a shape="rect" href="what-is-activemq-cpp.html" title="What is ActiveMQ CPP">What is ActiveMQ CPP</a></li></ul></li></ul></li><li><a shape="rect" href="privacy-policy.html" title="Privacy Policy">Privacy Policy</a></li></ul></li><li><a shape="rect" href="configuring.html" title="Configuring">Configuring</a></li><li><a shape="rect" href="developers.html" title="Developers">Developers</a><ul><li><a shape="rect" href="building.html" title="Building">Building</a></li><li><a shape="rect" href="creating-distributions.html" title="Creating Distribu
 tions">Creating Distributions</a></li><li><a shape="rect" href="source.html" title="Source">Source</a></li></ul></li><li><a shape="rect" href="example.html" title="Example">Example</a></li><li><a shape="rect" href="overview.html" title="Overview">Overview</a><ul><li><a shape="rect" href="cms-api-overview.html" title="CMS API Overview">CMS API Overview</a></li><li><a shape="rect" href="download.html" title="Download">Download</a><ul><li><a shape="rect" href="activemq-cpp-22-release.html" title="ActiveMQ CPP 2.2 Release">ActiveMQ CPP 2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-10-release.html" title="ActiveMQ-CPP 1.0 Release">ActiveMQ-CPP 1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-11-release.html" title="ActiveMQ-CPP 1.1 Release">ActiveMQ-CPP 1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-201-release.html" title="ActiveMQ-CPP 2.0.1 Release">ActiveMQ-CPP 2.0.1 Release</a></li><li><a shape="rect" href="activemq-cpp-20-release.html" titl
 e="ActiveMQ-CPP 2.0 Release">ActiveMQ-CPP 2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-211-release.html" title="ActiveMQ-CPP 2.1.1 Release">ActiveMQ-CPP 2.1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-212-release.html" title="ActiveMQ-CPP 2.1.2 Release">ActiveMQ-CPP 2.1.2 Release</a></li><li><a shape="rect" href="activemq-cpp-213-release.html" title="ActiveMQ-CPP 2.1.3 Release">ActiveMQ-CPP 2.1.3 Release</a></li><li><a shape="rect" href="activemq-cpp-21-release.html" title="ActiveMQ-CPP 2.1 Release">ActiveMQ-CPP 2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-221-release.html" title="ActiveMQ-CPP 2.2.1 Release">ActiveMQ-CPP 2.2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-222-release.html" title="ActiveMQ-CPP 2.2.2 Release">ActiveMQ-CPP 2.2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-223-release.html" title="ActiveMQ-CPP 2.2.3 Release">ActiveMQ-CPP 2.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-224-
 release.html" title="ActiveMQ-CPP 2.2.4 Release">ActiveMQ-CPP 2.2.4 Release</a></li><li><a shape="rect" href="activemq-cpp-225-release.html" title="ActiveMQ-CPP 2.2.5 Release">ActiveMQ-CPP 2.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-226-release.html" title="ActiveMQ-CPP 2.2.6 Release">ActiveMQ-CPP 2.2.6 Release</a></li><li><a shape="rect" href="activemq-cpp-301-release.html" title="ActiveMQ-CPP 3.0.1 Release">ActiveMQ-CPP 3.0.1 Release</a></li><li><a shape="rect" href="activemq-cpp-30-release.html" title="ActiveMQ-CPP 3.0 Release">ActiveMQ-CPP 3.0 Release</a></li><li><a shape="rect" href="activemq-cpp-310-release.html" title="ActiveMQ-CPP 3.1.0 Release">ActiveMQ-CPP 3.1.0 Release</a></li><li><a shape="rect" href="activemq-cpp-311-release.html" title="ActiveMQ-CPP 3.1.1 Release">ActiveMQ-CPP 3.1.1 Release</a></li><li><a shape="rect" href="activemq-cpp-312-release.html" title="ActiveMQ-CPP 3.1.2 Release">ActiveMQ-CPP 3.1.2 Release</a></li><li><a shape="rect" h
 ref="activemq-cpp-313-release.html" title="ActiveMQ-CPP 3.1.3 Release">ActiveMQ-CPP 3.1.3 Release</a></li><li><a shape="rect" href="activemq-cpp-320-release.html" title="ActiveMQ-CPP 3.2.0 Release">ActiveMQ-CPP 3.2.0 Release</a></li><li><a shape="rect" href="activemq-cpp-321-release.html" title="ActiveMQ-CPP 3.2.1 Release">ActiveMQ-CPP 3.2.1 Release</a></li><li><a shape="rect" href="activemq-cpp-322-release.html" title="ActiveMQ-CPP 3.2.2 Release">ActiveMQ-CPP 3.2.2 Release</a></li><li><a shape="rect" href="activemq-cpp-323-release.html" title="ActiveMQ-CPP 3.2.3 Release">ActiveMQ-CPP 3.2.3 Release</a></li><li><a shape="rect" href="activemq-cpp-324-release.html" title="ActiveMQ-CPP 3.2.4 Release">ActiveMQ-CPP 3.2.4 Release</a></li><li><a shape="rect" href="activemq-cpp-325-release.html" title="ActiveMQ-CPP 3.2.5 Release">ActiveMQ-CPP 3.2.5 Release</a></li><li><a shape="rect" href="activemq-cpp-330-release.html" title="ActiveMQ-CPP 3.3.0 Release">ActiveMQ-CPP 3.3.0 Release</a
 ></li><li><a shape="rect" href="activemq-cpp-340-release.html" title="ActiveMQ-CPP 3.4.0 Release">ActiveMQ-CPP 3.4.0 Release</a></li><li><a shape="rect" href="activemq-cpp-341-release.html" title="ActiveMQ-CPP 3.4.1 Release">ActiveMQ-CPP 3.4.1 Release</a></li><li><a shape="rect" href="activemq-cpp-342-release.html" title="ActiveMQ-CPP 3.4.2 Release">ActiveMQ-CPP 3.4.2 Release</a></li><li><a shape="rect" href="activemq-cpp-343-release.html" title="ActiveMQ-CPP 3.4.3 Release">ActiveMQ-CPP 3.4.3 Release</a></li><li><a shape="rect" href="activemq-cpp-344-release.html" title="ActiveMQ-CPP 3.4.4 Release">ActiveMQ-CPP 3.4.4 Release</a></li><li><a shape="rect" href="activemq-cpp-345-release.html" title="ActiveMQ-CPP 3.4.5 Release">ActiveMQ-CPP 3.4.5 Release</a></li><li><a shape="rect" href="activemq-cpp-350-release.html" title="ActiveMQ-CPP 3.5.0 Release">ActiveMQ-CPP 3.5.0 Release</a></li><li><a shape="rect" href="activemq-cpp-libtool-and-packaging-notes.html" title="ActiveMQ-CPP, 
 libtool and packaging notes">ActiveMQ-CPP, libtool and packaging notes</a><ul><li><a shape="rect" href="activemq-cpp-product-version-number.html" title="ActiveMQ-CPP product version number">ActiveMQ-CPP product version number</a></li></ul></li><li><a shape="rect" href="cms-api-10-release.html" title="CMS API 1.0 Release">CMS API 1.0 Release</a></li><li><a shape="rect" href="cms-api-11-release.html" title="CMS API 1.1 Release">CMS API 1.1 Release</a></li><li><a shape="rect" href="cms-api-12-release.html" title="CMS API 1.2 Release">CMS API 1.2 Release</a></li></ul></li><li><a shape="rect" href="getting-started.html" title="Getting Started">Getting Started</a></li><li><a shape="rect" href="tutorials.html" title="Tutorials">Tutorials</a><ul><li><a shape="rect" href="handling-advisory-messages.html" title="Handling Advisory Messages">Handling Advisory Messages</a></li></ul></li></ul></li><li><a shape="rect" href="site.html" title="Site">Site</a><ul><li><a shape="rect" href="bann
 er.html" title="Banner">Banner</a></li><li><a shape="rect" href="navigation.html" title="Navigation">Navigation</a><ul><li><a shape="rect" href="api.html" title="API">API</a></li><li><a shape="rect" href="connectivity.html" title="Connectivity">Connectivity</a></li><li><a shape="rect" href="news.html" title="News">News</a></li><li><a shape="rect" href="openwire-support.html" title="OpenWire Support">OpenWire Support</a></li><li><a shape="rect" href="stomp-support.html" title="Stomp Support">Stomp Support</a></li><li><a shape="rect" href="support.html" title="Support">Support</a></li><li><a shape="rect" href="using-activemq-cpp.html" title="Using ActiveMQ-CPP">Using ActiveMQ-CPP</a></li></ul></li><li><a shape="rect" href="quicklinks.html" title="QuickLinks">QuickLinks</a></li><li><a shape="rect" href="siteindex.html" title="SiteIndex">SiteIndex</a></li><li><a shape="rect" href="sitemap.html" title="SiteMap">SiteMap</a></li></ul></li></ul>
           </div>
         </td>
         <td valign="top">

Modified: websites/production/activemq/content/connection-configuration-uri.html
==============================================================================
--- websites/production/activemq/content/connection-configuration-uri.html (original)
+++ websites/production/activemq/content/connection-configuration-uri.html Fri Jan  4 21:20:56 2013
@@ -100,7 +100,7 @@ tcp:<span class="code-comment">//localho
 
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Option Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Object configured </th><th colspan="1" rowspan="1" class="confluenceTh"> See Also </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> jms.blobTransferPolicy.* </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java">BlobTransferPolicy</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&amp;title=Blob+Message&amp;linkCreation=true&amp;fromPageId=35986">Blob Message</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> jms.prefetchPolicy.* </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" cl
 ass="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java?view=markup">ActiveMQPrefetchPolicy</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="what-is-the-prefetch-limit-for.html" title="What is the prefetch limit for">What is the prefetch limit for</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> jms.redeliveryPolicy.* </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java?view=markup">RedeliveryPolicy</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="redelivery-policy.html" title="Redelivery Policy">Redelivery Policy</a> </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Option Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Object configured </th><th colspan="1" rowspan="1" class="confluenceTh"> See Also </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> jms.blobTransferPolicy.* </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/blob/BlobTransferPolicy.java">BlobTransferPolicy</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[Blob Message]</span> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> jms.prefetchPolicy.* </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java?view=markup">Ac
 tiveMQPrefetchPolicy</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="what-is-the-prefetch-limit-for.html" title="What is the prefetch limit for">What is the prefetch limit for</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> jms.redeliveryPolicy.* </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java?view=markup">RedeliveryPolicy</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="redelivery-policy.html" title="Redelivery Policy">Redelivery Policy</a> </td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/activemq/content/dot-net.html
==============================================================================
--- websites/production/activemq/content/dot-net.html (original)
+++ websites/production/activemq/content/dot-net.html Fri Jan  4 21:20:56 2013
@@ -72,7 +72,7 @@
         <tr>
         <td valign="top" width="100%">
           <div class="wiki-content maincontent">
-<div class="error"><span class="error">Unable to render {include}</span> Couldn't find a page to include called: <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&amp;title=nms&amp;linkCreation=true&amp;fromPageId=36081">nms</a></div>
+<div class="error"><span class="error">Unable to render {include}</span> Couldn't find a page to include called: nms</div>
           </div>
         </td>
         <td valign="top">

Modified: websites/production/activemq/content/how-can-i-enable-detailed-logging.html
==============================================================================
--- websites/production/activemq/content/how-can-i-enable-detailed-logging.html (original)
+++ websites/production/activemq/content/how-can-i-enable-detailed-logging.html Fri Jan  4 21:20:56 2013
@@ -74,7 +74,7 @@
           <div class="wiki-content maincontent">
 <h2><a shape="rect" name="HowcanIenabledetailedlogging-HowcanIenabledetailedlogging"></a>How can I enable detailed logging</h2>
 
-<p>We use <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&amp;title=www.slf4j.org&amp;linkCreation=true&amp;fromPageId=35977">slf4j</a> which allows the underlying logging implementation to be statically bound at startup.<br clear="none">
+<p>We use <span class="error">[slf4j]</span> which allows the underlying logging implementation to be statically bound at startup.<br clear="none">
 By default we ship with log4j but feel free to make your own choice.</p>
 
 <p>If you've got log4j.jar on your classpath you can use a log4j.properties file to configure the logging levels. See the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-core/src/test/resources/log4j.properties">log4j.properties example</a> for the kind of thing you'll need.</p>

Modified: websites/production/activemq/content/how-can-i-get-help.html
==============================================================================
--- websites/production/activemq/content/how-can-i-get-help.html (original)
+++ websites/production/activemq/content/how-can-i-get-help.html Fri Jan  4 21:20:56 2013
@@ -84,7 +84,7 @@
 <p>Before you report a problem you might want to read the <a shape="rect" href="faq.html" title="FAQ">FAQ</a>. <br clear="none">
 Whenever you are reporting a problem please be sure to include as much information as possible; the more we know the more chance of a quicker resolution.</p>
 
-<ul><li>Which <a shape="rect" class="external-link" href="http://activemq.apache.org/download.html">version</a> of ActiveMQ</li><li>What platform of Java (e.g., Java SE 6 with JRE/<a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&amp;title=JDK&amp;linkCreation=true&amp;fromPageId=35919">JDK</a> 1.6.0 or J2SE 5 with JRE/<a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&amp;title=JDK&amp;linkCreation=true&amp;fromPageId=35919">JDK</a> 1.5.0)</li><li>Any particular application/web server or container being used - if so what version?</li><li>Stack traces generally really help! If in doubt include the whole thing; often exceptions get wrapped in other exceptions and the exception right near the bottom explains the actual error, not the first few lines at the top. It's very easy for us to skim-read past unnecessary parts of a stack trace.</li><l
 i>Log output (e.g., <tt>data/activemq.log</tt>) can be useful too; sometimes <a shape="rect" href="how-do-i-change-the-logging.html" title="How do I change the logging">enabling DEBUG logging</a> can help</li><li>Your code &amp; configuration files are often useful</li></ul>
+<ul><li>Which <a shape="rect" class="external-link" href="http://activemq.apache.org/download.html">version</a> of ActiveMQ</li><li>What platform of Java (e.g., Java SE 6 with JRE/<span class="error">[JDK]</span> 1.6.0 or J2SE 5 with JRE/<span class="error">[JDK]</span> 1.5.0)</li><li>Any particular application/web server or container being used - if so what version?</li><li>Stack traces generally really help! If in doubt include the whole thing; often exceptions get wrapped in other exceptions and the exception right near the bottom explains the actual error, not the first few lines at the top. It's very easy for us to skim-read past unnecessary parts of a stack trace.</li><li>Log output (e.g., <tt>data/activemq.log</tt>) can be useful too; sometimes <a shape="rect" href="how-do-i-change-the-logging.html" title="How do I change the logging">enabling DEBUG logging</a> can help</li><li>Your code &amp; configuration files are often useful</li></ul>
 
 
 <h3><a shape="rect" name="HowcanIgethelp-Howtogethelpfaster"></a>How to get help faster</h3>

Modified: websites/production/activemq/content/how-do-i-access-activemq-from-csharp-or-dotnet.html
==============================================================================
--- websites/production/activemq/content/how-do-i-access-activemq-from-csharp-or-dotnet.html (original)
+++ websites/production/activemq/content/how-do-i-access-activemq-from-csharp-or-dotnet.html Fri Jan  4 21:20:56 2013
@@ -73,7 +73,7 @@
         <td valign="top" width="100%">
           <div class="wiki-content maincontent">
 <p></p>
-<div class="error"><span class="error">Unable to render {include}</span> Couldn't find a page to include called: <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&amp;title=nms&amp;linkCreation=true&amp;fromPageId=36081">nms</a></div>
+<div class="error"><span class="error">Unable to render {include}</span> Couldn't find a page to include called: nms</div>
           </div>
         </td>
         <td valign="top">

Modified: websites/production/activemq/content/how-do-i-change-the-logging.html
==============================================================================
--- websites/production/activemq/content/how-do-i-change-the-logging.html (original)
+++ websites/production/activemq/content/how-do-i-change-the-logging.html Fri Jan  4 21:20:56 2013
@@ -74,7 +74,7 @@
           <div class="wiki-content maincontent">
 <h2><a shape="rect" name="HowdoIchangethelogging-HowdoIchangethelogging"></a>How do I change the logging</h2>
 
-<p>We use <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=ACTIVEMQ&amp;title=www.slf4j.org&amp;linkCreation=true&amp;fromPageId=35929">slf4j</a> to log information in the broker client and the broker itself so you can fully configure which logging levels are used and whether to log to files or the console etc. For more information see the <a shape="rect" class="external-link" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual.</a>.</p>
+<p>We use <span class="error">[slf4j]</span> to log information in the broker client and the broker itself so you can fully configure which logging levels are used and whether to log to files or the console etc. For more information see the <a shape="rect" class="external-link" href="http://logging.apache.org/log4j/docs/manual.html">log4j manual.</a>.</p>
 
 <p>You can disable the ActiveMQ logging by editing the <b>conf/log4j.properties</b> file to disable all INFO level logging for activemq by adding this line</p>
 

Modified: websites/production/activemq/content/how-do-i-find-the-size-of-a-queue.html
==============================================================================
--- websites/production/activemq/content/how-do-i-find-the-size-of-a-queue.html (original)
+++ websites/production/activemq/content/how-do-i-find-the-size-of-a-queue.html Fri Jan  4 21:20:56 2013
@@ -74,13 +74,18 @@
           <div class="wiki-content maincontent">
 <p>How do I check on the size of the queue? I know it's not JMS standard, but most JMS implementations have a way to do this.</p>
 
-<p>&#8211;</p>
-
-<p>You can view the queue depth using the MBeans in ActiveMQ 4.x. Use any JMX management console to see the statistics. See <a shape="rect" href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">How can I monitor ActiveMQ</a>.</p>
+<p>You can view the queue depth using the MBeans in ActiveMQ 5.x. Use any JMX management console to see the statistics. See <a shape="rect" href="how-can-i-monitor-activemq.html" title="How can I monitor ActiveMQ">How can I monitor ActiveMQ</a>.</p>
 
 <p>You can also browse the contents of a queue using the JMS <a shape="rect" class="external-link" href="http://java.sun.com/j2ee/1.4/docs/api/javax/jms/QueueBrowser.html" rel="nofollow">QueueBrowser</a>.</p>
 
 <p>Or you can access statistics <a shape="rect" href="how-can-i-see-what-destinations-are-used.html" title="How can I see what destinations are used">programmatically</a></p>
+
+<p>Through the MBeans, you can monitor individual destinations including message statistics related to the destination. For example, you'll see the following attributes on a destination (Queue or Topic):</p>
+
+<ul><li>Enqueue Count - the total number of messages sent to the queue since the last restart</li><li>Dequeue Count - the total number of messages removed from the queue (ack'd by consumer) since last restart</li><li>Inflight Count - the number of messages sent to a consumer session and have not received an ack</li><li>Dispatch Count - the total number of messages sent to consumer sessions (Dequeue + Inflight)</li><li>Expired Count - the number of messages that were not delivered because they were expired</li></ul>
+
+
+<p>The "size of a queue" is also explicitly called out in an attribute "QueueSize." QueueSize is the total number of messages in the queue/store that have not been ack'd by a consumer. This can become confusing at times when compared to the Enqueue Count because the Enqueue Count is a count over a period of time (since the last broker restart) while the Queue Size is not dependent on a period of time but instead on the actual number of messages in the store. </p>
           </div>
         </td>
         <td valign="top">

Modified: websites/production/activemq/content/how-does-activemq-compare-to-amqp.html
==============================================================================
--- websites/production/activemq/content/how-does-activemq-compare-to-amqp.html (original)
+++ websites/production/activemq/content/how-does-activemq-compare-to-amqp.html Fri Jan  4 21:20:56 2013
@@ -74,11 +74,11 @@
           <div class="wiki-content maincontent">
 <p><a shape="rect" href="amqp.html" title="AMQP">AMQP</a> stands for the <em>Advanced Message Queue Protocol</em> and is a specification for how messaging clients and brokers can interoperate. AMQP is a specification of a wire-level protocol for client to message broker communication.  It is not a messaging system like ActiveMQ, but just a messaging protocol.</p>
 
-<p>ActiveMQ is aiming to provide support for AMQP 1.0 once it is finalised, as well as other open protocols.</p>
+<p>ActiveMQ now implements AMQP 1.0!</p>
 
-<p>ActiveMQ already supports other open wire protocols:</p>
+<p>ActiveMQ also supports other open wire protocols:</p>
 
-<ul><li><a shape="rect" href="openwire.html" title="OpenWire">OpenWire</a>, a fast binary format</li><li><a shape="rect" href="stomp.html" title="Stomp">Stomp</a>, a simple and easily implemented text based-protocol</li></ul>
+<ul><li><a shape="rect" href="openwire.html" title="OpenWire">OpenWire</a>, a fast binary format</li><li><a shape="rect" href="stomp.html" title="Stomp">Stomp</a>, a simple and easily implemented text based-protocol</li><li><a shape="rect" href="mqtt.html" title="MQTT">MQTT</a>, a compact binary format for limited devices on an unreliable network</li></ul>
 
 
 <p>Through these protocols, ActiveMQ can support clients in C, C++, C#, Ruby, Python, Perl, PHP, Pike etc. AMQP is most similar to OpenWire, because both OpenWire and AMQP are designed for high performance messaging, through a binary (rather than text-based) format. As a text-based format, STOMP is much easier to implement, but gives somewhat slower performance.</p>

Modified: websites/production/activemq/content/index.html
==============================================================================
--- websites/production/activemq/content/index.html (original)
+++ websites/production/activemq/content/index.html Fri Jan  4 21:20:56 2013
@@ -104,71 +104,56 @@
                <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: tabish121" title="tabish121">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Oct 12, 2012</div>
-                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/10/12/ActiveMQ-CPP+v3.4.5+Released">ActiveMQ-CPP v3.4.5 Released</a>
+                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Dec 21, 2012</div>
+                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/12/21/ActiveMQ-CPP+version+3.5.0+released.">ActiveMQ-CPP version 3.5.0 released.</a>
             
         </div>
     
     <div class="wiki-content">
-        <p>The newest release of ActiveMQ-CPP is out, you can <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.5+Release" title="ActiveMQ-CPP 3.4.5 Release">download</a> the source bundles here.</p>
+        <p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.5.0+Release" title="ActiveMQ-CPP 3.5.0 Release">here</a>.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=30738986">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~dejanb">
-               <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: dejanb" title="dejanb">
+                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
+               <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: tabish121" title="tabish121">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~dejanb">Dejan Bosanac</a> posted on Oct 08, 2012</div>
-                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/10/08/Apache+ActiveMQ+5.7.0+Released">Apache ActiveMQ 5.7.0 Released</a>
+                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Oct 12, 2012</div>
+                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/10/12/ActiveMQ-CPP+v3.4.5+Released">ActiveMQ-CPP v3.4.5 Released</a>
             
         </div>
     
     <div class="wiki-content">
-        <p>The ActiveMQ team is delighted to announce Apache ActiveMQ 5.7.0. All details of the release and download links can be found on the <a shape="rect" href="activemq-570-release.html" title="ActiveMQ 5.7.0 Release">release page</a>.</p>
+        <p>The newest release of ActiveMQ-CPP is out, you can <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.5+Release" title="ActiveMQ-CPP 3.4.5 Release">download</a> the source bundles here.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=30738258">Edit</a>
-                    
-                    </div>
     </div>
     
         
 <div class="blog-post-listing">
             <div class="logo-heading-block">
             <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
-               <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: tabish121" title="tabish121">
+                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~dejanb">
+               <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: dejanb" title="dejanb">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Jun 29, 2012</div>
-                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/06/29/ActiveMQ-CPP+Version+3.4.4+Released">ActiveMQ-CPP Version 3.4.4 Released</a>
+                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~dejanb">Dejan Bosanac</a> posted on Oct 08, 2012</div>
+                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/10/08/Apache+ActiveMQ+5.7.0+Released">Apache ActiveMQ 5.7.0 Released</a>
             
         </div>
     
     <div class="wiki-content">
-        <p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.4+Release" title="ActiveMQ-CPP 3.4.4 Release">here</a>.</p>
+        <p>The ActiveMQ team is delighted to announce Apache ActiveMQ 5.7.0. All details of the release and download links can be found on the <a shape="rect" href="activemq-570-release.html" title="ActiveMQ 5.7.0 Release">release page</a>.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27851033">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -179,21 +164,16 @@
                <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: tabish121" title="tabish121">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Jun 02, 2012</div>
-                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/06/02/ActiveMQ-CPP+Version+3.4.3+Released">ActiveMQ-CPP Version 3.4.3 Released</a>
+                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Jun 29, 2012</div>
+                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/06/29/ActiveMQ-CPP+Version+3.4.4+Released">ActiveMQ-CPP Version 3.4.4 Released</a>
             
         </div>
     
     <div class="wiki-content">
-        <p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.3+Release" title="ActiveMQ-CPP 3.4.3 Release">here</a>.</p>
+        <p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.4+Release" title="ActiveMQ-CPP 3.4.4 Release">here</a>.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27848574">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -204,21 +184,16 @@
                <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: tabish121" title="tabish121">
            </a>            </span>
             <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Apr 27, 2012</div>
-                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/04/27/ActiveMQ-CPP+Version+3.4.2+Released">ActiveMQ-CPP Version 3.4.2 Released</a>
+                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Jun 02, 2012</div>
+                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/06/02/ActiveMQ-CPP+Version+3.4.3+Released">ActiveMQ-CPP Version 3.4.3 Released</a>
             
         </div>
     
     <div class="wiki-content">
-        <p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.2+Release" title="ActiveMQ-CPP 3.4.2 Release">here</a>.</p>
+        <p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.3+Release" title="ActiveMQ-CPP 3.4.3 Release">here</a>.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27845103">Edit</a>
-                    
-                    </div>
     </div>
     
 

Added: websites/production/activemq/content/integrating-apache-activemq-with-jboss.data/amq-spring-1.2.6.tgz
==============================================================================
Binary file - no diff available.

Propchange: websites/production/activemq/content/integrating-apache-activemq-with-jboss.data/amq-spring-1.2.6.tgz
------------------------------------------------------------------------------
    svn:mime-type = application/x-gzip

Added: websites/production/activemq/content/integrating-apache-activemq-with-jboss.data/amq-spring-2.0.tgz
==============================================================================
Binary file - no diff available.

Propchange: websites/production/activemq/content/integrating-apache-activemq-with-jboss.data/amq-spring-2.0.tgz
------------------------------------------------------------------------------
    svn:mime-type = application/x-gzip

Modified: websites/production/activemq/content/integrating-apache-activemq-with-jboss.html
==============================================================================
--- websites/production/activemq/content/integrating-apache-activemq-with-jboss.html (original)
+++ websites/production/activemq/content/integrating-apache-activemq-with-jboss.html Fri Jan  4 21:20:56 2013
@@ -798,17 +798,7 @@ description: Time spent by a message bef
             </td><td colspan="1" rowspan="1" class="attachment-size">5.58 MB</td><td colspan="1" rowspan="1"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~bsnyder">Bruce Snyder</a></td><td colspan="1" rowspan="1">Oct 03, 2007 00:31</td><td colspan="1" rowspan="1" class="comment">
                                     &#160;
                             </td><td colspan="1" rowspan="1" class="attachment-actions">
-                                                <ul><li class="first">
-    
-        
-    
-    <a shape="rect" class="editAttachmentLink" href="/confluence/pages/editattachment.action?pageId=$page.id&amp;fileName=amq-spring-1.2.6.tgz" title="">
-                   <span>Properties</span></a>        </li><li class="">
-    
-        
-    
-    <a shape="rect" class="removeAttachmentLink" href="/confluence/pages/removeattachment.action?pageId=$page.id&amp;fileName=amq-spring-1.2.6.tgz&amp;version=1" title="">
-                   <span>Remove</span></a>        </li></ul>
+                                                    &#160;
                             </td></tr><tr id="attachment-5194"><td colspan="1" rowspan="1" class="filename-column">
                 
 <span class="icon icon-file-unknown" title="File">File</span>                <a shape="rect" class="filename" href="integrating-apache-activemq-with-jboss.data/amq-spring-2.0.tgz" title="amq-spring-2.0.tgz" data-filename="amq-spring-2.0.tgz">
@@ -817,17 +807,7 @@ description: Time spent by a message bef
             </td><td colspan="1" rowspan="1" class="attachment-size">6.20 MB</td><td colspan="1" rowspan="1"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~bsnyder">Bruce Snyder</a></td><td colspan="1" rowspan="1">Oct 03, 2007 01:42</td><td colspan="1" rowspan="1" class="comment">
                                     &#160;
                             </td><td colspan="1" rowspan="1" class="attachment-actions">
-                                                <ul><li class="first">
-    
-        
-    
-    <a shape="rect" class="editAttachmentLink" href="/confluence/pages/editattachment.action?pageId=$page.id&amp;fileName=amq-spring-2.0.tgz" title="">
-                   <span>Properties</span></a>        </li><li class="">
-    
-        
-    
-    <a shape="rect" class="removeAttachmentLink" href="/confluence/pages/removeattachment.action?pageId=$page.id&amp;fileName=amq-spring-2.0.tgz&amp;version=1" title="">
-                   <span>Remove</span></a>        </li></ul>
+                                                    &#160;
                             </td></tr></table>            </div>
 
     <div class="plugin_attachments_upload_container">

Modified: websites/production/activemq/content/jboss-integration.html
==============================================================================
--- websites/production/activemq/content/jboss-integration.html (original)
+++ websites/production/activemq/content/jboss-integration.html Fri Jan  4 21:20:56 2013
@@ -798,17 +798,7 @@ description: Time spent by a message bef
             </td><td colspan="1" rowspan="1" class="attachment-size">5.58 MB</td><td colspan="1" rowspan="1"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~bsnyder">Bruce Snyder</a></td><td colspan="1" rowspan="1">Oct 03, 2007 00:31</td><td colspan="1" rowspan="1" class="comment">
                                     &#160;
                             </td><td colspan="1" rowspan="1" class="attachment-actions">
-                                                <ul><li class="first">
-    
-        
-    
-    <a shape="rect" class="editAttachmentLink" href="/confluence/pages/editattachment.action?pageId=$page.id&amp;fileName=amq-spring-1.2.6.tgz" title="">
-                   <span>Properties</span></a>        </li><li class="">
-    
-        
-    
-    <a shape="rect" class="removeAttachmentLink" href="/confluence/pages/removeattachment.action?pageId=$page.id&amp;fileName=amq-spring-1.2.6.tgz&amp;version=1" title="">
-                   <span>Remove</span></a>        </li></ul>
+                                                    &#160;
                             </td></tr><tr id="attachment-5194"><td colspan="1" rowspan="1" class="filename-column">
                 
 <span class="icon icon-file-unknown" title="File">File</span>                <a shape="rect" class="filename" href="jboss-integration.data/amq-spring-2.0.tgz" title="amq-spring-2.0.tgz" data-filename="amq-spring-2.0.tgz">
@@ -817,17 +807,7 @@ description: Time spent by a message bef
             </td><td colspan="1" rowspan="1" class="attachment-size">6.20 MB</td><td colspan="1" rowspan="1"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~bsnyder">Bruce Snyder</a></td><td colspan="1" rowspan="1">Oct 03, 2007 01:42</td><td colspan="1" rowspan="1" class="comment">
                                     &#160;
                             </td><td colspan="1" rowspan="1" class="attachment-actions">
-                                                <ul><li class="first">
-    
-        
-    
-    <a shape="rect" class="editAttachmentLink" href="/confluence/pages/editattachment.action?pageId=$page.id&amp;fileName=amq-spring-2.0.tgz" title="">
-                   <span>Properties</span></a>        </li><li class="">
-    
-        
-    
-    <a shape="rect" class="removeAttachmentLink" href="/confluence/pages/removeattachment.action?pageId=$page.id&amp;fileName=amq-spring-2.0.tgz&amp;version=1" title="">
-                   <span>Remove</span></a>        </li></ul>
+                                                    &#160;
                             </td></tr></table>            </div>
 
     <div class="plugin_attachments_upload_container">

Modified: websites/production/activemq/content/news.html
==============================================================================
--- websites/production/activemq/content/news.html (original)
+++ websites/production/activemq/content/news.html Fri Jan  4 21:20:56 2013
@@ -83,6 +83,26 @@
                <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: tabish121" title="tabish121">
            </a>            </span>
             <span class="blogHeading">
+                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Dec 21, 2012</div>
+                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/12/21/ActiveMQ-CPP+version+3.5.0+released.">ActiveMQ-CPP version 3.5.0 released.</a>
+            
+        </div>
+    
+    <div class="wiki-content">
+        <p>The newest release of ActiveMQ-CPP is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.5.0+Release" title="ActiveMQ-CPP 3.5.0 Release">here</a>.</p>
+    </div>
+    
+        
+    </div>
+    
+        
+<div class="blog-post-listing">
+            <div class="logo-heading-block">
+            <span class="logoBlock">
+                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~tabish121">
+               <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: tabish121" title="tabish121">
+           </a>            </span>
+            <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~tabish121">Timothy Bish</a> posted on Oct 12, 2012</div>
                 <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/10/12/ActiveMQ-CPP+v3.4.5+Released">ActiveMQ-CPP v3.4.5 Released</a>
             
@@ -92,12 +112,7 @@
         <p>The newest release of ActiveMQ-CPP is out, you can <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.5+Release" title="ActiveMQ-CPP 3.4.5 Release">download</a> the source bundles here.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=30738986">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -117,12 +132,7 @@
         <p>The ActiveMQ team is delighted to announce Apache ActiveMQ 5.7.0. All details of the release and download links can be found on the <a shape="rect" href="activemq-570-release.html" title="ActiveMQ 5.7.0 Release">release page</a>.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=30738258">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -142,12 +152,7 @@
         <p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.4+Release" title="ActiveMQ-CPP 3.4.4 Release">here</a>.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27851033">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -167,12 +172,7 @@
         <p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.3+Release" title="ActiveMQ-CPP 3.4.3 Release">here</a>.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27848574">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -192,12 +192,7 @@
         <p>The ActiveMQ team is delighted to announce ActiveMQ 5.6.0. Full details of the release and download links can be found on the <a shape="rect" href="activemq-560-release.html" title="ActiveMQ 5.6.0 Release">release page</a>.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27846088">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -217,12 +212,7 @@
         <p>Today marks the official release of <a shape="rect" href="https://cwiki.apache.org/confluence/display/NMS/Download" title="Download">Apache.NMS.ActiveMQ</a> v1.5.5. We put a lot of work into this one fixing bugs that were found since the 1.5.4 release. This release features a fix for a critical issue related to connection failure. </p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27845878">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -242,12 +232,7 @@
         <p>The newest release of <a shape="rect" class="external-link" href="http://activemq.apache.org/cms/">ActiveMQ-CPP</a> is out, you can download the source bundles <a shape="rect" href="https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.2+Release" title="ActiveMQ-CPP 3.4.2 Release">here</a>.</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27845103">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -267,12 +252,7 @@
         <p>Today marks the official release of Apache.NMS.ActiveMQ v1.5.4. We put a lot of work into this one fixing bugs that were found since the 1.5.3 release.  This release features a fix for a critical issue related to advisory messages and connection failure.  </p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27843952">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -292,45 +272,7 @@
         <p>Today marks the official release of Apache.NMS.ActiveMQ v1.5.3.  We put a lot of work into this one fixing bugs that were found since the 1.5.2 release.  </p>
     </div>
     
-            
-        <div class="endsection">
-        
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27836780">Edit</a>
-                    
-                    </div>
-    </div>
-    
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~bsnyder">
-               <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: bsnyder" title="bsnyder">
-           </a>            </span>
-            <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~bsnyder">Bruce Snyder</a> posted on Apr 04, 2011</div>
-                <a shape="rect" class="blogHeading" href="https://cwiki.apache.org/confluence/display/ACTIVEMQ/2011/04/04/ActiveMQ+In+Action+is+Now+Available+in+Print+and+E-Book%21">ActiveMQ In Action is Now Available in Print and E-Book!</a>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p><span class="image-wrap" style="float: left"><img src="http://www.manning.com/snyder/snyder_cover150.jpg" style="border: 0px solid black"></span> </p>
-
-<h3><a shape="rect" name="ActiveMQInActionisNowAvailableinPrintandE-Book%21-ActiveMQInActionisNowAvailableinPrintandEBook%21"></a>ActiveMQ In Action is Now Available in Print and E-Book! </h3>
-
-<p>The <a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow">ActiveMQ In Action</a> book has now been fully released in both e-book and in print &#8211; get your own copy today! </p>
-
-<p><a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow">ActiveMQ In Action</a>, the definitive guide to master ActiveMQ is now available in print and ebook. ActiveMQ in Action starts from the anatomy of a JMS message and moves quickly through connectors, message persistence, authentication, and authorization. By following a running example (a stock portfolio app), you&#8217;ll pick up the best practices distilled by the authors from their long and deep involvement with this technology. Every Manning Publications print book purchase includes a complimentary ebook which comes in three formats: PDF, mobi, and epub when available. </p>
-
-<h3><a shape="rect" name="ActiveMQInActionisNowAvailableinPrintandE-Book%21-IwanttopurchaseActiveMQinActionnow%21"></a><a shape="rect" class="external-link" href="http://bit.ly/2je6cQ" rel="nofollow">I want to purchase ActiveMQ in Action now!</a> </h3>
-    </div>
-    
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=26117231">Edit</a>
-                    
-                    </div>
     </div>
     
 

Modified: websites/production/activemq/content/nms/activemq-delay-and-schedule-message-feature.html
==============================================================================
--- websites/production/activemq/content/nms/activemq-delay-and-schedule-message-feature.html (original)
+++ websites/production/activemq/content/nms/activemq-delay-and-schedule-message-feature.html Fri Jan  4 21:20:56 2013
@@ -72,7 +72,7 @@
         <tr>
         <td valign="top" width="100%">
           <div class="wiki-content maincontent">
-<p>ActiveMQ from version <b>5.4</b> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <b>schedulerSupport</b> attribute to true in the <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=NMS&amp;title=xml+configuration&amp;linkCreation=true&amp;fromPageId=25202031">xml configuration</a>. <br clear="none">
+<p>ActiveMQ from version <b>5.4</b> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <b>schedulerSupport</b> attribute to true in the <span class="error">[xml configuration]</span>. <br clear="none">
 An ActiveMQ client can take advantage of a delayed delivery by using the following message properties:</p>
 
 <div class="table-wrap">

Modified: websites/production/activemq/content/nms/activemq-destination-options.html
==============================================================================
--- websites/production/activemq/content/nms/activemq-destination-options.html (original)
+++ websites/production/activemq/content/nms/activemq-destination-options.html Fri Jan  4 21:20:56 2013
@@ -79,7 +79,7 @@
 <h3><a shape="rect" name="ActiveMQDestinationOptions-ConsumerOptions"></a>Consumer Options</h3>
 
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Option Name</th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value</th><th colspan="1" rowspan="1" class="confluenceTh"> Description</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.prefetchSize</td><td colspan="1" rowspan="1" class="confluenceTd"> variable </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of message the consumer will <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=NMS&amp;title=What+is+the+prefetch+limit+for&amp;linkCreation=true&amp;fromPageId=25201938">prefetch</a>.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.maximumPendingMessageLimit</td><td colspan="1" rowspan="1" class="confluenceTd"> 0 </td><td colspan="1" rowspan="1" class="confluenceTd"> Use to control if messages for non-durable topics are dropped if a <a shape="rect" cl
 ass="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=NMS&amp;title=Slow+Consumer+Handling&amp;linkCreation=true&amp;fromPageId=25201938">slow consumer</a> situation exists.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.noLocal </td><td colspan="1" rowspan="1" class="confluenceTd"> false </td><td colspan="1" rowspan="1" class="confluenceTd"> Same as the noLocal flag on a Topic consumer.  Exposed here so that it can be used with a queue.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.dispatchAsync </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> Should the broker <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=NMS&amp;title=Consumer+Dispatch+Async&amp;linkCreation=true&amp;fromPageId=25201938">dispatch messages asynchronously</a>  to the consumer.</td></tr><tr><td 
 colspan="1" rowspan="1" class="confluenceTd">consumer.retroactive</td><td colspan="1" rowspan="1" class="confluenceTd"> false</td><td colspan="1" rowspan="1" class="confluenceTd"> Is this a <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=NMS&amp;title=Retroactive+Consumer&amp;linkCreation=true&amp;fromPageId=25201938">Retroactive Consumer</a>.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.selector</td><td colspan="1" rowspan="1" class="confluenceTd"> null </td><td colspan="1" rowspan="1" class="confluenceTd"> NMS Selector used with the consumer.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.exclusive</td><td colspan="1" rowspan="1" class="confluenceTd"> false </td><td colspan="1" rowspan="1" class="confluenceTd"> Is this an <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=NMS&amp;title=Exclusive+Consumer&
 amp;linkCreation=true&amp;fromPageId=25201938">Exclusive Consumer</a>.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.priority</td><td colspan="1" rowspan="1" class="confluenceTd"> 0 </td><td colspan="1" rowspan="1" class="confluenceTd"> Allows you to configure a <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=NMS&amp;title=Consumer+Priority&amp;linkCreation=true&amp;fromPageId=25201938">Consumer Priority</a>.</td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Option Name</th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value</th><th colspan="1" rowspan="1" class="confluenceTh"> Description</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.prefetchSize</td><td colspan="1" rowspan="1" class="confluenceTd"> variable </td><td colspan="1" rowspan="1" class="confluenceTd"> The number of message the consumer will <span class="error">[prefetch]</span>.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.maximumPendingMessageLimit</td><td colspan="1" rowspan="1" class="confluenceTd"> 0 </td><td colspan="1" rowspan="1" class="confluenceTd"> Use to control if messages for non-durable topics are dropped if a <span class="error">[slow consumer]</span> situation exists.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.noLocal </td><td colspan="1" rowspan="1" class="confluenceTd"> 
 false </td><td colspan="1" rowspan="1" class="confluenceTd"> Same as the noLocal flag on a Topic consumer.  Exposed here so that it can be used with a queue.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.dispatchAsync </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> Should the broker <span class="error">[dispatch messages asynchronously]</span>  to the consumer.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.retroactive</td><td colspan="1" rowspan="1" class="confluenceTd"> false</td><td colspan="1" rowspan="1" class="confluenceTd"> Is this a <span class="error">[Retroactive Consumer]</span>.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.selector</td><td colspan="1" rowspan="1" class="confluenceTd"> null </td><td colspan="1" rowspan="1" class="confluenceTd"> NMS Selector used with the consumer.</td></tr><tr><td colspan="1" rowspan="1" cla
 ss="confluenceTd">consumer.exclusive</td><td colspan="1" rowspan="1" class="confluenceTd"> false </td><td colspan="1" rowspan="1" class="confluenceTd"> Is this an <span class="error">[Exclusive Consumer]</span>.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">consumer.priority</td><td colspan="1" rowspan="1" class="confluenceTd"> 0 </td><td colspan="1" rowspan="1" class="confluenceTd"> Allows you to configure a <span class="error">[Consumer Priority]</span>.</td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/activemq/content/nms/index.html
==============================================================================
--- websites/production/activemq/content/nms/index.html (original)
+++ websites/production/activemq/content/nms/index.html Fri Jan  4 21:20:56 2013
@@ -107,12 +107,7 @@
         <p>A new release of Apache.NMS.Stomp is out v1.5.3. This release has several important bug fixes in it, grab the binary distro on the <a shape="rect" href="stomp-downloads.html" title="Stomp Downloads">Apache.NMS.Stomp</a> Downloads page:</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=30149437">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -132,12 +127,7 @@
         <p>A new release of Apache.NMS.ActiveMQ is out v1.5.5. This release has several important bug fixes in it, grab the binary distro on the <a shape="rect" href="download.html" title="Download">Apache.NMS.ActiveMQ Downloads</a> page:</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27845840">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -157,12 +147,7 @@
         <p>A new release of Apache.NMS.ActiveMQ is out v1.5.4. This release has several important bug fixes in it, grab the binary distro on the <a shape="rect" href="activemq-downloads.html" title="ActiveMQ Downloads">Apache.NMS.ActiveMQ Downloads</a> page:</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27843946">Edit</a>
-                    
-                    </div>
     </div>
     
         
@@ -182,12 +167,7 @@
         <p>A new release of Apache.NMS.ActiveMQ is out v1.5.3. This release has several important bug fixes in it, grab the binary distro on the <a shape="rect" href="apachenmsactivemq-v153.html" title="Apache.NMS.ActiveMQ v1.5.3">Apache.NMS.ActiveMQ Downloads page</a>:</p>
     </div>
     
-            
-        <div class="endsection">
         
-            <a shape="rect" href="/confluence/pages/editblogpost.action?pageId=27836785">Edit</a>
-                    
-                    </div>
     </div>
     
 

Modified: websites/production/activemq/content/nms/stomp-delayed-and-scheduled-message-feature.html
==============================================================================
--- websites/production/activemq/content/nms/stomp-delayed-and-scheduled-message-feature.html (original)
+++ websites/production/activemq/content/nms/stomp-delayed-and-scheduled-message-feature.html Fri Jan  4 21:20:56 2013
@@ -74,7 +74,7 @@
           <div class="wiki-content maincontent">
 <div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">This documentation only applies when the Stomp client is connected to an ActiveMQ Broker v5.4 and above.</td></tr></table></div>
 
-<p>ActiveMQ from version <b>5.4</b> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <b>schedulerSupport</b> attribute to true in the <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=NMS&amp;title=xml+configuration&amp;linkCreation=true&amp;fromPageId=25202031">xml configuration</a>. <br clear="none">
+<p>ActiveMQ from version <b>5.4</b> has an optional persistent scheduler built into the ActiveMQ message broker. It is enabled by setting the broker <b>schedulerSupport</b> attribute to true in the <span class="error">[xml configuration]</span>. <br clear="none">
 An ActiveMQ client can take advantage of a delayed delivery by using the following message properties:</p>
 
 <div class="table-wrap">

Added: websites/production/activemq/content/polo-page.data/test
==============================================================================
--- websites/production/activemq/content/polo-page.data/test (added)
+++ websites/production/activemq/content/polo-page.data/test Fri Jan  4 21:20:56 2013
@@ -0,0 +1 @@
+<stage keygen_seq="6"><pageObj istt="true" stg="0" pb="0" gr="0" fill="16777215" height="754" width="576"><objects><object order="0" dsy="8" dsx="8" dshad="true" gradon="true" linew="1" linec="0" fill="8113609" text-horizontal-pos="center" text-vertical-pos="middle" fixed-aspect="false" rot="0" height="112" width="160.05" y="170" x="277" shp_id="3" class="rectangle"><text/><connlines/></object><object order="1" dsy="8" dsx="8" dshad="true" gradon="true" linew="1" linec="0" fill="8113609" te
\ No newline at end of file

Modified: websites/production/activemq/content/polo-page.html
==============================================================================
--- websites/production/activemq/content/polo-page.html (original)
+++ websites/production/activemq/content/polo-page.html Fri Jan  4 21:20:56 2013
@@ -80,14 +80,8 @@
                     
                         
                         <a shape="rect" href="https://cwiki.apache.org/confluence/plugins/gliffy/viewlargediagram.action?name=test&amp;ceoid=50841&amp;key=ACTIVEMQ&amp;pageId=50841" target="">Full Size</a>
-                    
-                         | 
-                        <a shape="rect" href="https://cwiki.apache.org/confluence/plugins/gliffy/showgliffyeditor.action?name=test&amp;ceoid=50841&amp;key=ACTIVEMQ&amp;lastPage=/display/ACTIVEMQ/polo+page&amp;pageId=50841" target="">Edit Diagram</a>
-                    
-                         | 
-                        <a shape="rect" href="https://cwiki.apache.org/confluence/plugins/gliffy/removediagram.action?name=test&amp;ceoid=50841&amp;key=ACTIVEMQ&amp;lastPage=/display/ACTIVEMQ/polo+page&amp;pageId=50841&amp;input=true" target="">Remove Diagram</a>
                                     </caption><tr><td colspan="1" rowspan="1">
-                        <img style="border: none; width: 384px; height: 502px;" usemap="#GLIFFY_MAP_50841_test" src="https://cwiki.apache.org/confluence/plugins/servlet/gliffyapi/clientdiagram?cb=-1712196791&amp;pk=pub&amp;name=test&amp;ceoid=50841&amp;key=ACTIVEMQ" alt="A&amp;#32;Gliffy&amp;#32;Diagram&amp;#32;named&amp;#58;&amp;#32;test">
+                        <img style="border: none; width: 384px; height: 502px;" usemap="#GLIFFY_MAP_50841_test" src="https://cwiki.apache.org/confluence/plugins/servlet/gliffyapi/clientdiagram?cb=-380275612&amp;pk=pub&amp;name=test&amp;ceoid=50841&amp;key=ACTIVEMQ" alt="A&amp;#32;Gliffy&amp;#32;Diagram&amp;#32;named&amp;#58;&amp;#32;test">
                     </td></tr></table>
         </td></tr></table>
 

Modified: websites/production/activemq/content/rest.html
==============================================================================
--- websites/production/activemq/content/rest.html (original)
+++ websites/production/activemq/content/rest.html Fri Jan  4 21:20:56 2013
@@ -72,9 +72,9 @@
         <tr>
         <td valign="top" width="100%">
           <div class="wiki-content maincontent">
-<p>ActiveMQ implements a <a shape="rect" class="external-link" href="http://rest.blueoxen.net/" rel="nofollow">REST</a>-ful API to messaging which allows any web capable device to publish or consume messages using a regular HTTP POST or GET.</p>
+<p>ActiveMQ implements a RESTful API to messaging which allows any web capable device to publish or consume messages using a regular HTTP POST or GET.</p>
 
-<p>If you are working with DHTML or web browsers you might wanna check out our <a shape="rect" href="ajax.html" title="Ajax">Ajax</a> support or try <a shape="rect" href="web-samples.html" title="Web Samples">running the REST examples</a></p>
+<p>If you are interested in messaging directly from web browsers you might wanna check out our <a shape="rect" href="ajax.html" title="Ajax">Ajax</a> or <a shape="rect" href="websockets.html" title="WebSockets">WebSockets</a> support or try <a shape="rect" href="web-samples.html" title="Web Samples">running the REST examples</a></p>
 
 <h2><a shape="rect" name="REST-MappingofRESTtoJMS"></a>Mapping of REST to JMS</h2>
 
@@ -108,12 +108,16 @@ http:<span class="code-comment">//www.ac
 
 <p>For a more cleaner mapping of a simple transfer protocol to different languages, you might wanna take a look at <a shape="rect" href="stomp.html" title="Stomp">Stomp</a>.</p>
 
+<h2><a shape="rect" name="REST-Defaultconfiguration"></a>Default configuration</h2>
+
+<p>Until version 5.8, REST API was part of the <a shape="rect" href="web-samples.html" title="Web Samples">Web Samples</a> and was mapped to <a shape="rect" class="external-link" href="http://localhost:8161/demo/message" rel="nofollow">http://localhost:8161/demo/message</a> url. From 5.8 onwards, the API is available by default at <a shape="rect" class="external-link" href="http://localhost:8161/api/message" rel="nofollow">http://localhost:8161/api/message</a> url. Also, starting with 5.8, web server is secured by default (see <a shape="rect" href="web-console.html" title="Web Console">Web Console</a> for more information), so have that in mind when trying to use it. Examples below will assume new api location and secured web server.</p>
+
 <h3><a shape="rect" name="REST-Producing"></a>Producing</h3>
 
 <p>You cam produce by sending a POST request to the server, like</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">curl -d <span class="code-quote">"body=message"</span> http:<span class="code-comment">//localhost:8161/demo/message/TEST?type=queue</span></pre>
+<pre class="code-java">curl -u admin:admin -d <span class="code-quote">"body=message"</span> http:<span class="code-comment">//localhost:8161/api/message/TEST?type=queue</span></pre>
 </div></div>
 
 <h3><a shape="rect" name="REST-Timeouts"></a>Timeouts</h3>
@@ -131,7 +135,7 @@ http:<span class="code-comment">//www.ac
 <p>For example, you can use <tt>wget</tt> to consume messages, like this:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
-wget --save-cookies cookies.txt --load-cookies cookies.txt --keep-session-cookies  http:<span class="code-comment">//localhost:8161/demo/message/TEST1?type=queue</span>
+wget --user admin --password admin --save-cookies cookies.txt --load-cookies cookies.txt --keep-session-cookies  http:<span class="code-comment">//localhost:8161/api/message/TEST1?type=queue</span>
 </pre>
 </div></div>
 
@@ -159,7 +163,7 @@ wget --save-cookies cookies.txt --load-c
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
-wget http:<span class="code-comment">//localhost:8161/demo/message/test?type=queue&amp;clientId=consumerA</span>
+wget --user admin --password admin http:<span class="code-comment">//localhost:8161/api/message/test?type=queue&amp;clientId=consumerA</span>
 </pre>
 </div></div>
 
@@ -177,7 +181,7 @@ wget http:<span class="code-comment">//l
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
-wget  --save-cookies cookies.txt --load-cookies cookies.txt --keep-session-cookies  --header=<span class="code-quote">"selector: test=2"</span> http:<span class="code-comment">//localhost:8161/demo/message/test?type=queue</span>
+wget  --user admin --password admin --save-cookies cookies.txt --load-cookies cookies.txt --keep-session-cookies  --header=<span class="code-quote">"selector: test=2"</span> http:<span class="code-comment">//localhost:8161/api/message/test?type=queue</span>
 </pre>
 </div></div>
 
@@ -219,7 +223,7 @@ wget  --save-cookies cookies.txt --load-
 <p>A default content type can also be overridden using request headers. Specifying <tt>xml=true</tt> or <tt>json=true</tt> URL parameter you'll get a response with the desired content type.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">wget http:<span class="code-comment">//localhost:8161/demo/message/TEST?type=queue\&amp;clientId=A\&amp;json=<span class="code-keyword">true</span></span></pre>
+<pre class="code-java">wget --user admin --password admin http:<span class="code-comment">//localhost:8161/api/message/TEST?type=queue\&amp;clientId=A\&amp;json=<span class="code-keyword">true</span></span></pre>
 </div></div>
 
 <h3><a shape="rect" name="REST-Security"></a>Security</h3>
@@ -241,6 +245,22 @@ wget  --save-cookies cookies.txt --load-
                     &lt;property name=<span class="code-quote">"password"</span> value=<span class="code-quote">"password"</span> /&gt;
                 &lt;/bean&gt;</pre>
 </div></div>
+
+<h2><a shape="rect" name="REST-RestManagement"></a>Rest Management</h2>
+
+<p>Starting with version 5.8 we provide a REST management API for the broker. Using <a shape="rect" class="external-link" href="http://www.jolokia.org/" rel="nofollow">Jolokia</a> JMX-HTTP bridge it's possible to access all broker metrics (like memory usage) and execute management operations (like purging queues) using REST API. By default the management API is exposed at <a shape="rect" class="external-link" href="http://localhost:8161/api/jolokia/" rel="nofollow">http://localhost:8161/api/jolokia/</a> URL. So you can for example get basic broker data with </p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">wget --user admin --password admin http:<span class="code-comment">//localhost:8161/api/jolokia/read/org.apache.activemq:type=Broker,brokerName=localhost</span></pre>
+</div></div>
+
+<p>or to be more specific, total consumer count with</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">wget --user admin --password admin http:<span class="code-comment">//localhost:8161/api/jolokia/read/org.apache.activemq:type=Broker,brokerName=localhost/TotalConsumerCount</span></pre>
+</div></div>
+
+<p>For more information on Jolokia protocol, see its reference manual. An API like this makes it easy to script monitoring and management operations agains the broker.</p>
           </div>
         </td>
         <td valign="top">