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 2014/02/13 16:21:48 UTC
svn commit: r897771 - in /websites/production/activemq/content:
activemq-5100-release.html cache/main.pageCache getting-started.html
monitoring-activemq.html run-broker.html version-5-getting-started.html
version-5-run-broker.html
Author: buildbot
Date: Thu Feb 13 15:21:48 2014
New Revision: 897771
Log:
Production update by buildbot for activemq
Modified:
websites/production/activemq/content/activemq-5100-release.html
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/getting-started.html
websites/production/activemq/content/monitoring-activemq.html
websites/production/activemq/content/run-broker.html
websites/production/activemq/content/version-5-getting-started.html
websites/production/activemq/content/version-5-run-broker.html
Modified: websites/production/activemq/content/activemq-5100-release.html
==============================================================================
--- websites/production/activemq/content/activemq-5100-release.html (original)
+++ websites/production/activemq/content/activemq-5100-release.html Thu Feb 13 15:21:48 2014
@@ -37,6 +37,7 @@
<script src='http://activemq.apache.org/styles/highlighter/scripts/shCore.js' type='text/javascript'></script>
<script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
<script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+ <script src='http://activemq.apache.org/styles/highlighter/scripts/shBrushPlain.js' type='text/javascript'></script>
<script type="text/javascript">
SyntaxHighlighter.defaults['toolbar'] = false;
@@ -83,38 +84,13 @@
<tr>
<td valign="top" width="100%">
<div class="wiki-content maincontent"><div style="padding-right:20px;float:left;margin-left:-20px;">
-<p><span class="image-wrap" style=""><img src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" style="border: 0px solid black"></span></p></div>
-
- <div class="aui-message hint shadowed information-macro">
+<p><span class="image-wrap" style=""><img src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png" style="border: 0px solid black"></span></p></div> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
-
-<p>ActiveMQ 5.10 is currently being developed, and has not been released yet!</p>
+ <p>ActiveMQ 5.10 is currently being developed, and has not been released yet!</p>
</div>
</div>
-
-
-<h2 id="ActiveMQ5.10.0Release-ActiveMQ5.10.0Release(inprogress)">ActiveMQ 5.10.0 Release (in progress)</h2>
-
-<p>Apache ActiveMQ 5.10.0 resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.10.0%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&mode=hide">more than XXX issues</a>, mostly bug fixes and improvements. It has the following new features:</p>
-
-<h3 id="ActiveMQ5.10.0Release-NewFeaturesandnoteworthyimprovementsandfixes">New Features and noteworthy improvements and fixes</h3>
-
-<ul><li>Transport socket.xxx options is being validated, which helps catching typo mistakes, or attempting to use non existing options.</li><li>Upgraded to latest release of <a shape="rect" class="external-link" href="http://hawt.io/" rel="nofollow">hawtio</a> web console.</li><li>Fixed <a shape="rect" class="external-link" href="http://camel.apache.org/activemq">ActiveMQ Camel</a> component configured with <code>userName</code>, and <code>password</code> not being used, if using the factory methods on <code>ActiveMQComponent</code>.</li><li>Improved the <a shape="rect" class="external-link" href="http://camel.apache.org/activemq">ActiveMQ Camel</a> component configured using the factory methods to use a pooled connection factory out of the box.</li><li>XPath <a shape="rect" href="selectors.html">Selectors</a> using the default xalan library now use pre compiled xpath expressions.</li><li>Fixed journaledJDBC persistence checkpoint task may throw IOException - Already Started; when a
connection to the JDBC database could not be obtained.</li></ul>
-
-
-<h3 id="ActiveMQ5.10.0Release-MigrationGuide">Migration Guide</h3>
-
-<ul><li>Removed <code>org.apache.activemq.camel.converter.IdentityMessageReuseConverter</code> class from the <code>activemq-camel</code> component.</li></ul>
-
-
-<h2 id="ActiveMQ5.10.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2>
-
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/apache-activemq/5.10.0/apache-activemq-5.10.0-bin.zip">apache-activemq-5.10.0-bin.zip</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/apache-activemq/5.10.0/apache-activemq-5.10.0-bin.zip.asc">apache-activemq-5.10.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1"
rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/apache-activemq/5.10.0/apache-activemq-5.10.0-bin.tar.gz">apache-activemq-5.10.0-bin.tar.gz</a> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/apache-activemq/5.10.0/apache-activemq-5.10.0-bin.tar.gz.asc">apache-activemq-5.10.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div>
-
-
-<h2 id="ActiveMQ5.10.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads </h2>
+<h2 id="ActiveMQ5.10.0Release-ActiveMQ5.10.0Release(inprogress)">ActiveMQ 5.10.0 Release (in progress)</h2><p>Apache ActiveMQ 5.10.0 resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+AMQ+AND+fixVersion+%3D+%225.10.0%22+AND+status+%3D+Resolved+ORDER+BY+priority+DESC&mode=hide">more than XXX issues</a>, mostly bug fixes and improvements. It has the following new features:</p><h3 id="ActiveMQ5.10.0Release-NewFeaturesandnoteworthyimprovementsandfixes">New Features and noteworthy improvements and fixes</h3><ul><li>Transport socket.xxx options is being validated, which helps catching typo mistakes, or attempting to use non existing options.</li><li>Fixed <a shape="rect" class="external-link" href="http://camel.apache.org/activemq">ActiveMQ Camel</a> component configured with <code>userName</code>, and <code>password</code> not being used, if using the factory methods on <code>ActiveMQCompo
nent</code>.</li><li>Improved the <a shape="rect" class="external-link" href="http://camel.apache.org/activemq">ActiveMQ Camel</a> component configured using the factory methods to use a pooled connection factory out of the box.</li><li>XPath <a shape="rect" href="selectors.html">Selectors</a> using the default xalan library now use pre compiled xpath expressions.</li><li>Fixed journaledJDBC persistence checkpoint task may throw IOException - Already Started; when a connection to the JDBC database could not be obtained.</li></ul><h3 id="ActiveMQ5.10.0Release-MigrationGuide">Migration Guide</h3><ul><li>Removed <code>org.apache.activemq.camel.converter.IdentityMessageReuseConverter</code> class from the <code>activemq-camel</code> component.</li></ul><h2 id="ActiveMQ5.10.0Release-GettingtheBinaryDistributions">Getting the Binary Distributions</h2><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><t
h colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Windows Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/apache-activemq/5.10.0/apache-activemq-5.10.0-bin.zip">apache-activemq-5.10.0-bin.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/apache-activemq/5.10.0/apache-activemq-5.10.0-bin.zip.asc">apache-activemq-5.10.0-bin.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Unix/Linux/Cygwin Distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/apache-acti
vemq/5.10.0/apache-activemq-5.10.0-bin.tar.gz">apache-activemq-5.10.0-bin.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/apache-activemq/5.10.0/apache-activemq-5.10.0-bin.tar.gz.asc">apache-activemq-5.10.0-bin.tar.gz.asc</a></p></td></tr></tbody></table></div><p></p><h2 id="ActiveMQ5.10.0Release-VerifytheIntegrityofDownloads">Verify the Integrity of Downloads </h2>
<p>It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps: </p>
@@ -145,45 +121,17 @@ $ gpg --verify apache-activemq-<versi
<p>Alternatively, you can verify the MD5 signature on the files. A Unix program called <code>md5</code> or <code>md5sum</code> is included in most Linux and Unix distributions. It is also available as part of <a shape="rect" class="external-link" href="http://www.gnu.org/software/textutils/textutils.html" rel="nofollow">GNU Textutils</a>. Windows users can utilize any of the following md5 programs: </p>
-<ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul>
-
-<h2 id="ActiveMQ5.10.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2>
-
-<p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-<dependency>
+<ul><li><a shape="rect" class="external-link" href="http://www.fourmilab.ch/md5/" rel="nofollow">md5</a></li><li><a shape="rect" class="external-link" href="http://www.pc-tools.net/win32/md5sums/" rel="nofollow">md5sums</a></li><li><a shape="rect" class="external-link" href="http://www.slavasoft.com/fsum/" rel="nofollow">SlavaSoft FSUM</a></li></ul><h2 id="ActiveMQ5.10.0Release-GettingtheBinariesusingMaven2">Getting the Binaries using Maven 2</h2><p>To use this release in your maven project, the proper dependency configuration that you should use in your <a shape="rect" class="external-link" href="http://maven.apache.org/guides/introduction/introduction-to-the-pom.html">Maven POM</a> is:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>5.10.0</version>
</dependency>
]]></script>
-</div></div>
-
-<div></div>
-
-<h2 id="ActiveMQ5.10.0Release-GettingtheSourceCode">Getting the Source Code</h2>
-
-<h3 id="ActiveMQ5.10.0Release-SourceDistributions">Source Distributions</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/apache-activemq/5.10.0/activemq-parent-5.10.0-source-release.zip">activemq-parent-5.10.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/apache-activemq/5.10.0/activemq-parent-5.10.0-source-release.zip.asc">activemq-parent-5.10.0-source-release.zip.asc</a></p></td></tr></tbody></table></div>
-
-
-<h3 id="ActiveMQ5.10.0Release-SVNTagCheckout">SVN Tag Checkout</h3>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.0
+</div></div><div></div><h2 id="ActiveMQ5.10.0Release-GettingtheSourceCode">Getting the Source Code</h2><h3 id="ActiveMQ5.10.0Release-SourceDistributions">Source Distributions</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Download Link</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP Signature file of download</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source Release</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.cgi?path=/activemq/apache-activemq/5.10.0/activemq-parent-5.10.0-source-release.zip">activemq-parent-5.10.0-source-release.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/activemq/apache-activemq/5.10.0/activem
q-parent-5.10.0-source-release.zip.asc">activemq-parent-5.10.0-source-release.zip.asc</a></p></td></tr></tbody></table></div><h3 id="ActiveMQ5.10.0Release-SVNTagCheckout">SVN Tag Checkout</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.10.0
]]></script>
-</div></div>
-
-
-<h2 id="ActiveMQ5.10.0Release-Changelog">Changelog</h2>
-<p>TODO: Update to 5.10 version<br clear="none">
-For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&version=12323932">release notes</a></p>
-
-<p>Also see the previous <a shape="rect" href="activemq-590-release.html">ActiveMQ 5.9.0 Release</a></p></div>
+</div></div><h2 id="ActiveMQ5.10.0Release-Changelog">Changelog</h2><p>TODO: Update to 5.10 version<br clear="none"> For a more detailed view of new features and bug fixes, see the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&version=12323932">release notes</a></p><p>Also see the previous <a shape="rect" href="activemq-590-release.html">ActiveMQ 5.9.0 Release</a></p></div>
</td>
<td valign="top">
<div class="navigation">
Modified: websites/production/activemq/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.
Modified: websites/production/activemq/content/getting-started.html
==============================================================================
--- websites/production/activemq/content/getting-started.html (original)
+++ websites/production/activemq/content/getting-started.html Thu Feb 13 15:21:48 2014
@@ -411,27 +411,13 @@ netstat -an|grep 61616
<h2 id="GettingStarted-MonitoringActiveMQ">Monitoring ActiveMQ</h2>
-There are various ways to <a shape="rect" href="how-can-i-monitor-activemq.html">monitor ActiveMQ</a>. If you are on version 4.2 or later of ActiveMQ you can then monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p>
-
-<p>And from ActiveMQ 5.9 onwards you can use the new web console</p>
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/hawtio" rel="nofollow">http://localhost:8161/hawtio</a></p>
-
- <div class="aui-message hint shadowed information-macro">
+You can monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at<p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
-
-<p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none">
-The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
+ <p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
</div>
</div>
-
-
-<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p>
-
-<p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p>
+<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p>
<h2 id="GettingStarted-StoppingActiveMQ">Stopping ActiveMQ</h2>
Modified: websites/production/activemq/content/monitoring-activemq.html
==============================================================================
--- websites/production/activemq/content/monitoring-activemq.html (original)
+++ websites/production/activemq/content/monitoring-activemq.html Thu Feb 13 15:21:48 2014
@@ -72,27 +72,13 @@
<tbody>
<tr>
<td valign="top" width="100%">
-<div class="wiki-content maincontent"><p>There are various ways to <a shape="rect" href="how-can-i-monitor-activemq.html">monitor ActiveMQ</a>. If you are on version 4.2 or later of ActiveMQ you can then monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at </p>
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p>
-
-<p>And from ActiveMQ 5.9 onwards you can use the new web console</p>
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/hawtio" rel="nofollow">http://localhost:8161/hawtio</a></p>
-
- <div class="aui-message hint shadowed information-macro">
+<div class="wiki-content maincontent"><p>You can monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at</p><p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
-
-<p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none">
-The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
+ <p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
</div>
</div>
-
-
-<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p>
-
-<p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p></div>
+<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p></div>
</td>
<td valign="top">
<div class="navigation">
Modified: websites/production/activemq/content/run-broker.html
==============================================================================
--- websites/production/activemq/content/run-broker.html (original)
+++ websites/production/activemq/content/run-broker.html Thu Feb 13 15:21:48 2014
@@ -145,27 +145,13 @@ nohup activemq > /dev/null &
<h3 id="RunBroker-Monitoringthebroker">Monitoring the broker</h3>
-There are various ways to <a shape="rect" href="how-can-i-monitor-activemq.html">monitor ActiveMQ</a>. If you are on version 4.2 or later of ActiveMQ you can then monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p>
-
-<p>And from ActiveMQ 5.9 onwards you can use the new web console</p>
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/hawtio" rel="nofollow">http://localhost:8161/hawtio</a></p>
-
- <div class="aui-message hint shadowed information-macro">
+You can monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at<p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
-
-<p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none">
-The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
+ <p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
</div>
</div>
-
-
-<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p>
-
-<p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p>
+<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p>
<h3 id="RunBroker-RunningthebrokerinsideaServletEngine">Running the broker inside a Servlet Engine</h3>
Modified: websites/production/activemq/content/version-5-getting-started.html
==============================================================================
--- websites/production/activemq/content/version-5-getting-started.html (original)
+++ websites/production/activemq/content/version-5-getting-started.html Thu Feb 13 15:21:48 2014
@@ -398,27 +398,13 @@ netstat -an|grep 61616
<h2 id="Version5GettingStarted-MonitoringActiveMQ">Monitoring ActiveMQ</h2>
-There are various ways to <a shape="rect" href="how-can-i-monitor-activemq.html">monitor ActiveMQ</a>. If you are on version 4.2 or later of ActiveMQ you can then monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p>
-
-<p>And from ActiveMQ 5.9 onwards you can use the new web console</p>
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/hawtio" rel="nofollow">http://localhost:8161/hawtio</a></p>
-
- <div class="aui-message hint shadowed information-macro">
+You can monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at<p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
-
-<p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none">
-The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
+ <p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
</div>
</div>
-
-
-<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p>
-
-<p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p>
+<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p>
<h2 id="Version5GettingStarted-StoppingActiveMQ">Stopping ActiveMQ</h2>
Modified: websites/production/activemq/content/version-5-run-broker.html
==============================================================================
--- websites/production/activemq/content/version-5-run-broker.html (original)
+++ websites/production/activemq/content/version-5-run-broker.html Thu Feb 13 15:21:48 2014
@@ -141,27 +141,13 @@ nohup activemq > /dev/null &
<h3 id="Version5RunBroker-Monitoringthebroker">Monitoring the broker</h3>
-There are various ways to <a shape="rect" href="how-can-i-monitor-activemq.html">monitor ActiveMQ</a>. If you are on version 4.2 or later of ActiveMQ you can then monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p>
-
-<p>And from ActiveMQ 5.9 onwards you can use the new web console</p>
-
-<p><a shape="rect" class="external-link" href="http://localhost:8161/hawtio" rel="nofollow">http://localhost:8161/hawtio</a></p>
-
- <div class="aui-message hint shadowed information-macro">
+You can monitor ActiveMQ using the <a shape="rect" href="web-console.html">Web Console</a> by pointing your browser at<p><a shape="rect" class="external-link" href="http://localhost:8161/admin" rel="nofollow">http://localhost:8161/admin</a></p> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
-
-<p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none">
-The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
+ <p>From ActiveMQ 5.8 onwards the web apps is secured out of the box.<br clear="none"> The default username and password is admin/admin. You can configure this in the conf/jetty-real.properties file.</p>
</div>
</div>
-
-
-<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p>
-
-<p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p>
+<p>Or you can use the <a shape="rect" href="jmx.html">JMX</a> support to view the running state of ActiveMQ.</p><p>For more information see the file <code>docs/WebConsole-README.txt</code> in the distribution.</p>
<h3 id="Version5RunBroker-RunningthebrokerinsideaServletEngine">Running the broker inside a Servlet Engine</h3>