http://git-wip-us.apache.org/repos/asf/activemq-web/blob/d3c643c7/developing-activemq.html
----------------------------------------------------------------------
diff --git a/developing-activemq.html b/developing-activemq.html
index 0140c18..0d49b4e 100644
--- a/developing-activemq.html
+++ b/developing-activemq.html
@@ -1,139 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-<head>
-    <link href="http://activemq.apache.org/styles/site.css"; rel="stylesheet" 
type="text/css"/>
-    <link href="http://activemq.apache.org/styles/type-settings.css"; 
rel="stylesheet" type="text/css"/>
-    <script src="http://activemq.apache.org/styles/prototype.js"; 
type="text/javascript"></script>
-    <script src="http://activemq.apache.org/styles/rico.js"; 
type="text/javascript"></script>    
-    <script src="http://activemq.apache.org/styles/site.js"; 
type="text/javascript"></script>
-    <style type="text/css">
-      .maincontent { overflow:hidden; }
-    </style>
-    <!--[if IE]>
-    <style type="text/css">
-      .maincontent { width:100%; }
-    </style>
-    <![endif]-->
-
-    
-    <title>
-    Apache ActiveMQ &#8482; -- Developing ActiveMQ
-    </title>
-</head>
-<body>
-<div class="white_box">
-<div class="header">
-  <div class="header_l">
-    <div class="header_r">
-    </div>
-  </div>
-</div>
-<div class="content">
-  <div class="content_l">
-    <div class="content_r">
-      <div>
-
-<!-- Banner -->
-<div id="asf_logo">
-       <div id="activemq_logo">
-     <a shape="rect" style="float:left; 
width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:10px; margin-left:100px;" href="http://activemq.apache.org"; 
title="The most popular and powerful open source Message Broker">ActiveMQ</a>
-            <a shape="rect" style="float:right; 
width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:15px; margin-right:10px;" href="http://www.apache.org"; title="The 
Apache Software Foundation">ASF</a>
-       </div>
-</div>
-
-        <div class="top_red_bar">
-          <div id="site-breadcrumbs">
-<a href="community.html">Community</a>&nbsp;&gt;&nbsp;<a 
href="faq.html">FAQ</a>&nbsp;&gt;&nbsp;<a 
href="developing-activemq.html">Developing ActiveMQ</a>
-          </div>
-          <div id="site-quicklinks">
-<p><a shape="rect" href="download.html">Download</a> | <a shape="rect" 
class="external-link" 
href="http://activemq.apache.org/maven/apidocs/index.html";>JavaDocs</a> <a 
shape="rect" href="javadocs.html">More...</a> | <a shape="rect" 
href="source.html">Source</a> | <a shape="rect" 
href="discussion-forums.html">Forums</a> | <a shape="rect" 
href="support.html">Support</a></p>
-          </div>
-        </div>
-
-  <table border="0">
-  <tbody>
-        <tr>
-        <td valign="top" width="100%">
 <div class="wiki-content maincontent"><p>Questions for developers wishing to 
extend or enhance Apache ActiveMQ</p>
 
 <ul class="childpages-macro"><li><a shape="rect" 
href="how-can-i-add-a-new-type-of-transport.html">How can I add a new type of 
transport</a></li><li><a shape="rect" href="how-can-i-contribute.html">How can 
I contribute</a></li><li><a shape="rect" 
href="how-do-i-add-my-own-plugins.html">How do I add my own 
plugins</a></li><li><a shape="rect" 
href="how-do-i-debug-activemq-from-my-ide.html">How do I debug ActiveMQ from my 
IDE</a></li></ul></div>
-        </td>
-        <td valign="top">
-          <div class="navigation">
-            <div class="navigation_top">
-              <div class="navigation_bottom">
-<h3 
id="Navigation-Overviewhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35985";><a
 shape="rect" href="overview.html">Overview</a></h3><ul 
class="alternate"><li><a shape="rect" href="index.html">Index</a></li><li><a 
shape="rect" href="news.html">News</a></li><li><a shape="rect" 
href="new-features.html">New Features</a></li><li><a shape="rect" 
href="getting-started.html">Getting Started</a></li><li><a shape="rect" 
href="faq.html">FAQ</a></li><li><a shape="rect" 
href="articles.html">Articles</a></li><li><a shape="rect" 
href="books.html">Books</a></li><li><a shape="rect" 
href="download.html">Download</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/licenses/";>License</a></li></ul><h3 
id="Navigation-Search">Search</h3><div>
-<form enctype="application/x-www-form-urlencoded" method="get" 
action="http://www.google.com/search"; style="font-size: 10px;">
-<input type="hidden" name="ie" value="UTF-8">
-<input type="hidden" name="oe" value="UTF-8">
-  <input maxlength="255" type="text" name="q" size="15" value="value"><br 
clear="none">
-  <input type="submit" name="btnG" value="Search">
-  <input type="hidden" name="domains" value="activemq.apache.org">
-  <input type="hidden" name="sitesearch" value="activemq.apache.org">
-</form>
-</div>
-<h3 id="Navigation-SubProjects">Sub Projects</h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://activemq.apache.org/artemis/";>Artemis</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/apollo"; title="ActiveMQ 
Apollo">Apollo</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/"; title="NMS is the 
.Net Messaging API">NMS</a></li></ul><h3 
id="Navigation-Communityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36130";><a
 shape="rect" href="community.html">Community</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="support.html">Support</a></li><li><a shape="rect" 
href="contributing.html">Contributing</a></li><li><a shape="rect" 
href="discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" 
href="mailing-lists.html">Mailing Lists</a></li><li><a shape="rect" href="irc.
 html">IRC</a></li><li><a shape="rect" class="external-link" 
href="http://javabot.evanchooly.com/logs/%23apache-activemq/today"; 
rel="nofollow">IRC Log</a></li><li><a shape="rect" 
href="security-advisories.html">Security Advisories</a></li><li><a shape="rect" 
href="site.html">Site</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 shape="rect" href="projects-using-activemq.html">Projects Using 
ActiveMQ</a></li><li><a shape="rect" href="users.html">Users</a></li><li><a 
shape="rect" href="team.html">Team</a></li><li><a shape="rect" 
href="thanks.html">Thanks</a></li></ul><h3 
id="Navigation-Featureshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35883";><a
 shape="rect" href="features.html">Features</a></h3><ul 
class="alternate"><li><a shape="rect" href="advisory-message.html">Advisory 
Message</a></li><li><a shape="rect" 
href="clustering.html">Clustering</a></li><li><a shape="rect" href="cros
 s-language-clients.html">Cross Language Clients</a></li><li><a shape="rect" 
href="enterprise-integration-patterns.html">Enterprise Integration 
Patterns</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a 
shape="rect" href="jms-to-jms-bridge.html">JMS to JMS Bridge</a></li><li><a 
shape="rect" href="masterslave.html">MasterSlave</a></li><li><a shape="rect" 
href="message-groups.html">Message Groups</a></li><li><a shape="rect" 
href="networks-of-brokers.html">Networks of Brokers</a></li><li><a shape="rect" 
href="performance.html">Performance</a></li><li><a shape="rect" 
href="persistence.html">Persistence</a></li><li><a shape="rect" 
href="security.html">Security</a></li><li><a shape="rect" 
href="virtual-destinations.html">Virtual Destinations</a></li><li><a 
shape="rect" href="visualisation.html">Visualisation</a></li><li><a 
shape="rect" href="features.html">More ...</a></li></ul><h3 
id="Navigation-Connectivityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=3616
 7"><a shape="rect" href="connectivity.html">Connectivity</a></h3><ul 
class="alternate"><li><a shape="rect" href="ajax.html">Ajax</a></li><li><a 
shape="rect" href="amqp.html">AMQP</a></li><li><a shape="rect" 
href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a 
shape="rect" href="c-integration.html">C Integration</a></li><li><a 
shape="rect" href="activemq-c-clients.html">C++</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/";>C# and .Net 
Integration</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
href="j2ee.html">J2EE</a></li><li><a shape="rect" 
href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" 
class="external-link" 
href="http://docs.codehaus.org/display/JETTY/Integrating+with+ActiveMQ"; 
rel="nofollow">Jetty</a></li><li><a shape="rect" href="jndi-support.html">JNDI 
Support</a></li><li><a shape="rect" class="external-link" href="http://a
 ctivemq.apache.org/nms/" title="NMS is the .Net Messaging 
API">NMS</a></li><li><a shape="rect" href="rest.html">REST</a></li><li><a 
shape="rect" href="rss-and-atom.html">RSS and Atom</a></li><li><a shape="rect" 
href="spring-support.html">Spring Support</a></li><li><a shape="rect" 
href="stomp.html">Stomp</a></li><li><a shape="rect" 
href="tomcat.html">Tomcat</a></li><li><a shape="rect" 
href="unix-service.html">Unix Service</a></li><li><a shape="rect" 
href="weblogic-integration.html">WebLogic Integration</a></li><li><a 
shape="rect" href="xmpp.html">XMPP</a></li><li><a shape="rect" 
href="connectivity.html">More ...</a></li></ul><h3 
id="Navigation-UsingActiveMQ5https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=71176";><a
 shape="rect" href="using-activemq-5.html">Using ActiveMQ 5</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="version-5-getting-started.html">Getting Started</a></li><li><a 
shape="rect" href="version-5-initial-configuration.html">Initial Configuration<
 /a></li><li><a shape="rect" href="version-5-run-broker.html">Running a 
Broker</a></li><li><a shape="rect" 
href="how-do-i-embed-a-broker-inside-a-connection.html">Embedded 
Brokers</a></li><li><a shape="rect" 
href="activemq-command-line-tools-reference.html">Command Line 
Tools</a></li><li><a shape="rect" 
href="configuring-version-5-transports.html">Configuring 
Transports</a></li><li><a shape="rect" 
href="version-5-examples.html">Examples</a></li><li><a shape="rect" 
href="version-5-web-samples.html">Web Samples</a></li><li><a shape="rect" 
href="how-can-i-monitor-activemq.html">Monitoring the Broker</a></li><li><a 
shape="rect" href="version-5-xml-configuration.html">Xml 
Configuration</a></li><li><a shape="rect" href="xml-reference.html">Xml 
Reference</a></li><li><a shape="rect" href="using-activemq-5.html">More 
...</a></li></ul><h3 
id="Navigation-Toolshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35912";><a
 shape="rect" href="tools.html">Tools</a></h3><ul class="altern
 ate"><li><a shape="rect" href="web-console.html">Web Console</a></li><li><a 
shape="rect" href="activemq-performance-module-users-manual.html">Maven2 
Performance Plugin</a></li></ul><h3 
id="Navigation-Supporthttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35919";><a
 shape="rect" href="support.html">Support</a></h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/jira/browse/AMQ";>Issues</a></li><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel";>Roadmap</a></li><li><a
 shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel";>Change
 log</a></li></ul><h3 
id="Navigation-Developershttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35903";><a
 shape="rect" href="developers.html">Developers</a></h3><ul 
class="alternate"><li>
 <a shape="rect" href="source.html">Source</a></li><li><a shape="rect" 
href="building.html">Building</a></li><li><a shape="rect" 
href="developer-guide.html">Developer Guide</a></li><li><a shape="rect" 
href="becoming-a-committer.html">Becoming a committer</a></li><li><a 
shape="rect" href="code-overview.html">Code Overview</a></li><li><a 
shape="rect" href="wire-protocol.html">Wire Protocol</a></li><li><a 
shape="rect" href="release-guide.html">Release Guide</a></li></ul><h3 
id="Navigation-Tests">Tests</h3><ul class="alternate"><li><a shape="rect" 
href="activemq-performance-module-users-manual.html">Maven2 Performance 
Plugin</a></li><li><a shape="rect" href="benchmark-tests.html">Benchmark 
Tests</a></li><li><a shape="rect" href="jmeter-system-tests.html">JMeter System 
Tests</a></li><li><a shape="rect" href="jmeter-performance-tests.html">JMeter 
Performance Tests</a></li><li><a shape="rect" 
href="integration-tests.html">Integration Tests</a></li></ul><h3 
id="Navigation-ProjectReports">Pro
 ject Reports</h3><ul class="alternate"><li><a shape="rect" 
href="junit-reports.html">JUnit Reports</a></li><li><a shape="rect" 
href="source-xref.html">Source XRef</a></li><li><a shape="rect" 
href="test-source-xref.html">Test Source XRef</a></li><li><a shape="rect" 
href="xml-reference.html">Xml Reference</a></li></ul>
-              </div>
-            </div>
-          </div>
-        </td>
-        </tr>
-  </tbody>
-        </table>
-        <div class="bottom_red_bar"></div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="black_box">
-<div class="footer">
-  <div class="footer_l">
-    <div class="footer_r">
-      <div>
-        <a href="http://activemq.apache.org/privacy-policy.html";>Privacy 
Policy</a> -
-        (<a 
href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=36114";>edit
 this page</a>)
-      </div>
-    </div>
-  </div>
-</div>
-</div>
-</div>
-<div class="design_attribution">
-&copy; 2004-2011 The Apache Software Foundation.
-<br/>          
-Apache ActiveMQ, ActiveMQ, Apache, the Apache feather logo, and the Apache 
ActiveMQ project logo are trademarks of The Apache Software Foundation.  All 
other marks mentioned may be trademarks or registered trademarks of their 
respective owners.
-<br/>
-<a href="http://hiramchirino.com";>Graphic Design By Hiram</a>
-</div>
 
-<!-- delay the loading of large javascript files to the end so that they don't 
interfere with the loading of page content -->
-<span style="display: none">
-  <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."; 
: "http://www.";);
-    document.write(unescape("%3Cscript src='" + gaJsHost + 
"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  </script>
-  <script type="text/javascript">
-    var pageTracker = _gat._getTracker("UA-1347593-1");
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  </script>
-</span>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/d3c643c7/developing-plugins.html
----------------------------------------------------------------------
diff --git a/developing-plugins.html b/developing-plugins.html
index 2e2cf2f..eaf4fa6 100644
--- a/developing-plugins.html
+++ b/developing-plugins.html
@@ -1,85 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-<head>
-    <link href="http://activemq.apache.org/styles/site.css"; rel="stylesheet" 
type="text/css"/>
-    <link href="http://activemq.apache.org/styles/type-settings.css"; 
rel="stylesheet" type="text/css"/>
-    <script src="http://activemq.apache.org/styles/prototype.js"; 
type="text/javascript"></script>
-    <script src="http://activemq.apache.org/styles/rico.js"; 
type="text/javascript"></script>    
-    <script src="http://activemq.apache.org/styles/site.js"; 
type="text/javascript"></script>
-    <style type="text/css">
-      .maincontent { overflow:hidden; }
-    </style>
-    <!--[if IE]>
-    <style type="text/css">
-      .maincontent { width:100%; }
-    </style>
-    <![endif]-->
-
-          <link 
href='http://activemq.apache.org/styles/highlighter/styles/shCore.css' 
rel='stylesheet' type='text/css' /> 
-      <link 
href='http://activemq.apache.org/styles/highlighter/styles/shThemeEclipse.css' 
rel='stylesheet' type='text/css' /> 
-      <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 type="text/javascript"> 
-        SyntaxHighlighter.defaults['toolbar'] = false; 
-        SyntaxHighlighter.all(); 
-      </script> 
-    
-    <title>
-    Apache ActiveMQ &#8482; -- Developing Plugins
-    </title>
-</head>
-<body>
-<div class="white_box">
-<div class="header">
-  <div class="header_l">
-    <div class="header_r">
-    </div>
-  </div>
-</div>
-<div class="content">
-  <div class="content_l">
-    <div class="content_r">
-      <div>
-
-<!-- Banner -->
-<div id="asf_logo">
-       <div id="activemq_logo">
-     <a shape="rect" style="float:left; 
width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:10px; margin-left:100px;" href="http://activemq.apache.org"; 
title="The most popular and powerful open source Message Broker">ActiveMQ</a>
-            <a shape="rect" style="float:right; 
width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:15px; margin-right:10px;" href="http://www.apache.org"; title="The 
Apache Software Foundation">ASF</a>
-       </div>
-</div>
-
-        <div class="top_red_bar">
-          <div id="site-breadcrumbs">
-<a href="developers.html">Developers</a>&nbsp;&gt;&nbsp;<a 
href="developer-guide.html">Developer Guide</a>&nbsp;&gt;&nbsp;<a 
href="developing-plugins.html">Developing Plugins</a>
-          </div>
-          <div id="site-quicklinks">
-<p><a shape="rect" href="download.html">Download</a> | <a shape="rect" 
class="external-link" 
href="http://activemq.apache.org/maven/apidocs/index.html";>JavaDocs</a> <a 
shape="rect" href="javadocs.html">More...</a> | <a shape="rect" 
href="source.html">Source</a> | <a shape="rect" 
href="discussion-forums.html">Forums</a> | <a shape="rect" 
href="support.html">Support</a></p>
-          </div>
-        </div>
-
-  <table border="0">
-  <tbody>
-        <tr>
-        <td valign="top" width="100%">
 <div class="wiki-content maincontent"><p>Apache ActiveMQ is based on the model 
of POJOs and <em>Dependency Injection</em>. If you are developing <a 
shape="rect" href="interceptors.html">Interceptors</a> or additional components 
or plugins for ActiveMQ then the first thing you should do is develop the code 
as if you are writing any other Spring component, using dependency 
injection.</p><h3 id="DevelopingPlugins-DependencyInjection">Dependency 
Injection</h3><p>Some folks favour using constructor based injection as it 
removes the need to have a separate lifecycle <em>start()</em> method - others 
find using property based injection is a little more flexible and easier to map 
to XML configuration files. We'll leave that choice up to you. For complex to 
create objects you could consider writing a FactoryBean. For more details on 
writing POJOs with Spring see their <a shape="rect" class="external-link" 
href="http://www.springframework.org/documentation"; 
rel="nofollow">documentation</a>.</p
 ><h3 id="DevelopingPlugins-CustomXML">Custom XML</h3><p>With ActiveMQ you can 
 >use regular Spring.xml syntax to configure things. However to produce neater 
 >XML that is easier to read and edit we use <a shape="rect" 
 >class="external-link" href="http://geronimo.apache.org/xbean/";>XBean</a> to 
 >autogenerate support for <a shape="rect" class="external-link" 
 >href="http://geronimo.apache.org/xbean/custom-xml.html";>Custom 
 >XML</a>.</p><p>If you wish your POJO to have its own custom XML you may wish 
 >to follow the following source examples for working nicely with XBean. 
 >Basically you add an XBean annotation in the javadoc comments to tell XBean 
 >how to map the POJO to custom XML. This should look something like</p><div 
 >class="code panel pdl" style="border-width: 1px;"><div class="codeContent 
 >panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" 
style="font-size:12px;">/**
  * @org.apache.xbean.XBean element="foo"
@@ -116,66 +34,4 @@ public class MyExtension {
 &lt;/plugins&gt;  
 </pre>
 </div></div><h3 id="DevelopingPlugins-Examples">Examples</h3><p>The easiest 
way to get a feel for how to extend ActiveMQ is maybe to look at some concrete 
examples of features and how those are implemented and configured. Here are 
some examples</p><ul><li><a shape="rect" class="external-link" 
href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java";>XBeanBrokerService</a>
 deals with most of the core configuration of the &lt;broker&gt; tag in the 
XML</li><li><a shape="rect" href="security.html">Security</a> has an <a 
shape="rect" class="external-link" 
href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/security/jaas-broker.xml";>example</a>
 XML configuration file using the <a shape="rect" class="external-link" 
href="http://svn.apache.org/repos/asf/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationPlugin.java";>Autho
 rizationPlugin</a></li><li>The <a shape="rect" 
href="message-redelivery-and-dlq-handling.html">Discarding DLQ Plugin</a> is 
used to discard messages from the DLQ.</li></ul></div>
-        </td>
-        <td valign="top">
-          <div class="navigation">
-            <div class="navigation_top">
-              <div class="navigation_bottom">
-<h3 
id="Navigation-Overviewhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35985";><a
 shape="rect" href="overview.html">Overview</a></h3><ul 
class="alternate"><li><a shape="rect" href="index.html">Index</a></li><li><a 
shape="rect" href="news.html">News</a></li><li><a shape="rect" 
href="new-features.html">New Features</a></li><li><a shape="rect" 
href="getting-started.html">Getting Started</a></li><li><a shape="rect" 
href="faq.html">FAQ</a></li><li><a shape="rect" 
href="articles.html">Articles</a></li><li><a shape="rect" 
href="books.html">Books</a></li><li><a shape="rect" 
href="download.html">Download</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/licenses/";>License</a></li></ul><h3 
id="Navigation-Search">Search</h3><div>
-<form enctype="application/x-www-form-urlencoded" method="get" 
action="http://www.google.com/search"; style="font-size: 10px;">
-<input type="hidden" name="ie" value="UTF-8">
-<input type="hidden" name="oe" value="UTF-8">
-  <input maxlength="255" type="text" name="q" size="15" value="value"><br 
clear="none">
-  <input type="submit" name="btnG" value="Search">
-  <input type="hidden" name="domains" value="activemq.apache.org">
-  <input type="hidden" name="sitesearch" value="activemq.apache.org">
-</form>
-</div>
-<h3 id="Navigation-SubProjects">Sub Projects</h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://activemq.apache.org/artemis/";>Artemis</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/apollo"; title="ActiveMQ 
Apollo">Apollo</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/"; title="NMS is the 
.Net Messaging API">NMS</a></li></ul><h3 
id="Navigation-Communityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36130";><a
 shape="rect" href="community.html">Community</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="support.html">Support</a></li><li><a shape="rect" 
href="contributing.html">Contributing</a></li><li><a shape="rect" 
href="discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" 
href="mailing-lists.html">Mailing Lists</a></li><li><a shape="rect" href="irc.
 html">IRC</a></li><li><a shape="rect" class="external-link" 
href="http://javabot.evanchooly.com/logs/%23apache-activemq/today"; 
rel="nofollow">IRC Log</a></li><li><a shape="rect" 
href="security-advisories.html">Security Advisories</a></li><li><a shape="rect" 
href="site.html">Site</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 shape="rect" href="projects-using-activemq.html">Projects Using 
ActiveMQ</a></li><li><a shape="rect" href="users.html">Users</a></li><li><a 
shape="rect" href="team.html">Team</a></li><li><a shape="rect" 
href="thanks.html">Thanks</a></li></ul><h3 
id="Navigation-Featureshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35883";><a
 shape="rect" href="features.html">Features</a></h3><ul 
class="alternate"><li><a shape="rect" href="advisory-message.html">Advisory 
Message</a></li><li><a shape="rect" 
href="clustering.html">Clustering</a></li><li><a shape="rect" href="cros
 s-language-clients.html">Cross Language Clients</a></li><li><a shape="rect" 
href="enterprise-integration-patterns.html">Enterprise Integration 
Patterns</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a 
shape="rect" href="jms-to-jms-bridge.html">JMS to JMS Bridge</a></li><li><a 
shape="rect" href="masterslave.html">MasterSlave</a></li><li><a shape="rect" 
href="message-groups.html">Message Groups</a></li><li><a shape="rect" 
href="networks-of-brokers.html">Networks of Brokers</a></li><li><a shape="rect" 
href="performance.html">Performance</a></li><li><a shape="rect" 
href="persistence.html">Persistence</a></li><li><a shape="rect" 
href="security.html">Security</a></li><li><a shape="rect" 
href="virtual-destinations.html">Virtual Destinations</a></li><li><a 
shape="rect" href="visualisation.html">Visualisation</a></li><li><a 
shape="rect" href="features.html">More ...</a></li></ul><h3 
id="Navigation-Connectivityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=3616
 7"><a shape="rect" href="connectivity.html">Connectivity</a></h3><ul 
class="alternate"><li><a shape="rect" href="ajax.html">Ajax</a></li><li><a 
shape="rect" href="amqp.html">AMQP</a></li><li><a shape="rect" 
href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a 
shape="rect" href="c-integration.html">C Integration</a></li><li><a 
shape="rect" href="activemq-c-clients.html">C++</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/";>C# and .Net 
Integration</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
href="j2ee.html">J2EE</a></li><li><a shape="rect" 
href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" 
class="external-link" 
href="http://docs.codehaus.org/display/JETTY/Integrating+with+ActiveMQ"; 
rel="nofollow">Jetty</a></li><li><a shape="rect" href="jndi-support.html">JNDI 
Support</a></li><li><a shape="rect" class="external-link" href="http://a
 ctivemq.apache.org/nms/" title="NMS is the .Net Messaging 
API">NMS</a></li><li><a shape="rect" href="rest.html">REST</a></li><li><a 
shape="rect" href="rss-and-atom.html">RSS and Atom</a></li><li><a shape="rect" 
href="spring-support.html">Spring Support</a></li><li><a shape="rect" 
href="stomp.html">Stomp</a></li><li><a shape="rect" 
href="tomcat.html">Tomcat</a></li><li><a shape="rect" 
href="unix-service.html">Unix Service</a></li><li><a shape="rect" 
href="weblogic-integration.html">WebLogic Integration</a></li><li><a 
shape="rect" href="xmpp.html">XMPP</a></li><li><a shape="rect" 
href="connectivity.html">More ...</a></li></ul><h3 
id="Navigation-UsingActiveMQ5https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=71176";><a
 shape="rect" href="using-activemq-5.html">Using ActiveMQ 5</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="version-5-getting-started.html">Getting Started</a></li><li><a 
shape="rect" href="version-5-initial-configuration.html">Initial Configuration<
 /a></li><li><a shape="rect" href="version-5-run-broker.html">Running a 
Broker</a></li><li><a shape="rect" 
href="how-do-i-embed-a-broker-inside-a-connection.html">Embedded 
Brokers</a></li><li><a shape="rect" 
href="activemq-command-line-tools-reference.html">Command Line 
Tools</a></li><li><a shape="rect" 
href="configuring-version-5-transports.html">Configuring 
Transports</a></li><li><a shape="rect" 
href="version-5-examples.html">Examples</a></li><li><a shape="rect" 
href="version-5-web-samples.html">Web Samples</a></li><li><a shape="rect" 
href="how-can-i-monitor-activemq.html">Monitoring the Broker</a></li><li><a 
shape="rect" href="version-5-xml-configuration.html">Xml 
Configuration</a></li><li><a shape="rect" href="xml-reference.html">Xml 
Reference</a></li><li><a shape="rect" href="using-activemq-5.html">More 
...</a></li></ul><h3 
id="Navigation-Toolshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35912";><a
 shape="rect" href="tools.html">Tools</a></h3><ul class="altern
 ate"><li><a shape="rect" href="web-console.html">Web Console</a></li><li><a 
shape="rect" href="activemq-performance-module-users-manual.html">Maven2 
Performance Plugin</a></li></ul><h3 
id="Navigation-Supporthttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35919";><a
 shape="rect" href="support.html">Support</a></h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/jira/browse/AMQ";>Issues</a></li><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel";>Roadmap</a></li><li><a
 shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel";>Change
 log</a></li></ul><h3 
id="Navigation-Developershttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35903";><a
 shape="rect" href="developers.html">Developers</a></h3><ul 
class="alternate"><li>
 <a shape="rect" href="source.html">Source</a></li><li><a shape="rect" 
href="building.html">Building</a></li><li><a shape="rect" 
href="developer-guide.html">Developer Guide</a></li><li><a shape="rect" 
href="becoming-a-committer.html">Becoming a committer</a></li><li><a 
shape="rect" href="code-overview.html">Code Overview</a></li><li><a 
shape="rect" href="wire-protocol.html">Wire Protocol</a></li><li><a 
shape="rect" href="release-guide.html">Release Guide</a></li></ul><h3 
id="Navigation-Tests">Tests</h3><ul class="alternate"><li><a shape="rect" 
href="activemq-performance-module-users-manual.html">Maven2 Performance 
Plugin</a></li><li><a shape="rect" href="benchmark-tests.html">Benchmark 
Tests</a></li><li><a shape="rect" href="jmeter-system-tests.html">JMeter System 
Tests</a></li><li><a shape="rect" href="jmeter-performance-tests.html">JMeter 
Performance Tests</a></li><li><a shape="rect" 
href="integration-tests.html">Integration Tests</a></li></ul><h3 
id="Navigation-ProjectReports">Pro
 ject Reports</h3><ul class="alternate"><li><a shape="rect" 
href="junit-reports.html">JUnit Reports</a></li><li><a shape="rect" 
href="source-xref.html">Source XRef</a></li><li><a shape="rect" 
href="test-source-xref.html">Test Source XRef</a></li><li><a shape="rect" 
href="xml-reference.html">Xml Reference</a></li></ul>
-              </div>
-            </div>
-          </div>
-        </td>
-        </tr>
-  </tbody>
-        </table>
-        <div class="bottom_red_bar"></div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="black_box">
-<div class="footer">
-  <div class="footer_l">
-    <div class="footer_r">
-      <div>
-        <a href="http://activemq.apache.org/privacy-policy.html";>Privacy 
Policy</a> -
-        (<a 
href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=36045";>edit
 this page</a>)
-      </div>
-    </div>
-  </div>
-</div>
-</div>
-</div>
-<div class="design_attribution">
-&copy; 2004-2011 The Apache Software Foundation.
-<br/>          
-Apache ActiveMQ, ActiveMQ, Apache, the Apache feather logo, and the Apache 
ActiveMQ project logo are trademarks of The Apache Software Foundation.  All 
other marks mentioned may be trademarks or registered trademarks of their 
respective owners.
-<br/>
-<a href="http://hiramchirino.com";>Graphic Design By Hiram</a>
-</div>
 
-<!-- delay the loading of large javascript files to the end so that they don't 
interfere with the loading of page content -->
-<span style="display: none">
-  <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."; 
: "http://www.";);
-    document.write(unescape("%3Cscript src='" + gaJsHost + 
"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  </script>
-  <script type="text/javascript">
-    var pageTracker = _gat._getTracker("UA-1347593-1");
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  </script>
-</span>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/d3c643c7/discovery-transport-reference.html
----------------------------------------------------------------------
diff --git a/discovery-transport-reference.html 
b/discovery-transport-reference.html
index 1d028fc..4086621 100644
--- a/discovery-transport-reference.html
+++ b/discovery-transport-reference.html
@@ -1,85 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-<head>
-    <link href="http://activemq.apache.org/styles/site.css"; rel="stylesheet" 
type="text/css"/>
-    <link href="http://activemq.apache.org/styles/type-settings.css"; 
rel="stylesheet" type="text/css"/>
-    <script src="http://activemq.apache.org/styles/prototype.js"; 
type="text/javascript"></script>
-    <script src="http://activemq.apache.org/styles/rico.js"; 
type="text/javascript"></script>    
-    <script src="http://activemq.apache.org/styles/site.js"; 
type="text/javascript"></script>
-    <style type="text/css">
-      .maincontent { overflow:hidden; }
-    </style>
-    <!--[if IE]>
-    <style type="text/css">
-      .maincontent { width:100%; }
-    </style>
-    <![endif]-->
-
-          <link 
href='http://activemq.apache.org/styles/highlighter/styles/shCore.css' 
rel='stylesheet' type='text/css' /> 
-      <link 
href='http://activemq.apache.org/styles/highlighter/styles/shThemeEclipse.css' 
rel='stylesheet' type='text/css' /> 
-      <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 type="text/javascript"> 
-        SyntaxHighlighter.defaults['toolbar'] = false; 
-        SyntaxHighlighter.all(); 
-      </script> 
-    
-    <title>
-    Apache ActiveMQ &#8482; -- Discovery Transport Reference
-    </title>
-</head>
-<body>
-<div class="white_box">
-<div class="header">
-  <div class="header_l">
-    <div class="header_r">
-    </div>
-  </div>
-</div>
-<div class="content">
-  <div class="content_l">
-    <div class="content_r">
-      <div>
-
-<!-- Banner -->
-<div id="asf_logo">
-       <div id="activemq_logo">
-     <a shape="rect" style="float:left; 
width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:10px; margin-left:100px;" href="http://activemq.apache.org"; 
title="The most popular and powerful open source Message Broker">ActiveMQ</a>
-            <a shape="rect" style="float:right; 
width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:15px; margin-right:10px;" href="http://www.apache.org"; title="The 
Apache Software Foundation">ASF</a>
-       </div>
-</div>
-
-        <div class="top_red_bar">
-          <div id="site-breadcrumbs">
-<a href="using-activemq.html">Using ActiveMQ</a>&nbsp;&gt;&nbsp;<a 
href="configuring-transports.html">Configuring Transports</a>&nbsp;&gt;&nbsp;<a 
href="activemq-connection-uris.html">ActiveMQ Connection 
URIs</a>&nbsp;&gt;&nbsp;<a href="discovery-transport-reference.html">Discovery 
Transport Reference</a>
-          </div>
-          <div id="site-quicklinks">
-<p><a shape="rect" href="download.html">Download</a> | <a shape="rect" 
class="external-link" 
href="http://activemq.apache.org/maven/apidocs/index.html";>JavaDocs</a> <a 
shape="rect" href="javadocs.html">More...</a> | <a shape="rect" 
href="source.html">Source</a> | <a shape="rect" 
href="discussion-forums.html">Forums</a> | <a shape="rect" 
href="support.html">Support</a></p>
-          </div>
-        </div>
-
-  <table border="0">
-  <tbody>
-        <tr>
-        <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h3 
id="DiscoveryTransportReference-TheDiscoveryTransport">The Discovery 
Transport</h3>
 
 <p>The Discovery transport works just like the <a shape="rect" 
href="failover-transport-reference.html">Failover</a> transport, except that it 
uses a discovery agent to locate the list of uri to connect to.  The Discovery 
transport is also used by the <a shape="rect" 
href="fanout-transport-reference.html">Fanout</a> transport for discovering 
brokers to send a fanout message to.</p>
@@ -121,66 +39,4 @@ or<br clear="none">
 
 <div class="confluence-information-macro 
confluence-information-macro-information"><p class="title">Applying parameters 
to discovered transports</p><span class="aui-icon aui-icon-small 
aui-iconfont-info confluence-information-macro-icon"></span><div 
class="confluence-information-macro-body">
 <p>From 5.4, transport parameters in the URI will also be applied to 
discovered transports if they are prefixed with <code>discovered.</code>; For 
example, adding the <code>discovered.connectionTimeout</code> parameter to the 
URI will apply the parameter to every discovered <a shape="rect" 
href="tcp-transport-reference.html">TCP</a> transport, even though this 
parameter is not a Discovery transport option.</p></div></div></div>
-        </td>
-        <td valign="top">
-          <div class="navigation">
-            <div class="navigation_top">
-              <div class="navigation_bottom">
-<h3 
id="Navigation-Overviewhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35985";><a
 shape="rect" href="overview.html">Overview</a></h3><ul 
class="alternate"><li><a shape="rect" href="index.html">Index</a></li><li><a 
shape="rect" href="news.html">News</a></li><li><a shape="rect" 
href="new-features.html">New Features</a></li><li><a shape="rect" 
href="getting-started.html">Getting Started</a></li><li><a shape="rect" 
href="faq.html">FAQ</a></li><li><a shape="rect" 
href="articles.html">Articles</a></li><li><a shape="rect" 
href="books.html">Books</a></li><li><a shape="rect" 
href="download.html">Download</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/licenses/";>License</a></li></ul><h3 
id="Navigation-Search">Search</h3><div>
-<form enctype="application/x-www-form-urlencoded" method="get" 
action="http://www.google.com/search"; style="font-size: 10px;">
-<input type="hidden" name="ie" value="UTF-8">
-<input type="hidden" name="oe" value="UTF-8">
-  <input maxlength="255" type="text" name="q" size="15" value="value"><br 
clear="none">
-  <input type="submit" name="btnG" value="Search">
-  <input type="hidden" name="domains" value="activemq.apache.org">
-  <input type="hidden" name="sitesearch" value="activemq.apache.org">
-</form>
-</div>
-<h3 id="Navigation-SubProjects">Sub Projects</h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://activemq.apache.org/artemis/";>Artemis</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/apollo"; title="ActiveMQ 
Apollo">Apollo</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/"; title="NMS is the 
.Net Messaging API">NMS</a></li></ul><h3 
id="Navigation-Communityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36130";><a
 shape="rect" href="community.html">Community</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="support.html">Support</a></li><li><a shape="rect" 
href="contributing.html">Contributing</a></li><li><a shape="rect" 
href="discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" 
href="mailing-lists.html">Mailing Lists</a></li><li><a shape="rect" href="irc.
 html">IRC</a></li><li><a shape="rect" class="external-link" 
href="http://javabot.evanchooly.com/logs/%23apache-activemq/today"; 
rel="nofollow">IRC Log</a></li><li><a shape="rect" 
href="security-advisories.html">Security Advisories</a></li><li><a shape="rect" 
href="site.html">Site</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 shape="rect" href="projects-using-activemq.html">Projects Using 
ActiveMQ</a></li><li><a shape="rect" href="users.html">Users</a></li><li><a 
shape="rect" href="team.html">Team</a></li><li><a shape="rect" 
href="thanks.html">Thanks</a></li></ul><h3 
id="Navigation-Featureshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35883";><a
 shape="rect" href="features.html">Features</a></h3><ul 
class="alternate"><li><a shape="rect" href="advisory-message.html">Advisory 
Message</a></li><li><a shape="rect" 
href="clustering.html">Clustering</a></li><li><a shape="rect" href="cros
 s-language-clients.html">Cross Language Clients</a></li><li><a shape="rect" 
href="enterprise-integration-patterns.html">Enterprise Integration 
Patterns</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a 
shape="rect" href="jms-to-jms-bridge.html">JMS to JMS Bridge</a></li><li><a 
shape="rect" href="masterslave.html">MasterSlave</a></li><li><a shape="rect" 
href="message-groups.html">Message Groups</a></li><li><a shape="rect" 
href="networks-of-brokers.html">Networks of Brokers</a></li><li><a shape="rect" 
href="performance.html">Performance</a></li><li><a shape="rect" 
href="persistence.html">Persistence</a></li><li><a shape="rect" 
href="security.html">Security</a></li><li><a shape="rect" 
href="virtual-destinations.html">Virtual Destinations</a></li><li><a 
shape="rect" href="visualisation.html">Visualisation</a></li><li><a 
shape="rect" href="features.html">More ...</a></li></ul><h3 
id="Navigation-Connectivityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=3616
 7"><a shape="rect" href="connectivity.html">Connectivity</a></h3><ul 
class="alternate"><li><a shape="rect" href="ajax.html">Ajax</a></li><li><a 
shape="rect" href="amqp.html">AMQP</a></li><li><a shape="rect" 
href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a 
shape="rect" href="c-integration.html">C Integration</a></li><li><a 
shape="rect" href="activemq-c-clients.html">C++</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/";>C# and .Net 
Integration</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
href="j2ee.html">J2EE</a></li><li><a shape="rect" 
href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" 
class="external-link" 
href="http://docs.codehaus.org/display/JETTY/Integrating+with+ActiveMQ"; 
rel="nofollow">Jetty</a></li><li><a shape="rect" href="jndi-support.html">JNDI 
Support</a></li><li><a shape="rect" class="external-link" href="http://a
 ctivemq.apache.org/nms/" title="NMS is the .Net Messaging 
API">NMS</a></li><li><a shape="rect" href="rest.html">REST</a></li><li><a 
shape="rect" href="rss-and-atom.html">RSS and Atom</a></li><li><a shape="rect" 
href="spring-support.html">Spring Support</a></li><li><a shape="rect" 
href="stomp.html">Stomp</a></li><li><a shape="rect" 
href="tomcat.html">Tomcat</a></li><li><a shape="rect" 
href="unix-service.html">Unix Service</a></li><li><a shape="rect" 
href="weblogic-integration.html">WebLogic Integration</a></li><li><a 
shape="rect" href="xmpp.html">XMPP</a></li><li><a shape="rect" 
href="connectivity.html">More ...</a></li></ul><h3 
id="Navigation-UsingActiveMQ5https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=71176";><a
 shape="rect" href="using-activemq-5.html">Using ActiveMQ 5</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="version-5-getting-started.html">Getting Started</a></li><li><a 
shape="rect" href="version-5-initial-configuration.html">Initial Configuration<
 /a></li><li><a shape="rect" href="version-5-run-broker.html">Running a 
Broker</a></li><li><a shape="rect" 
href="how-do-i-embed-a-broker-inside-a-connection.html">Embedded 
Brokers</a></li><li><a shape="rect" 
href="activemq-command-line-tools-reference.html">Command Line 
Tools</a></li><li><a shape="rect" 
href="configuring-version-5-transports.html">Configuring 
Transports</a></li><li><a shape="rect" 
href="version-5-examples.html">Examples</a></li><li><a shape="rect" 
href="version-5-web-samples.html">Web Samples</a></li><li><a shape="rect" 
href="how-can-i-monitor-activemq.html">Monitoring the Broker</a></li><li><a 
shape="rect" href="version-5-xml-configuration.html">Xml 
Configuration</a></li><li><a shape="rect" href="xml-reference.html">Xml 
Reference</a></li><li><a shape="rect" href="using-activemq-5.html">More 
...</a></li></ul><h3 
id="Navigation-Toolshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35912";><a
 shape="rect" href="tools.html">Tools</a></h3><ul class="altern
 ate"><li><a shape="rect" href="web-console.html">Web Console</a></li><li><a 
shape="rect" href="activemq-performance-module-users-manual.html">Maven2 
Performance Plugin</a></li></ul><h3 
id="Navigation-Supporthttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35919";><a
 shape="rect" href="support.html">Support</a></h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/jira/browse/AMQ";>Issues</a></li><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel";>Roadmap</a></li><li><a
 shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel";>Change
 log</a></li></ul><h3 
id="Navigation-Developershttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35903";><a
 shape="rect" href="developers.html">Developers</a></h3><ul 
class="alternate"><li>
 <a shape="rect" href="source.html">Source</a></li><li><a shape="rect" 
href="building.html">Building</a></li><li><a shape="rect" 
href="developer-guide.html">Developer Guide</a></li><li><a shape="rect" 
href="becoming-a-committer.html">Becoming a committer</a></li><li><a 
shape="rect" href="code-overview.html">Code Overview</a></li><li><a 
shape="rect" href="wire-protocol.html">Wire Protocol</a></li><li><a 
shape="rect" href="release-guide.html">Release Guide</a></li></ul><h3 
id="Navigation-Tests">Tests</h3><ul class="alternate"><li><a shape="rect" 
href="activemq-performance-module-users-manual.html">Maven2 Performance 
Plugin</a></li><li><a shape="rect" href="benchmark-tests.html">Benchmark 
Tests</a></li><li><a shape="rect" href="jmeter-system-tests.html">JMeter System 
Tests</a></li><li><a shape="rect" href="jmeter-performance-tests.html">JMeter 
Performance Tests</a></li><li><a shape="rect" 
href="integration-tests.html">Integration Tests</a></li></ul><h3 
id="Navigation-ProjectReports">Pro
 ject Reports</h3><ul class="alternate"><li><a shape="rect" 
href="junit-reports.html">JUnit Reports</a></li><li><a shape="rect" 
href="source-xref.html">Source XRef</a></li><li><a shape="rect" 
href="test-source-xref.html">Test Source XRef</a></li><li><a shape="rect" 
href="xml-reference.html">Xml Reference</a></li></ul>
-              </div>
-            </div>
-          </div>
-        </td>
-        </tr>
-  </tbody>
-        </table>
-        <div class="bottom_red_bar"></div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="black_box">
-<div class="footer">
-  <div class="footer_l">
-    <div class="footer_r">
-      <div>
-        <a href="http://activemq.apache.org/privacy-policy.html";>Privacy 
Policy</a> -
-        (<a 
href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=36048";>edit
 this page</a>)
-      </div>
-    </div>
-  </div>
-</div>
-</div>
-</div>
-<div class="design_attribution">
-&copy; 2004-2011 The Apache Software Foundation.
-<br/>          
-Apache ActiveMQ, ActiveMQ, Apache, the Apache feather logo, and the Apache 
ActiveMQ project logo are trademarks of The Apache Software Foundation.  All 
other marks mentioned may be trademarks or registered trademarks of their 
respective owners.
-<br/>
-<a href="http://hiramchirino.com";>Graphic Design By Hiram</a>
-</div>
 
-<!-- delay the loading of large javascript files to the end so that they don't 
interfere with the loading of page content -->
-<span style="display: none">
-  <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."; 
: "http://www.";);
-    document.write(unescape("%3Cscript src='" + gaJsHost + 
"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  </script>
-  <script type="text/javascript">
-    var pageTracker = _gat._getTracker("UA-1347593-1");
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  </script>
-</span>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/d3c643c7/discovery.html
----------------------------------------------------------------------
diff --git a/discovery.html b/discovery.html
index c6f9afb..3f31c29 100644
--- a/discovery.html
+++ b/discovery.html
@@ -1,85 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-<head>
-    <link href="http://activemq.apache.org/styles/site.css"; rel="stylesheet" 
type="text/css"/>
-    <link href="http://activemq.apache.org/styles/type-settings.css"; 
rel="stylesheet" type="text/css"/>
-    <script src="http://activemq.apache.org/styles/prototype.js"; 
type="text/javascript"></script>
-    <script src="http://activemq.apache.org/styles/rico.js"; 
type="text/javascript"></script>    
-    <script src="http://activemq.apache.org/styles/site.js"; 
type="text/javascript"></script>
-    <style type="text/css">
-      .maincontent { overflow:hidden; }
-    </style>
-    <!--[if IE]>
-    <style type="text/css">
-      .maincontent { width:100%; }
-    </style>
-    <![endif]-->
-
-          <link 
href='http://activemq.apache.org/styles/highlighter/styles/shCore.css' 
rel='stylesheet' type='text/css' /> 
-      <link 
href='http://activemq.apache.org/styles/highlighter/styles/shThemeEclipse.css' 
rel='stylesheet' type='text/css' /> 
-      <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 type="text/javascript"> 
-        SyntaxHighlighter.defaults['toolbar'] = false; 
-        SyntaxHighlighter.all(); 
-      </script> 
-    
-    <title>
-    Apache ActiveMQ &#8482; -- Discovery
-    </title>
-</head>
-<body>
-<div class="white_box">
-<div class="header">
-  <div class="header_l">
-    <div class="header_r">
-    </div>
-  </div>
-</div>
-<div class="content">
-  <div class="content_l">
-    <div class="content_r">
-      <div>
-
-<!-- Banner -->
-<div id="asf_logo">
-       <div id="activemq_logo">
-     <a shape="rect" style="float:left; 
width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:10px; margin-left:100px;" href="http://activemq.apache.org"; 
title="The most popular and powerful open source Message Broker">ActiveMQ</a>
-            <a shape="rect" style="float:right; 
width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:15px; margin-right:10px;" href="http://www.apache.org"; title="The 
Apache Software Foundation">ASF</a>
-       </div>
-</div>
-
-        <div class="top_red_bar">
-          <div id="site-breadcrumbs">
-<a href="features.html">Features</a>&nbsp;&gt;&nbsp;<a 
href="discovery.html">Discovery</a>
-          </div>
-          <div id="site-quicklinks">
-<p><a shape="rect" href="download.html">Download</a> | <a shape="rect" 
class="external-link" 
href="http://activemq.apache.org/maven/apidocs/index.html";>JavaDocs</a> <a 
shape="rect" href="javadocs.html">More...</a> | <a shape="rect" 
href="source.html">Source</a> | <a shape="rect" 
href="discussion-forums.html">Forums</a> | <a shape="rect" 
href="support.html">Support</a></p>
-          </div>
-        </div>
-
-  <table border="0">
-  <tbody>
-        <tr>
-        <td valign="top" width="100%">
 <div class="wiki-content maincontent"><h2 
id="Discovery-DiscoveryAgents">Discovery Agents</h2><p>ActiveMQ uses an 
abstraction called a <a shape="rect" class="external-link" 
href="http://actievmq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/transport/discovery/DiscoveryAgent.html";>Discovery
 Agent</a> to detect remote services such as remote brokers. We can use 
discovery for JMS clients to auto-detect a Message Broker to connect to, or to 
provide <a shape="rect" href="networks-of-brokers.html">Networks of 
Brokers</a></p><p>There are currently two kinds of discovery agent.</p><h3 
id="Discovery-Multicast">Multicast</h3><p>The Discovery transport uses our own 
Multicast based discovery agent to locate the list of URIs to connect 
to.</p><p>For more information see the <a shape="rect" 
href="discovery-transport-reference.html">Discovery Transport 
Reference</a>.</p><h3 id="Discovery-Zeroconf">Zeroconf</h3><p><a shape="rect" 
href="zeroconf.html">ZeroConf</a> is a standard discove
 ry specification that uses UDP / multicast to discovery devices. Its used by 
Apple's Rendezvous services.<br clear="none"> We use the <a shape="rect" 
class="external-link" href="http://jmdns.sf.net/"; rel="nofollow">jmDNS</a> 
project to implement the Zeroconf specification to detect services. This means 
other Zeroconf<br clear="none"> based tools can be used in conjunction with 
this discovery agent.</p><p>To configure discovery in a Broker you should use 
the <a shape="rect" href="xml-configuration.html">Xml Configuration</a>. Here 
is an <a shape="rect" class="external-link" 
href="http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml?view=co";>example</a>
 of using discovery to create <a shape="rect" 
href="networks-of-brokers.html">Networks of Brokers</a>.</p><p>If you have one 
or more brokers running with Zeroconf discovery enabled you can connect to a 
broker using the brokerURL</p><div class="code panel pd
 l" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" 
style="font-size:12px;">zeroconf:_activemq_development.
 </pre>
@@ -97,66 +15,4 @@ maven -o producer  
-Durl=zeroconf:_activemq.broker.development.
 <pre class="brush: java; gutter: false; theme: Default" 
style="font-size:12px;">    zeroconf:&lt;serviceName&gt;
 </pre>
 </div></div><p>where <em>&lt;serviceName&gt;</em> is the Zeroconf service 
name; which seems to start with an underscore (_) and must end with a dot (.). 
So we can use this service name to distinguish development, UAT &amp; 
production brokers - or group them into domains etc.</p><h2 
id="Discovery-DiscoveryandSecurity">Discovery and Security</h2><p>When using 
auto discovery of brokers an attacker may be able to present itself as a 
legitimate broker and by this way catch and / or manipulate all messages that 
run over it.</p><p>Are there security settings in auto discovery to avoid 
this?</p></div>
-        </td>
-        <td valign="top">
-          <div class="navigation">
-            <div class="navigation_top">
-              <div class="navigation_bottom">
-<h3 
id="Navigation-Overviewhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35985";><a
 shape="rect" href="overview.html">Overview</a></h3><ul 
class="alternate"><li><a shape="rect" href="index.html">Index</a></li><li><a 
shape="rect" href="news.html">News</a></li><li><a shape="rect" 
href="new-features.html">New Features</a></li><li><a shape="rect" 
href="getting-started.html">Getting Started</a></li><li><a shape="rect" 
href="faq.html">FAQ</a></li><li><a shape="rect" 
href="articles.html">Articles</a></li><li><a shape="rect" 
href="books.html">Books</a></li><li><a shape="rect" 
href="download.html">Download</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/licenses/";>License</a></li></ul><h3 
id="Navigation-Search">Search</h3><div>
-<form enctype="application/x-www-form-urlencoded" method="get" 
action="http://www.google.com/search"; style="font-size: 10px;">
-<input type="hidden" name="ie" value="UTF-8">
-<input type="hidden" name="oe" value="UTF-8">
-  <input maxlength="255" type="text" name="q" size="15" value="value"><br 
clear="none">
-  <input type="submit" name="btnG" value="Search">
-  <input type="hidden" name="domains" value="activemq.apache.org">
-  <input type="hidden" name="sitesearch" value="activemq.apache.org">
-</form>
-</div>
-<h3 id="Navigation-SubProjects">Sub Projects</h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://activemq.apache.org/artemis/";>Artemis</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/apollo"; title="ActiveMQ 
Apollo">Apollo</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/"; title="NMS is the 
.Net Messaging API">NMS</a></li></ul><h3 
id="Navigation-Communityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36130";><a
 shape="rect" href="community.html">Community</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="support.html">Support</a></li><li><a shape="rect" 
href="contributing.html">Contributing</a></li><li><a shape="rect" 
href="discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" 
href="mailing-lists.html">Mailing Lists</a></li><li><a shape="rect" href="irc.
 html">IRC</a></li><li><a shape="rect" class="external-link" 
href="http://javabot.evanchooly.com/logs/%23apache-activemq/today"; 
rel="nofollow">IRC Log</a></li><li><a shape="rect" 
href="security-advisories.html">Security Advisories</a></li><li><a shape="rect" 
href="site.html">Site</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 shape="rect" href="projects-using-activemq.html">Projects Using 
ActiveMQ</a></li><li><a shape="rect" href="users.html">Users</a></li><li><a 
shape="rect" href="team.html">Team</a></li><li><a shape="rect" 
href="thanks.html">Thanks</a></li></ul><h3 
id="Navigation-Featureshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35883";><a
 shape="rect" href="features.html">Features</a></h3><ul 
class="alternate"><li><a shape="rect" href="advisory-message.html">Advisory 
Message</a></li><li><a shape="rect" 
href="clustering.html">Clustering</a></li><li><a shape="rect" href="cros
 s-language-clients.html">Cross Language Clients</a></li><li><a shape="rect" 
href="enterprise-integration-patterns.html">Enterprise Integration 
Patterns</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a 
shape="rect" href="jms-to-jms-bridge.html">JMS to JMS Bridge</a></li><li><a 
shape="rect" href="masterslave.html">MasterSlave</a></li><li><a shape="rect" 
href="message-groups.html">Message Groups</a></li><li><a shape="rect" 
href="networks-of-brokers.html">Networks of Brokers</a></li><li><a shape="rect" 
href="performance.html">Performance</a></li><li><a shape="rect" 
href="persistence.html">Persistence</a></li><li><a shape="rect" 
href="security.html">Security</a></li><li><a shape="rect" 
href="virtual-destinations.html">Virtual Destinations</a></li><li><a 
shape="rect" href="visualisation.html">Visualisation</a></li><li><a 
shape="rect" href="features.html">More ...</a></li></ul><h3 
id="Navigation-Connectivityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=3616
 7"><a shape="rect" href="connectivity.html">Connectivity</a></h3><ul 
class="alternate"><li><a shape="rect" href="ajax.html">Ajax</a></li><li><a 
shape="rect" href="amqp.html">AMQP</a></li><li><a shape="rect" 
href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a 
shape="rect" href="c-integration.html">C Integration</a></li><li><a 
shape="rect" href="activemq-c-clients.html">C++</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/";>C# and .Net 
Integration</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
href="j2ee.html">J2EE</a></li><li><a shape="rect" 
href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" 
class="external-link" 
href="http://docs.codehaus.org/display/JETTY/Integrating+with+ActiveMQ"; 
rel="nofollow">Jetty</a></li><li><a shape="rect" href="jndi-support.html">JNDI 
Support</a></li><li><a shape="rect" class="external-link" href="http://a
 ctivemq.apache.org/nms/" title="NMS is the .Net Messaging 
API">NMS</a></li><li><a shape="rect" href="rest.html">REST</a></li><li><a 
shape="rect" href="rss-and-atom.html">RSS and Atom</a></li><li><a shape="rect" 
href="spring-support.html">Spring Support</a></li><li><a shape="rect" 
href="stomp.html">Stomp</a></li><li><a shape="rect" 
href="tomcat.html">Tomcat</a></li><li><a shape="rect" 
href="unix-service.html">Unix Service</a></li><li><a shape="rect" 
href="weblogic-integration.html">WebLogic Integration</a></li><li><a 
shape="rect" href="xmpp.html">XMPP</a></li><li><a shape="rect" 
href="connectivity.html">More ...</a></li></ul><h3 
id="Navigation-UsingActiveMQ5https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=71176";><a
 shape="rect" href="using-activemq-5.html">Using ActiveMQ 5</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="version-5-getting-started.html">Getting Started</a></li><li><a 
shape="rect" href="version-5-initial-configuration.html">Initial Configuration<
 /a></li><li><a shape="rect" href="version-5-run-broker.html">Running a 
Broker</a></li><li><a shape="rect" 
href="how-do-i-embed-a-broker-inside-a-connection.html">Embedded 
Brokers</a></li><li><a shape="rect" 
href="activemq-command-line-tools-reference.html">Command Line 
Tools</a></li><li><a shape="rect" 
href="configuring-version-5-transports.html">Configuring 
Transports</a></li><li><a shape="rect" 
href="version-5-examples.html">Examples</a></li><li><a shape="rect" 
href="version-5-web-samples.html">Web Samples</a></li><li><a shape="rect" 
href="how-can-i-monitor-activemq.html">Monitoring the Broker</a></li><li><a 
shape="rect" href="version-5-xml-configuration.html">Xml 
Configuration</a></li><li><a shape="rect" href="xml-reference.html">Xml 
Reference</a></li><li><a shape="rect" href="using-activemq-5.html">More 
...</a></li></ul><h3 
id="Navigation-Toolshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35912";><a
 shape="rect" href="tools.html">Tools</a></h3><ul class="altern
 ate"><li><a shape="rect" href="web-console.html">Web Console</a></li><li><a 
shape="rect" href="activemq-performance-module-users-manual.html">Maven2 
Performance Plugin</a></li></ul><h3 
id="Navigation-Supporthttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35919";><a
 shape="rect" href="support.html">Support</a></h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/jira/browse/AMQ";>Issues</a></li><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel";>Roadmap</a></li><li><a
 shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel";>Change
 log</a></li></ul><h3 
id="Navigation-Developershttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35903";><a
 shape="rect" href="developers.html">Developers</a></h3><ul 
class="alternate"><li>
 <a shape="rect" href="source.html">Source</a></li><li><a shape="rect" 
href="building.html">Building</a></li><li><a shape="rect" 
href="developer-guide.html">Developer Guide</a></li><li><a shape="rect" 
href="becoming-a-committer.html">Becoming a committer</a></li><li><a 
shape="rect" href="code-overview.html">Code Overview</a></li><li><a 
shape="rect" href="wire-protocol.html">Wire Protocol</a></li><li><a 
shape="rect" href="release-guide.html">Release Guide</a></li></ul><h3 
id="Navigation-Tests">Tests</h3><ul class="alternate"><li><a shape="rect" 
href="activemq-performance-module-users-manual.html">Maven2 Performance 
Plugin</a></li><li><a shape="rect" href="benchmark-tests.html">Benchmark 
Tests</a></li><li><a shape="rect" href="jmeter-system-tests.html">JMeter System 
Tests</a></li><li><a shape="rect" href="jmeter-performance-tests.html">JMeter 
Performance Tests</a></li><li><a shape="rect" 
href="integration-tests.html">Integration Tests</a></li></ul><h3 
id="Navigation-ProjectReports">Pro
 ject Reports</h3><ul class="alternate"><li><a shape="rect" 
href="junit-reports.html">JUnit Reports</a></li><li><a shape="rect" 
href="source-xref.html">Source XRef</a></li><li><a shape="rect" 
href="test-source-xref.html">Test Source XRef</a></li><li><a shape="rect" 
href="xml-reference.html">Xml Reference</a></li></ul>
-              </div>
-            </div>
-          </div>
-        </td>
-        </tr>
-  </tbody>
-        </table>
-        <div class="bottom_red_bar"></div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="black_box">
-<div class="footer">
-  <div class="footer_l">
-    <div class="footer_r">
-      <div>
-        <a href="http://activemq.apache.org/privacy-policy.html";>Privacy 
Policy</a> -
-        (<a 
href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=36212";>edit
 this page</a>)
-      </div>
-    </div>
-  </div>
-</div>
-</div>
-</div>
-<div class="design_attribution">
-&copy; 2004-2011 The Apache Software Foundation.
-<br/>          
-Apache ActiveMQ, ActiveMQ, Apache, the Apache feather logo, and the Apache 
ActiveMQ project logo are trademarks of The Apache Software Foundation.  All 
other marks mentioned may be trademarks or registered trademarks of their 
respective owners.
-<br/>
-<a href="http://hiramchirino.com";>Graphic Design By Hiram</a>
-</div>
 
-<!-- delay the loading of large javascript files to the end so that they don't 
interfere with the loading of page content -->
-<span style="display: none">
-  <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."; 
: "http://www.";);
-    document.write(unescape("%3Cscript src='" + gaJsHost + 
"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  </script>
-  <script type="text/javascript">
-    var pageTracker = _gat._getTracker("UA-1347593-1");
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  </script>
-</span>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/activemq-web/blob/d3c643c7/discussion-forums.html
----------------------------------------------------------------------
diff --git a/discussion-forums.html b/discussion-forums.html
index 7b436ac..d25c80d 100644
--- a/discussion-forums.html
+++ b/discussion-forums.html
@@ -1,76 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-<head>
-    <link href="http://activemq.apache.org/styles/site.css"; rel="stylesheet" 
type="text/css"/>
-    <link href="http://activemq.apache.org/styles/type-settings.css"; 
rel="stylesheet" type="text/css"/>
-    <script src="http://activemq.apache.org/styles/prototype.js"; 
type="text/javascript"></script>
-    <script src="http://activemq.apache.org/styles/rico.js"; 
type="text/javascript"></script>    
-    <script src="http://activemq.apache.org/styles/site.js"; 
type="text/javascript"></script>
-    <style type="text/css">
-      .maincontent { overflow:hidden; }
-    </style>
-    <!--[if IE]>
-    <style type="text/css">
-      .maincontent { width:100%; }
-    </style>
-    <![endif]-->
-
-    
-    <title>
-    Apache ActiveMQ &#8482; -- Discussion Forums
-    </title>
-</head>
-<body>
-<div class="white_box">
-<div class="header">
-  <div class="header_l">
-    <div class="header_r">
-    </div>
-  </div>
-</div>
-<div class="content">
-  <div class="content_l">
-    <div class="content_r">
-      <div>
-
-<!-- Banner -->
-<div id="asf_logo">
-       <div id="activemq_logo">
-     <a shape="rect" style="float:left; 
width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:10px; margin-left:100px;" href="http://activemq.apache.org"; 
title="The most popular and powerful open source Message Broker">ActiveMQ</a>
-            <a shape="rect" style="float:right; 
width:210px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px;
 margin-top:15px; margin-right:10px;" href="http://www.apache.org"; title="The 
Apache Software Foundation">ASF</a>
-       </div>
-</div>
-
-        <div class="top_red_bar">
-          <div id="site-breadcrumbs">
-<a href="community.html">Community</a>&nbsp;&gt;&nbsp;<a 
href="discussion-forums.html">Discussion Forums</a>
-          </div>
-          <div id="site-quicklinks">
-<p><a shape="rect" href="download.html">Download</a> | <a shape="rect" 
class="external-link" 
href="http://activemq.apache.org/maven/apidocs/index.html";>JavaDocs</a> <a 
shape="rect" href="javadocs.html">More...</a> | <a shape="rect" 
href="source.html">Source</a> | <a shape="rect" 
href="discussion-forums.html">Forums</a> | <a shape="rect" 
href="support.html">Support</a></p>
-          </div>
-        </div>
-
-  <table border="0">
-  <tbody>
-        <tr>
-        <td valign="top" width="100%">
 <div class="wiki-content maincontent"><p>Before posting you might want to read 
the <a shape="rect" href="tips-for-getting-help.html">Tips for getting 
help</a>.</p>
 
 <p>Many users prefer to use online forums rather than joining a mail list 
which can lead to lots more email traffic so we use the online forums at <a 
shape="rect" class="external-link" 
href="http://activemq.2283324.n4.nabble.com/"; rel="nofollow">Nabble forums</a> 
which also work with our <a shape="rect" href="mailing-lists.html">Mailing 
Lists</a> so that both stay completely in sync. Use either the mailing lists or 
online forums, its completely up to you.</p>
@@ -83,66 +10,4 @@
 <h3 id="DiscussionForums-MailingLists">Mailing Lists</h3>
 
 <p>If you prefer to use a mailing list instead then check out our <a 
shape="rect" href="mailing-lists.html">Mailing Lists</a>. Note that the Forums 
and <a shape="rect" href="mailing-lists.html">Mailing Lists</a> are kept in 
sync so its your choice which you use.</p></div>
-        </td>
-        <td valign="top">
-          <div class="navigation">
-            <div class="navigation_top">
-              <div class="navigation_bottom">
-<h3 
id="Navigation-Overviewhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35985";><a
 shape="rect" href="overview.html">Overview</a></h3><ul 
class="alternate"><li><a shape="rect" href="index.html">Index</a></li><li><a 
shape="rect" href="news.html">News</a></li><li><a shape="rect" 
href="new-features.html">New Features</a></li><li><a shape="rect" 
href="getting-started.html">Getting Started</a></li><li><a shape="rect" 
href="faq.html">FAQ</a></li><li><a shape="rect" 
href="articles.html">Articles</a></li><li><a shape="rect" 
href="books.html">Books</a></li><li><a shape="rect" 
href="download.html">Download</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/licenses/";>License</a></li></ul><h3 
id="Navigation-Search">Search</h3><div>
-<form enctype="application/x-www-form-urlencoded" method="get" 
action="http://www.google.com/search"; style="font-size: 10px;">
-<input type="hidden" name="ie" value="UTF-8">
-<input type="hidden" name="oe" value="UTF-8">
-  <input maxlength="255" type="text" name="q" size="15" value="value"><br 
clear="none">
-  <input type="submit" name="btnG" value="Search">
-  <input type="hidden" name="domains" value="activemq.apache.org">
-  <input type="hidden" name="sitesearch" value="activemq.apache.org">
-</form>
-</div>
-<h3 id="Navigation-SubProjects">Sub Projects</h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://activemq.apache.org/artemis/";>Artemis</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/apollo"; title="ActiveMQ 
Apollo">Apollo</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/"; title="NMS is the 
.Net Messaging API">NMS</a></li></ul><h3 
id="Navigation-Communityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36130";><a
 shape="rect" href="community.html">Community</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="support.html">Support</a></li><li><a shape="rect" 
href="contributing.html">Contributing</a></li><li><a shape="rect" 
href="discussion-forums.html">Discussion Forums</a></li><li><a shape="rect" 
href="mailing-lists.html">Mailing Lists</a></li><li><a shape="rect" href="irc.
 html">IRC</a></li><li><a shape="rect" class="external-link" 
href="http://javabot.evanchooly.com/logs/%23apache-activemq/today"; 
rel="nofollow">IRC Log</a></li><li><a shape="rect" 
href="security-advisories.html">Security Advisories</a></li><li><a shape="rect" 
href="site.html">Site</a></li><li><a shape="rect" class="external-link" 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 shape="rect" href="projects-using-activemq.html">Projects Using 
ActiveMQ</a></li><li><a shape="rect" href="users.html">Users</a></li><li><a 
shape="rect" href="team.html">Team</a></li><li><a shape="rect" 
href="thanks.html">Thanks</a></li></ul><h3 
id="Navigation-Featureshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35883";><a
 shape="rect" href="features.html">Features</a></h3><ul 
class="alternate"><li><a shape="rect" href="advisory-message.html">Advisory 
Message</a></li><li><a shape="rect" 
href="clustering.html">Clustering</a></li><li><a shape="rect" href="cros
 s-language-clients.html">Cross Language Clients</a></li><li><a shape="rect" 
href="enterprise-integration-patterns.html">Enterprise Integration 
Patterns</a></li><li><a shape="rect" href="jmx.html">JMX</a></li><li><a 
shape="rect" href="jms-to-jms-bridge.html">JMS to JMS Bridge</a></li><li><a 
shape="rect" href="masterslave.html">MasterSlave</a></li><li><a shape="rect" 
href="message-groups.html">Message Groups</a></li><li><a shape="rect" 
href="networks-of-brokers.html">Networks of Brokers</a></li><li><a shape="rect" 
href="performance.html">Performance</a></li><li><a shape="rect" 
href="persistence.html">Persistence</a></li><li><a shape="rect" 
href="security.html">Security</a></li><li><a shape="rect" 
href="virtual-destinations.html">Virtual Destinations</a></li><li><a 
shape="rect" href="visualisation.html">Visualisation</a></li><li><a 
shape="rect" href="features.html">More ...</a></li></ul><h3 
id="Navigation-Connectivityhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=3616
 7"><a shape="rect" href="connectivity.html">Connectivity</a></h3><ul 
class="alternate"><li><a shape="rect" href="ajax.html">Ajax</a></li><li><a 
shape="rect" href="amqp.html">AMQP</a></li><li><a shape="rect" 
href="axis-and-cxf-support.html">Axis and CXF Support</a></li><li><a 
shape="rect" href="c-integration.html">C Integration</a></li><li><a 
shape="rect" href="activemq-c-clients.html">C++</a></li><li><a shape="rect" 
class="external-link" href="http://activemq.apache.org/nms/";>C# and .Net 
Integration</a></li><li><a shape="rect" class="external-link" 
href="http://activemq.apache.org/cms/";>CMS</a></li><li><a shape="rect" 
href="j2ee.html">J2EE</a></li><li><a shape="rect" 
href="jboss-integration.html">JBoss Integration</a></li><li><a shape="rect" 
class="external-link" 
href="http://docs.codehaus.org/display/JETTY/Integrating+with+ActiveMQ"; 
rel="nofollow">Jetty</a></li><li><a shape="rect" href="jndi-support.html">JNDI 
Support</a></li><li><a shape="rect" class="external-link" href="http://a
 ctivemq.apache.org/nms/" title="NMS is the .Net Messaging 
API">NMS</a></li><li><a shape="rect" href="rest.html">REST</a></li><li><a 
shape="rect" href="rss-and-atom.html">RSS and Atom</a></li><li><a shape="rect" 
href="spring-support.html">Spring Support</a></li><li><a shape="rect" 
href="stomp.html">Stomp</a></li><li><a shape="rect" 
href="tomcat.html">Tomcat</a></li><li><a shape="rect" 
href="unix-service.html">Unix Service</a></li><li><a shape="rect" 
href="weblogic-integration.html">WebLogic Integration</a></li><li><a 
shape="rect" href="xmpp.html">XMPP</a></li><li><a shape="rect" 
href="connectivity.html">More ...</a></li></ul><h3 
id="Navigation-UsingActiveMQ5https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=71176";><a
 shape="rect" href="using-activemq-5.html">Using ActiveMQ 5</a></h3><ul 
class="alternate"><li><a shape="rect" 
href="version-5-getting-started.html">Getting Started</a></li><li><a 
shape="rect" href="version-5-initial-configuration.html">Initial Configuration<
 /a></li><li><a shape="rect" href="version-5-run-broker.html">Running a 
Broker</a></li><li><a shape="rect" 
href="how-do-i-embed-a-broker-inside-a-connection.html">Embedded 
Brokers</a></li><li><a shape="rect" 
href="activemq-command-line-tools-reference.html">Command Line 
Tools</a></li><li><a shape="rect" 
href="configuring-version-5-transports.html">Configuring 
Transports</a></li><li><a shape="rect" 
href="version-5-examples.html">Examples</a></li><li><a shape="rect" 
href="version-5-web-samples.html">Web Samples</a></li><li><a shape="rect" 
href="how-can-i-monitor-activemq.html">Monitoring the Broker</a></li><li><a 
shape="rect" href="version-5-xml-configuration.html">Xml 
Configuration</a></li><li><a shape="rect" href="xml-reference.html">Xml 
Reference</a></li><li><a shape="rect" href="using-activemq-5.html">More 
...</a></li></ul><h3 
id="Navigation-Toolshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35912";><a
 shape="rect" href="tools.html">Tools</a></h3><ul class="altern
 ate"><li><a shape="rect" href="web-console.html">Web Console</a></li><li><a 
shape="rect" href="activemq-performance-module-users-manual.html">Maven2 
Performance Plugin</a></li></ul><h3 
id="Navigation-Supporthttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35919";><a
 shape="rect" href="support.html">Support</a></h3><ul class="alternate"><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/jira/browse/AMQ";>Issues</a></li><li><a 
shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel";>Roadmap</a></li><li><a
 shape="rect" class="external-link" 
href="http://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel";>Change
 log</a></li></ul><h3 
id="Navigation-Developershttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35903";><a
 shape="rect" href="developers.html">Developers</a></h3><ul 
class="alternate"><li>
 <a shape="rect" href="source.html">Source</a></li><li><a shape="rect" 
href="building.html">Building</a></li><li><a shape="rect" 
href="developer-guide.html">Developer Guide</a></li><li><a shape="rect" 
href="becoming-a-committer.html">Becoming a committer</a></li><li><a 
shape="rect" href="code-overview.html">Code Overview</a></li><li><a 
shape="rect" href="wire-protocol.html">Wire Protocol</a></li><li><a 
shape="rect" href="release-guide.html">Release Guide</a></li></ul><h3 
id="Navigation-Tests">Tests</h3><ul class="alternate"><li><a shape="rect" 
href="activemq-performance-module-users-manual.html">Maven2 Performance 
Plugin</a></li><li><a shape="rect" href="benchmark-tests.html">Benchmark 
Tests</a></li><li><a shape="rect" href="jmeter-system-tests.html">JMeter System 
Tests</a></li><li><a shape="rect" href="jmeter-performance-tests.html">JMeter 
Performance Tests</a></li><li><a shape="rect" 
href="integration-tests.html">Integration Tests</a></li></ul><h3 
id="Navigation-ProjectReports">Pro
 ject Reports</h3><ul class="alternate"><li><a shape="rect" 
href="junit-reports.html">JUnit Reports</a></li><li><a shape="rect" 
href="source-xref.html">Source XRef</a></li><li><a shape="rect" 
href="test-source-xref.html">Test Source XRef</a></li><li><a shape="rect" 
href="xml-reference.html">Xml Reference</a></li></ul>
-              </div>
-            </div>
-          </div>
-        </td>
-        </tr>
-  </tbody>
-        </table>
-        <div class="bottom_red_bar"></div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="black_box">
-<div class="footer">
-  <div class="footer_l">
-    <div class="footer_r">
-      <div>
-        <a href="http://activemq.apache.org/privacy-policy.html";>Privacy 
Policy</a> -
-        (<a 
href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=36068";>edit
 this page</a>)
-      </div>
-    </div>
-  </div>
-</div>
-</div>
-</div>
-<div class="design_attribution">
-&copy; 2004-2011 The Apache Software Foundation.
-<br/>          
-Apache ActiveMQ, ActiveMQ, Apache, the Apache feather logo, and the Apache 
ActiveMQ project logo are trademarks of The Apache Software Foundation.  All 
other marks mentioned may be trademarks or registered trademarks of their 
respective owners.
-<br/>
-<a href="http://hiramchirino.com";>Graphic Design By Hiram</a>
-</div>
 
-<!-- delay the loading of large javascript files to the end so that they don't 
interfere with the loading of page content -->
-<span style="display: none">
-  <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."; 
: "http://www.";);
-    document.write(unescape("%3Cscript src='" + gaJsHost + 
"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  </script>
-  <script type="text/javascript">
-    var pageTracker = _gat._getTracker("UA-1347593-1");
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  </script>
-</span>
-</body>
-</html>

Reply via email to