summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Robie <jonathan@apache.org>2010-05-21 21:55:22 +0000
committerJonathan Robie <jonathan@apache.org>2010-05-21 21:55:22 +0000
commit13f8411c0e2278e9bbb9c6c1b4762dc123dd86ed (patch)
treec4d07e558ffd3a585e25470b45d925fc36134021
parent89e14bc6a0af4ec55b8e124c886950b44b5206d9 (diff)
downloadqpid-python-13f8411c0e2278e9bbb9c6c1b4762dc123dd86ed.tar.gz
Tools and content for building Qpid web site. Source for static pages lives here, source for book content lives in doc/book, API docs are generated from client source trees.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@947199 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--doc/website/README.txt11
-rw-r--r--doc/website/content/#compatibility.html#365
-rw-r--r--doc/website/content/#people.html#76
-rw-r--r--doc/website/content/acknowledgements.html19
-rw-r--r--doc/website/content/acknowledgements.html~16
-rw-r--r--doc/website/content/amqp.html51
-rw-r--r--doc/website/content/amqp.html~52
-rw-r--r--doc/website/content/compatibility.html365
-rw-r--r--doc/website/content/compatibility.html~367
-rw-r--r--doc/website/content/download.html391
-rw-r--r--doc/website/content/download.html~45
-rw-r--r--doc/website/content/getting_started.html69
-rw-r--r--doc/website/content/getting_started.html~70
-rw-r--r--doc/website/content/home.html70
-rw-r--r--doc/website/content/images/README.txt1
-rw-r--r--doc/website/content/images/jprofiler.pngbin0 -> 584 bytes
-rw-r--r--doc/website/content/images/structure101.jpgbin0 -> 3465 bytes
-rw-r--r--doc/website/content/mailing_lists.html47
-rw-r--r--doc/website/content/people.html76
-rw-r--r--doc/website/content/people.html~92
-rw-r--r--doc/website/content/qpid_integrated_with.html20
-rw-r--r--doc/website/content/qpid_integrated_with.html~20
-rw-r--r--doc/website/content/source_repository.html54
-rw-r--r--doc/website/content/source_repository.html~60
-rw-r--r--doc/website/example/images/asf-logo.pngbin0 -> 4735 bytes
-rw-r--r--doc/website/example/images/asf_logo.gifbin0 -> 7279 bytes
-rw-r--r--doc/website/example/images/header.pngbin0 -> 22354 bytes
-rw-r--r--doc/website/example/images/main_body.pngbin0 -> 211 bytes
-rw-r--r--doc/website/example/images/main_bottom.pngbin0 -> 1719 bytes
-rw-r--r--doc/website/example/images/main_top.pngbin0 -> 295 bytes
-rw-r--r--doc/website/example/images/menu_body.pngbin0 -> 198 bytes
-rw-r--r--doc/website/example/images/menu_bottom.pngbin0 -> 264 bytes
-rw-r--r--doc/website/example/images/menu_top.pngbin0 -> 258 bytes
-rw-r--r--doc/website/example/images/qpid-logo-900x480.pngbin0 -> 39038 bytes
-rw-r--r--doc/website/example/images/qpid-logo.pngbin0 -> 5775 bytes
-rw-r--r--doc/website/example/index.html185
-rw-r--r--doc/website/example/style.css244
-rw-r--r--doc/website/index.html0
-rw-r--r--doc/website/template.html114
-rw-r--r--doc/website/template/images/asf-logo.pngbin0 -> 4735 bytes
-rw-r--r--doc/website/template/images/asf_logo.gifbin0 -> 7279 bytes
-rw-r--r--doc/website/template/images/header.pngbin0 -> 22354 bytes
-rw-r--r--doc/website/template/images/main_body.pngbin0 -> 211 bytes
-rw-r--r--doc/website/template/images/main_bottom.pngbin0 -> 1719 bytes
-rw-r--r--doc/website/template/images/main_top.pngbin0 -> 295 bytes
-rw-r--r--doc/website/template/images/menu_body.pngbin0 -> 198 bytes
-rw-r--r--doc/website/template/images/menu_bottom.pngbin0 -> 264 bytes
-rw-r--r--doc/website/template/images/menu_top.pngbin0 -> 258 bytes
-rw-r--r--doc/website/template/images/qpid-logo-900x480.pngbin0 -> 39038 bytes
-rw-r--r--doc/website/template/images/qpid-logo.pngbin0 -> 5775 bytes
-rw-r--r--doc/website/template/style.css244
-rw-r--r--doc/website/template/template.html113
-rwxr-xr-xdoc/website/tools/wrap26
53 files changed, 3263 insertions, 0 deletions
diff --git a/doc/website/README.txt b/doc/website/README.txt
new file mode 100644
index 0000000000..1c3c700300
--- /dev/null
+++ b/doc/website/README.txt
@@ -0,0 +1,11 @@
+This is the source directory for creating web pages for the Qpid web site.
+
+The template used for all pages (template.html), stylesheet (style.css), and images are in the ./template directory.
+
+The tools directory contains a very simple Python script (wrap) that combines a template and content to create an output file. Content should be written in XHTML, with one <div/> element at the root - see ./content/home.html for an example. Use wrap like this:
+
+$ tools/wrap templates/template.html content/home.html build/index.html
+
+The example directory shows sample output. It includes the CSS stylesheet and images needed to view the output in a web browser.
+
+Images associated with the template are in template/images. Images associated with content are in content/images.
diff --git a/doc/website/content/#compatibility.html# b/doc/website/content/#compatibility.html#
new file mode 100644
index 0000000000..cb5b1a8641
--- /dev/null
+++ b/doc/website/content/#compatibility.html#
@@ -0,0 +1,365 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <p><b>Qpid provides the most complete and compatible implementation of AMQP. And is the most aggressive in implementing the latest version of the specification. Qpid can be</b> <b><a href="./download.html" title="Download"><b>downloaded here</b></a></b></p>
+
+ <p>There are two brokers:</p>
+
+ <p>C+&#43; with support for AMQP 0-10<br/>
+ Java with support for AMQP 0-8, 0-9, and 0-10.</p>
+
+ <p>There are client libraries for C++, Java (JMS), .Net (written in C#), python and ruby.</p>
+
+ <ul>
+ <li>All clients support 0-10 and interoperate with both brokers as of 0.6.</li>
+ </ul>
+
+
+ <ul>
+ <li>The JMS client supports 0-8, 0-9 and 0-10 and interoperates with both brokers.</li>
+ </ul>
+
+
+ <ul>
+ <li>The python and ruby clients will also support all versions, but the API is dynamically driven by the specification used and so differs between versions. To work with the C+&#43; broker you must use 0-10. To work with the Java broker you can use any version as of 0.6, or prior to 0.6 you can use 0-8 or 0-9.</li>
+
+ </ul>
+
+
+ <ul>
+ <li>There are two separate C# clients, one for 0-8 that interoperates only with the Java broker, and one for 0-10.</li>
+ </ul>
+
+
+ <ul>
+ <li>There is also a WCF channel, which wraps the 0-10 native C++ client library.</li>
+ </ul>
+
+
+ <p>QMF Management is supported in Ruby, Python, C++, and can be translated to Java JMX &amp; WS-DM via the QMan management tool.</p>
+
+ <h3><a name="AMQPcompatibility-AMQPCompatibilityofQpidreleases%3A"></a>AMQP Compatibility of Qpid releases:</h3>
+
+ <p>Qpid implements the AMQP Specification, and as the specification has progressed Qpid is keeping up with the updates. This means that different Qpid versions support different versions of AMQP. Here is a simple guide on what use.</p>
+
+ <p>Here is a matrix that describes the different versions supported by each release<br/>
+ Y = supported<br/>
+ N = unsupported<br/>
+
+ IP = in progress<br/>
+ P = planned</p>
+ <div >
+ <table ><tbody>
+ <tr>
+ <th > Component </th>
+ <th > Spec </th>
+ <th >&nbsp;</th>
+ <th >&nbsp;</th>
+ <th >&nbsp;</th>
+ <th >&nbsp;</th>
+
+ <th >&nbsp;</th>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <th > M2.1 </th>
+ <th > M3 </th>
+ <th > M4 </th>
+ <th > 0.5 </th>
+
+ <th > 0.6 </th>
+ </tr>
+ <tr>
+ <th > Java client </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-9 </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <th > Java broker </th>
+
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-9 </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+
+ <th > C+&#43; client/broker </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-9 </td>
+ <td > Y </td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ </tr>
+
+ <tr>
+ <th > Python client </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-9 </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <th > Ruby client </th>
+ <td > 0-10 </td>
+
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+
+ <th > C# client </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ </tr>
+ <tr>
+ <th > WCF channel </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+
+ </tr>
+ </tbody></table>
+ </div>
+
+
+ <h3><a name="AMQPcompatibility-InteroptablebyAMQPspecificationversion"></a>Interop table by AMQP specification version</h3>
+
+ <p>Above table represented in another format.</p>
+ <div >
+ <table ><tbody>
+ <tr>
+ <td >&nbsp;</td>
+ <td > release </td>
+
+ <td > 0-8 </td>
+ <td > 0-9 </td>
+ <td > 0-10 </td>
+ </tr>
+ <tr>
+ <td > Java client </td>
+ <td > M3 M4 0.5 0.6 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > Java client </td>
+ <td > M2.1 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > Java broker </td>
+ <td > 0.6 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > Java broker </td>
+ <td > M3 M4 0.5 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > Java broker </td>
+ <td > M2.1 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > C+&#43; client/broker </td>
+ <td > M3 M4 0.5 0.6 </td>
+
+ <td > N </td>
+ <td > N </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > C+&#43; client/broker </td>
+ <td > M2.1 </td>
+
+ <td > N </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > Python client </td>
+ <td > M3 M4 0.5 0.6 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > Python client </td>
+ <td > M2.1 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > Ruby client </td>
+ <td > M4, 0.5, 0.6 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > Ruby client </td>
+ <td > M3 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > C# client 0-10 </td>
+ <td > M4 0.5 0.6 </td>
+
+ <td > N </td>
+ <td > N </td>
+ <td > Y</td>
+ </tr>
+ <tr>
+ <td > C# client 0-8 </td>
+ <td > M3 M4 0.5 0.6 </td>
+
+ <td > Y </td>
+ <td > N </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > WCF channel </td>
+ <td > 0.6</td>
+
+ <td > N </td>
+ <td > N </td>
+ <td > Y </td>
+ </tr>
+ </tbody></table>
+ </div>
+</div>
+
diff --git a/doc/website/content/#people.html# b/doc/website/content/#people.html#
new file mode 100644
index 0000000000..9cb7e53cb7
--- /dev/null
+++ b/doc/website/content/#people.html#
@@ -0,0 +1,76 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>People</h1>
+
+ <p>This page lists some of the people who have contributed to Qpid.</p>
+
+ <h2>Committers</h2>
+ <p>The people listed below have made significant contributions to
+ Qpid by working long and hard to make quality software for the rest
+ of the world to use.</p>
+
+ <p>In addition to providing us contribuions, or being commmitters
+ some of the following people are also members of the Project
+ Management Committee (PMC). Refer to the How the ASF works for
+ details on meritocracy.</p>
+
+ <p>If you would like to contribute to Qpid please look at the Get
+ Involved page to see how you can contribute.</p>
+
+ <div>
+ <ul>
+ <li>Aidan Skinner</li>
+ <li>Alan Conway</li>
+ <li>Andrea Gazzarini</li>
+ <li>Andrew Stitcher</li>
+ <li>Arnaud Simon</li>
+ <li>Carl Trieloff</li>
+ <li>Gordon Sim</li>
+ <li>Jim Meyering</li>
+ <li>John O'Hara</li>
+ <li>Jonathan Robie</li>
+ <li>Ken Giusti</li>
+ <li>Kim van der Riet</li>
+ <li>Lahiru Gunathilake</li>
+ <li>Manuel Teira</li>
+ <li>Marnie McCormack</li>
+ <li>Martin Ritchie</li>
+ <li>Michael Goulish</li>
+ <li>Nuno Santos</li>
+ <li>Paul Fremantle</li>
+ <li>Rafael Schloming</li>
+ <li>Rajith Attapattu</li>
+ <li>Robbie Gemmell</li>
+ <li>Robert Godfrey</li>
+ <li>Robert Greig</li>
+ <li>Rupert Smith</li>
+ <li>Steve Huston</li>
+ <li>Ted Ross</li>
+ <li>Yoav Shapira</li>
+ </ul>
+ </div>
+
+ <h2>Contributors</h2>
+
+
+ <p>Many thanks to the following people for providing contributions:</p>
+
+ <ul>
+ <li>Colin Crist</li>
+ <li>Bhupendra Bhardwaj</li>
+ <li>Kevin Smith</li>
+ <li>Steve Vinoski</li>
+ <li>Steven Shaw</li>
+ <li>Tomas Restrepo</li>
+</li>
+
+<h2>Mentors</h2>
+
+<p>And many thanks to our project's mentors:</p>
+
+<ul>
+ <li>Cliff Schmidt</li>
+ <li>Craig Russell</li>
+ <li>Paul Fremantle</li>
+ <li>Yoav Shapira</li>
+ <li>Scott Deboy</li>
+</ul>
diff --git a/doc/website/content/acknowledgements.html b/doc/website/content/acknowledgements.html
new file mode 100644
index 0000000000..6c9d6c3190
--- /dev/null
+++ b/doc/website/content/acknowledgements.html
@@ -0,0 +1,19 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>Acknowledgements</h1>
+ <div>
+ <table>
+ <tbody>
+ <tr>
+ <td><a href="http://www.ej-technologies.com/products/jprofiler/overview.html">
+ <img src="images/jprofiler.png" /></a>
+ </td>
+ <td><p>We acknowledge <a href="http://www.ej-technologies.com">ej-technologies</a> for giving us a free team license for profiling Qpid Java code.</p></td>
+
+ </tr>
+ <tr>
+ <td><a href="http://www.headwaysoftware.com/products/structure101"><img src="images/structure101.jpg"/></a> </td>
+ <td><p>We acknowledge <a href="http://www.headwaysoftware.com">Headway Software</a> for giving us free licenses of Structure101 for analyzing and managing the architecture of Qpid Java code.</p></td>
+ </tr>
+ </tbody></table>
+ </div>
+</div>
diff --git a/doc/website/content/acknowledgements.html~ b/doc/website/content/acknowledgements.html~
new file mode 100644
index 0000000000..a3bbb3d195
--- /dev/null
+++ b/doc/website/content/acknowledgements.html~
@@ -0,0 +1,16 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+<h1>Acknowledgements</h1>
+ <div >
+ <table ><tbody>
+ <tr>
+ <td > <a href="http://www.ej-technologies.com/products/jprofiler/overview.html" class="external-link" rel="nofollow"><span class="image-wrap" style=""><img src="/confluence/download/attachments/74463/jprofiler.png?version=1&amp;modificationDate=1200398797000" style="border: 0px solid black" /></span></a> </td>
+ <td > <table class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><tbody><tr><p> We acknowledge <a href="http://www.ej-technologies.com" class="external-link" rel="nofollow">ej-technologies</a> for giving us a free team license for profiling Qpid Java code. </p></tr></tbody></table> </td>
+
+ </tr>
+ <tr>
+ <td > <a href="http://www.headwaysoftware.com/products/structure101" class="external-link" rel="nofollow"><span class="image-wrap" style=""><img src="/confluence/download/attachments/74463/structure101.jpg?version=1&amp;modificationDate=1202130339000" style="border: 0px solid black" /></span></a> </td>
+ <td > <table class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><tbody><tr><p> We acknowledge <a href="http://www.headwaysoftware.com" class="external-link" rel="nofollow">Headway Software</a> for giving us free licenses of Structure101 for analyzing and managing the architecture of Qpid Java code. </p></tr></tbody></table> </td>
+ </tr>
+ </tbody></table>
+ </div>
+</div>
diff --git a/doc/website/content/amqp.html b/doc/website/content/amqp.html
new file mode 100644
index 0000000000..c5fed6c867
--- /dev/null
+++ b/doc/website/content/amqp.html
@@ -0,0 +1,51 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>What is AMQP?</h1>
+
+ <p>AMQP <a href="http://www.amqp.org">Advanced Message Queuing Protocol</a> is an open standard designed to support reliable, high-performance messaging over the Internet. AMQP can be used for any distributed or business application, and supports common messaging paradigms like point-to-point, fanout, publish-subscribe, and request-response.</p>
+
+ <p>Apache Qpid implements AMQP, including transaction management, queuing, clustering, federation, security, management and multi-platform support.</p>
+
+
+ <p>Apache Qpid implements the latest AMQP specification, providing transaction management, queuing, distribution, security, management, clustering, federation and heterogeneous multi-platform support and a lot more. </p>
+
+ <p>Apache Qpid is highly optimized, and <a href="/confluence/display/qpid/AMQP+compatibility" title="AMQP compatibility">aims to be 100% AMQP Compliant</a>.</p>
+
+ <h2><a name="AMQP%28AdvancedMessageQueueingProtocol%29-DownloadtheAMQPSpecifications"></a>Download the AMQP Specifications</h2>
+
+ <h3><a name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion010"></a>AMQP version 0-10</h3>
+
+
+ <ul>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.pdf?version=1">AMQP 0-10 Specification (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.xml?version=1">AMQP 0-10 Protocol Definition XML </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.dfd?version=1">AMQP 0-10 Protocol Definition DTD </a></li>
+
+ </ul>
+
+
+ <h3><a name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion091"></a>AMQP version 0-9-1</h3>
+
+ <ul>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9-1.pdf?version=1">AMQP 0-9-1 Specification (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9-1.xml?version=1">AMQP 0-9-1 Protocol Documentation (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9-1.dtd?version=1">AMQP 0-9-1 Protocol Definitions (XML) </a></li>
+ </ul>
+
+
+ <h3><a name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion09"></a>AMQP version 0-9</h3>
+
+ <ul>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9.pdf?version=1">AMQP 0-9 Specification (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9.xml?version=1">AMQP 0-9 Protocol Documentation (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9.dtd?version=1">AMQP 0-9 Protocol Definitions (XML) </a></li>
+ </ul>
+
+ <h3><a name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion08"></a>AMQP version 0-8</h3>
+
+ <ul>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-8.pdf?version=1">AMQP 0-8 Specification (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-8.dtd?version=1">AMQP 0-8 Protocol Documentation (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-8.xml?version=1">AMQP 0-8 Protocol Definitions (XML) </a></li>
+ </ul>
+</div>
+
diff --git a/doc/website/content/amqp.html~ b/doc/website/content/amqp.html~
new file mode 100644
index 0000000000..833c593043
--- /dev/null
+++ b/doc/website/content/amqp.html~
@@ -0,0 +1,52 @@
+<div class="wiki-content" style="margin-right:10px;">
+
+ <h1>What is AMQP?</h1>
+
+<p>AMQP <a href="http://www.amqp.org" class="external-link" rel="nofollow">Advanced Message Queuing Protocol</a> is an open standard designed to support reliable, high-performance messaging over the Internet. AMQP can be used for any distributed or business application, and supports common messaging paradigms like point-to-point, fanout, publish-subscribe, and request-response.</p>
+
+<p>Apache Qpid implements AMQP, including transaction management, queuing, clustering, federation, security, management and multi-platform support.</p>
+
+
+<p>Apache Qpid implements the latest AMQP specification, providing transaction management, queuing, distribution, security, management, clustering, federation and heterogeneous multi-platform support and a lot more. </p>
+
+<p>Apache Qpid is highly optimized, and <a href="/confluence/display/qpid/AMQP+compatibility" title="AMQP compatibility">aims to be 100% AMQP Compliant</a>.</p>
+
+<h2><a name="AMQP%28AdvancedMessageQueueingProtocol%29-DownloadtheAMQPSpecifications"></a>Download the AMQP Specifications</h2>
+
+<h3><a name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion010"></a>AMQP version 0-10</h3>
+
+
+<ul>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.pdf?version=1" class="external-link" rel="nofollow">AMQP 0-10 Specification (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.xml?version=1" class="external-link" rel="nofollow">AMQP 0-10 Protocol Definition XML </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.dfd?version=1" class="external-link" rel="nofollow">AMQP 0-10 Protocol Definition DTD </a></li>
+
+</ul>
+
+
+<h3><a name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion091"></a>AMQP version 0-9-1</h3>
+
+<ul>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9-1.pdf?version=1" class="external-link" rel="nofollow">AMQP 0-9-1 Specification (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9-1.xml?version=1" class="external-link" rel="nofollow">AMQP 0-9-1 Protocol Documentation (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9-1.dtd?version=1" class="external-link" rel="nofollow">AMQP 0-9-1 Protocol Definitions (XML) </a></li>
+</ul>
+
+
+<h3><a name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion09"></a>AMQP version 0-9</h3>
+
+<ul>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9.pdf?version=1" class="external-link" rel="nofollow">AMQP 0-9 Specification (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9.xml?version=1" class="external-link" rel="nofollow">AMQP 0-9 Protocol Documentation (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9.dtd?version=1" class="external-link" rel="nofollow">AMQP 0-9 Protocol Definitions (XML) </a></li>
+</ul>
+
+<h3><a name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion08"></a>AMQP version 0-8</h3>
+
+<ul>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-8.pdf?version=1" class="external-link" rel="nofollow">AMQP 0-8 Specification (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-8.dtd?version=1" class="external-link" rel="nofollow">AMQP 0-8 Protocol Documentation (PDF) </a></li>
+ <li><a href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-8.xml?version=1" class="external-link" rel="nofollow">AMQP 0-8 Protocol Definitions (XML) </a></li>
+</ul>
+</div>
+
diff --git a/doc/website/content/compatibility.html b/doc/website/content/compatibility.html
new file mode 100644
index 0000000000..cb5b1a8641
--- /dev/null
+++ b/doc/website/content/compatibility.html
@@ -0,0 +1,365 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <p><b>Qpid provides the most complete and compatible implementation of AMQP. And is the most aggressive in implementing the latest version of the specification. Qpid can be</b> <b><a href="./download.html" title="Download"><b>downloaded here</b></a></b></p>
+
+ <p>There are two brokers:</p>
+
+ <p>C+&#43; with support for AMQP 0-10<br/>
+ Java with support for AMQP 0-8, 0-9, and 0-10.</p>
+
+ <p>There are client libraries for C++, Java (JMS), .Net (written in C#), python and ruby.</p>
+
+ <ul>
+ <li>All clients support 0-10 and interoperate with both brokers as of 0.6.</li>
+ </ul>
+
+
+ <ul>
+ <li>The JMS client supports 0-8, 0-9 and 0-10 and interoperates with both brokers.</li>
+ </ul>
+
+
+ <ul>
+ <li>The python and ruby clients will also support all versions, but the API is dynamically driven by the specification used and so differs between versions. To work with the C+&#43; broker you must use 0-10. To work with the Java broker you can use any version as of 0.6, or prior to 0.6 you can use 0-8 or 0-9.</li>
+
+ </ul>
+
+
+ <ul>
+ <li>There are two separate C# clients, one for 0-8 that interoperates only with the Java broker, and one for 0-10.</li>
+ </ul>
+
+
+ <ul>
+ <li>There is also a WCF channel, which wraps the 0-10 native C++ client library.</li>
+ </ul>
+
+
+ <p>QMF Management is supported in Ruby, Python, C++, and can be translated to Java JMX &amp; WS-DM via the QMan management tool.</p>
+
+ <h3><a name="AMQPcompatibility-AMQPCompatibilityofQpidreleases%3A"></a>AMQP Compatibility of Qpid releases:</h3>
+
+ <p>Qpid implements the AMQP Specification, and as the specification has progressed Qpid is keeping up with the updates. This means that different Qpid versions support different versions of AMQP. Here is a simple guide on what use.</p>
+
+ <p>Here is a matrix that describes the different versions supported by each release<br/>
+ Y = supported<br/>
+ N = unsupported<br/>
+
+ IP = in progress<br/>
+ P = planned</p>
+ <div >
+ <table ><tbody>
+ <tr>
+ <th > Component </th>
+ <th > Spec </th>
+ <th >&nbsp;</th>
+ <th >&nbsp;</th>
+ <th >&nbsp;</th>
+ <th >&nbsp;</th>
+
+ <th >&nbsp;</th>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <th > M2.1 </th>
+ <th > M3 </th>
+ <th > M4 </th>
+ <th > 0.5 </th>
+
+ <th > 0.6 </th>
+ </tr>
+ <tr>
+ <th > Java client </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-9 </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <th > Java broker </th>
+
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-9 </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+
+ <th > C+&#43; client/broker </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-9 </td>
+ <td > Y </td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ </tr>
+
+ <tr>
+ <th > Python client </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-9 </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <th > Ruby client </th>
+ <td > 0-10 </td>
+
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+
+ <th > C# client </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ </tr>
+ <tr>
+ <td >&nbsp;</td>
+ <td > 0-8 </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+
+ <td > Y </td>
+ </tr>
+ <tr>
+ <th > WCF channel </th>
+ <td > 0-10 </td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td >&nbsp;</td>
+ <td > Y </td>
+
+ </tr>
+ </tbody></table>
+ </div>
+
+
+ <h3><a name="AMQPcompatibility-InteroptablebyAMQPspecificationversion"></a>Interop table by AMQP specification version</h3>
+
+ <p>Above table represented in another format.</p>
+ <div >
+ <table ><tbody>
+ <tr>
+ <td >&nbsp;</td>
+ <td > release </td>
+
+ <td > 0-8 </td>
+ <td > 0-9 </td>
+ <td > 0-10 </td>
+ </tr>
+ <tr>
+ <td > Java client </td>
+ <td > M3 M4 0.5 0.6 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > Java client </td>
+ <td > M2.1 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > Java broker </td>
+ <td > 0.6 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > Java broker </td>
+ <td > M3 M4 0.5 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > Java broker </td>
+ <td > M2.1 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > C+&#43; client/broker </td>
+ <td > M3 M4 0.5 0.6 </td>
+
+ <td > N </td>
+ <td > N </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > C+&#43; client/broker </td>
+ <td > M2.1 </td>
+
+ <td > N </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > Python client </td>
+ <td > M3 M4 0.5 0.6 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > Python client </td>
+ <td > M2.1 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > Ruby client </td>
+ <td > M4, 0.5, 0.6 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > Y </td>
+ </tr>
+ <tr>
+ <td > Ruby client </td>
+ <td > M3 </td>
+
+ <td > Y </td>
+ <td > Y </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > C# client 0-10 </td>
+ <td > M4 0.5 0.6 </td>
+
+ <td > N </td>
+ <td > N </td>
+ <td > Y</td>
+ </tr>
+ <tr>
+ <td > C# client 0-8 </td>
+ <td > M3 M4 0.5 0.6 </td>
+
+ <td > Y </td>
+ <td > N </td>
+ <td > N </td>
+ </tr>
+ <tr>
+ <td > WCF channel </td>
+ <td > 0.6</td>
+
+ <td > N </td>
+ <td > N </td>
+ <td > Y </td>
+ </tr>
+ </tbody></table>
+ </div>
+</div>
+
diff --git a/doc/website/content/compatibility.html~ b/doc/website/content/compatibility.html~
new file mode 100644
index 0000000000..055b72f379
--- /dev/null
+++ b/doc/website/content/compatibility.html~
@@ -0,0 +1,367 @@
+<div class="wiki-content" style="margin-right:10px;">
+ <!-- wiki content -->
+
+ <p><b>Qpid provides the most complete and compatible implementation of AMQP. And is the most aggressive in implementing the latest version of the specification. Qpid can be</b> <b><a href="/confluence/display/qpid/Download" title="Download"><b>downloaded here</b></a></b></p>
+
+<p>There are two brokers:</p>
+
+<p>C+&#43; with support for AMQP 0-10<br/>
+Java with support for AMQP 0-8, 0-9, and 0-10.</p>
+
+<p>There are client libraries for C++, Java (JMS), .Net (written in C#), python and ruby.</p>
+
+<ul>
+ <li>All clients support 0-10 and interoperate with both brokers as of 0.6.</li>
+</ul>
+
+
+<ul>
+ <li>The JMS client supports 0-8, 0-9 and 0-10 and interoperates with both brokers.</li>
+</ul>
+
+
+<ul>
+ <li>The python and ruby clients will also support all versions, but the API is dynamically driven by the specification used and so differs between versions. To work with the C+&#43; broker you must use 0-10. To work with the Java broker you can use any version as of 0.6, or prior to 0.6 you can use 0-8 or 0-9.</li>
+
+</ul>
+
+
+<ul>
+ <li>There are two separate C# clients, one for 0-8 that interoperates only with the Java broker, and one for 0-10.</li>
+</ul>
+
+
+<ul>
+ <li>There is also a WCF channel, which wraps the 0-10 native C++ client library.</li>
+</ul>
+
+
+<p>QMF Management is supported in Ruby, Python, C++, and can be translated to Java JMX &amp; WS-DM via the QMan management tool.</p>
+
+<h3><a name="AMQPcompatibility-AMQPCompatibilityofQpidreleases%3A"></a>AMQP Compatibility of Qpid releases:</h3>
+
+<p>Qpid implements the AMQP Specification, and as the specification has progressed Qpid is keeping up with the updates. This means that different Qpid versions support different versions of AMQP. Here is a simple guide on what use.</p>
+
+<p>Here is a matrix that describes the different versions supported by each release<br/>
+Y = supported<br/>
+N = unsupported<br/>
+
+IP = in progress<br/>
+P = planned</p>
+<div >
+<table ><tbody>
+<tr>
+<th > Component </th>
+<th > Spec </th>
+<th >&nbsp;</th>
+<th >&nbsp;</th>
+<th >&nbsp;</th>
+<th >&nbsp;</th>
+
+<th >&nbsp;</th>
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<th > M2.1 </th>
+<th > M3 </th>
+<th > M4 </th>
+<th > 0.5 </th>
+
+<th > 0.6 </th>
+</tr>
+<tr>
+<th > Java client </th>
+<td > 0-10 </td>
+<td >&nbsp;</td>
+<td > Y </td>
+<td > Y </td>
+
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td > 0-9 </td>
+<td > Y </td>
+<td > Y </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td > 0-8 </td>
+<td > Y </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<th > Java broker </th>
+
+<td > 0-10 </td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td > Y </td>
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td > 0-9 </td>
+<td > Y </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td > 0-8 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+
+<th > C+&#43; client/broker </th>
+<td > 0-10 </td>
+<td >&nbsp;</td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+
+<td > Y </td>
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td > 0-9 </td>
+<td > Y </td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+</tr>
+
+<tr>
+<th > Python client </th>
+<td > 0-10 </td>
+<td >&nbsp;</td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+
+<td > Y </td>
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td > 0-9 </td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td > 0-8 </td>
+<td > Y </td>
+<td > Y </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<th > Ruby client </th>
+<td > 0-10 </td>
+
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td > 0-8 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+
+<th > C# client </th>
+<td > 0-10 </td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+
+</tr>
+<tr>
+<td >&nbsp;</td>
+<td > 0-8 </td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+
+<td > Y </td>
+</tr>
+<tr>
+<th > WCF channel </th>
+<td > 0-10 </td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td >&nbsp;</td>
+<td > Y </td>
+
+</tr>
+</tbody></table>
+</div>
+
+
+<h3><a name="AMQPcompatibility-InteroptablebyAMQPspecificationversion"></a>Interop table by AMQP specification version</h3>
+
+<p>Above table represented in another format.</p>
+<div >
+<table ><tbody>
+<tr>
+<td >&nbsp;</td>
+<td > release </td>
+
+<td > 0-8 </td>
+<td > 0-9 </td>
+<td > 0-10 </td>
+</tr>
+<tr>
+<td > Java client </td>
+<td > M3 M4 0.5 0.6 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<td > Java client </td>
+<td > M2.1 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > N </td>
+</tr>
+<tr>
+<td > Java broker </td>
+<td > 0.6 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<td > Java broker </td>
+<td > M3 M4 0.5 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > N </td>
+</tr>
+<tr>
+<td > Java broker </td>
+<td > M2.1 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > N </td>
+</tr>
+<tr>
+<td > C+&#43; client/broker </td>
+<td > M3 M4 0.5 0.6 </td>
+
+<td > N </td>
+<td > N </td>
+<td > Y </td>
+</tr>
+<tr>
+<td > C+&#43; client/broker </td>
+<td > M2.1 </td>
+
+<td > N </td>
+<td > Y </td>
+<td > N </td>
+</tr>
+<tr>
+<td > Python client </td>
+<td > M3 M4 0.5 0.6 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<td > Python client </td>
+<td > M2.1 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > N </td>
+</tr>
+<tr>
+<td > Ruby client </td>
+<td > M4, 0.5, 0.6 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > Y </td>
+</tr>
+<tr>
+<td > Ruby client </td>
+<td > M3 </td>
+
+<td > Y </td>
+<td > Y </td>
+<td > N </td>
+</tr>
+<tr>
+<td > C# client 0-10 </td>
+<td > M4 0.5 0.6 </td>
+
+<td > N </td>
+<td > N </td>
+<td > Y</td>
+</tr>
+<tr>
+<td > C# client 0-8 </td>
+<td > M3 M4 0.5 0.6 </td>
+
+<td > Y </td>
+<td > N </td>
+<td > N </td>
+</tr>
+<tr>
+<td > WCF channel </td>
+<td > 0.6</td>
+
+<td > N </td>
+<td > N </td>
+<td > Y </td>
+</tr>
+</tbody></table>
+</div>
+</div>
+
diff --git a/doc/website/content/download.html b/doc/website/content/download.html
new file mode 100644
index 0000000000..41760c9c0b
--- /dev/null
+++ b/doc/website/content/download.html
@@ -0,0 +1,391 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>Downloads</h1>
+
+ <h2>Production Releases</h2>
+
+ <p>These releases are well tested and appropriate for production use. 0.6 is the latest release of Qpid.</p>
+
+ <p>Qpid supports the latest version of AMQP 0-10, and some components also the AMQP 0-8 and 0-9, earlier versions. The Java Broker and Client provide protocol negotiation. <a href="http://www.apache.org/dist/qpid/">Other versions can be found here</a></p>
+
+ <p>For details on cross component compatibility among releases, see: <a href="./compatibility.html">AMQP Release Compatibility for Qpid</a></p>
+
+ <p>If you have any questions about these releases, please mail the user list <a href="mailto:qpid-user@incubator.apache.org">user list</a></p>
+
+
+ <h2>Latest Release</h2>
+
+ <h3>Multiple Component Packages</h3>
+
+ <div>
+ <table><tbody>
+ <tr>
+ <th> Component </th>
+
+ <th> Download </th>
+ <th> AMQP 0-10 </th>
+ <th> AMQP 0-8/0-9 </th>
+ </tr>
+ <tr>
+ <td> Full release &amp; keys </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/">http://www.apache.org/dist/qpid/0.6/</a> </td>
+
+ <td> Y </td>
+ <td> Y </td>
+ </tr>
+ <tr>
+ <td> C+&#43; broker &amp; client </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-cpp-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-cpp-0.6.tar.gz</a> </td>
+
+ <td> Y </td>
+ <td>&nbsp;</td>
+ </tr>
+ <tr>
+ <td> Java broker, client &amp; tools </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-java-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-java-0.6.tar.gz</a> </td>
+ <td> Y </td>
+
+ <td> Y </td>
+ </tr>
+ </tbody></table>
+ </div>
+
+
+ <h3><a name="Download-SingleComponentPackage"></a>Single Component Package</h3>
+
+ <p><b>Broker</b></p>
+ <div>
+ <table><tbody>
+ <tr>
+ <th> Language </th>
+
+ <th> Download </th>
+ <th> AMQP 0-10 </th>
+ <th> AMQP 0-8/0-9 </th>
+ </tr>
+ <tr>
+ <td> Java </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-java-broker-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-java-broker-0.6.tar.gz</a> </td>
+
+ <td> Y </td>
+ <td> Y </td>
+ </tr>
+ </tbody></table>
+ </div>
+
+
+ <p><b>Client</b></p>
+ <div>
+ <table><tbody>
+ <tr>
+ <th> Language </th>
+
+ <th> Download </th>
+ <th> AMQP 0-10 </th>
+ <th> AMQP 0-8/0-9 </th>
+ </tr>
+ <tr>
+ <td> C# (.NET, WCF) WCF channel (C+&#43; Broker Compatible) </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-wcf-0.6.zip">http://www.apache.org/dist/qpid/0.6/qpid-wcf-0.6.zip</a> </td>
+
+ <td> Y </td>
+ <td>&nbsp;</td>
+ </tr>
+ <tr>
+ <td> C# (.NET, WCF, Excel) 0-10 client (C+&#43; Broker Compatible) </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-10-0.6.zip">http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-10-0.6.zip</a> </td>
+ <td> Y </td>
+
+ <td>&nbsp;</td>
+ </tr>
+ <tr>
+ <td> C# (.NET) 0-8 client (Java Broker Compatible) </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-8-0.6.zip">http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-8-0.6.zip</a> </td>
+ <td>&nbsp;</td>
+ <td> Y </td>
+ </tr>
+ <tr>
+ <td> Java </td>
+
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-java-client-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-java-client-0.6.tar.gz</a> </td>
+ <td> Y </td>
+ <td> Y </td>
+ </tr>
+ <tr>
+ <td> Python </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz</a> </td>
+
+ <td> Y </td>
+ <td> Y </td>
+ </tr>
+ <tr>
+ <td> Ruby </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-ruby-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-ruby-0.6.tar.gz</a> </td>
+ <td> Y </td>
+
+ <td> Y </td>
+ </tr>
+ </tbody></table>
+ </div>
+
+
+ <p><b>Management tools</b></p>
+
+ <p>C+&#43; broker management</p>
+ <div>
+ <table><tbody>
+
+ <tr>
+ <th> Component </th>
+ <th> Download </th>
+ <th> AMQP 0-10 </th>
+ </tr>
+ <tr>
+ <td> cmd line (packaged with python) </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz</a> </td>
+
+ <td> Y </td>
+ </tr>
+ <tr>
+ <td> QMan JMX bridge, WS-DM </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-management-client-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-management-client-0.6.tar.gz</a> </td>
+ <td> Y </td>
+ </tr>
+ </tbody></table>
+
+ </div>
+
+
+ <p>Java broker management</p>
+ <div>
+ <table><tbody>
+ <tr>
+ <th> Component </th>
+ <th> Download </th>
+ </tr>
+ <tr>
+ <td> JMX Management Console <br /> </td>
+
+ <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-jmx-management-console-0.6-linux-gtk-x86.tar.gz">Linux x86</a> <a href="http://www.apache.org/dist/qpid/0.6//qpid-jmx-management-console-0.6-linux-gtk-x86_64.tar.gz">Linux x86_64</a> <a href="http://www.apache.org/dist/qpid/0.6//qpid-jmx-management-console-0.6-macosx.zip">Mac OS X</a> <a href="http://www.apache.org/dist/qpid/0.6//qpid-jmx-management-console-0.6-solaris-gtk-sparc.zip">Solaris 10 Sparc</a> <a href="http://www.apache.org/dist/qpid/0.6//qpid-jmx-management-console-0.6-win32-win32-x86.zip">Windows x86</a> </td>
+ </tr>
+ </tbody></table>
+ </div>
+
+
+ <h3><a name="Download-WindowsInstaller"></a>Windows Installer</h3>
+
+ <p>The Windows installer is available from <a href="http://www.riverace.com/qpid/downloads.htm">http://www.riverace.com/qpid/downloads.htm</a>. It is built from the 0.6 C+&#43; broker &amp; client and C# WCF Channel source distributions listed above. It has been tested for Windows XP SP3 and above.</p>
+
+ <h2><a name="Download-PreviousRelease"></a>Previous Release</h2>
+
+ <h3><a name="Download-MultipleComponentPackages"></a>Multiple Component Packages</h3>
+
+ <div>
+ <table><tbody>
+ <tr>
+ <th> Component </th>
+ <th> Download </th>
+ <th> AMQP 0-10 </th>
+ <th> AMQP 0-8/0-9 </th>
+ </tr>
+
+ <tr>
+ <td> Full release &amp; keys </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/">http://www.apache.org/dist/qpid/0.5/</a> </td>
+ <td> Y </td>
+ <td> Y </td>
+ </tr>
+
+ <tr>
+ <td> C+&#43; broker &amp; client </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz</a> </td>
+ <td> Y </td>
+ <td>&nbsp;</td>
+ </tr>
+
+ <tr>
+ <td> Java broker, client &amp; tools </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz</a> </td>
+ <td> client </td>
+ <td> Y </td>
+ </tr>
+
+ </tbody></table>
+ </div>
+
+
+ <h3><a name="Download-SingleComponentPackage"></a>Single Component Package</h3>
+
+ <p><b>Broker</b></p>
+ <div>
+ <table><tbody>
+ <tr>
+ <th> Language </th>
+ <th> Download </th>
+
+ <th> AMQP 0-10 </th>
+ <th> AMQP 0-8/0-9 </th>
+ </tr>
+ <tr>
+ <td> Java </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz</a> </td>
+ <td>&nbsp;</td>
+ <td> Y </td>
+
+ </tr>
+ </tbody></table>
+ </div>
+
+
+ <p><b>Client</b></p>
+ <div>
+ <table><tbody>
+ <tr>
+ <th> Language </th>
+ <th> Download </th>
+ <th> AMQP 0-10 </th>
+
+ <th> AMQP 0-8/0-9 </th>
+ </tr>
+ <tr>
+ <td> C# (.NET, WCF, Excel) 0-10 client (C+&#43; Broker Compatible) </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip</a> </td>
+ <td> Y </td>
+
+ <td>&nbsp;</td>
+ </tr>
+ <tr>
+ <td> C# (.NET) 0-8 client (Java Broker Compatible) </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip</a> </td>
+ <td>&nbsp;</td>
+ <td> Y </td>
+ </tr>
+ <tr>
+ <td> Java </td>
+
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz</a> </td>
+ <td> Y </td>
+ <td> Y </td>
+ </tr>
+ <tr>
+ <td> Python </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</a> </td>
+
+ <td> Y </td>
+ <td> Y </td>
+ </tr>
+ <tr>
+ <td> Ruby </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz</a> </td>
+ <td> Y </td>
+
+ <td> Y </td>
+ </tr>
+ </tbody></table>
+ </div>
+
+
+ <p><b>Management tools</b></p>
+
+ <p>C+&#43; broker management</p>
+ <div>
+ <table><tbody>
+
+ <tr>
+ <th> Component </th>
+ <th> Download </th>
+ <th> AMQP 0-10 </th>
+ </tr>
+ <tr>
+ <td> cmd line (packaged with python) </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</a> </td>
+
+ <td> Y </td>
+ </tr>
+ <tr>
+ <td> QMan JMX bridge, WS-DM </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz</a> </td>
+ <td> Y </td>
+ </tr>
+ </tbody></table>
+
+ </div>
+
+
+ <p>Java broker management</p>
+ <div>
+ <table><tbody>
+ <tr>
+ <th> Component </th>
+ <th> Download </th>
+ </tr>
+ <tr>
+ <td> JMX Management Console </td>
+
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86.tar.gz">Linux x86</a> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86_64.tar.gz">Linux x86_64</a> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-macosx.zip">Mac OS X</a> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-win32-win32-x86.zip">Windows x86</a> </td>
+ </tr>
+ <tr>
+ <td> Command line interface </td>
+ <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz</a> </td>
+
+ </tr>
+ </tbody></table>
+ </div>
+
+
+ <h2><a name="Download-QpidComponents.org"></a>QpidComponents.org </h2>
+
+ <p><a href="http://QpidComponents.org">QpidComponents.org</a> provides further components for Apache Qpid, including both persistence and management tools. These components are open source, but are not developed as part of the Apache Qpid project due to licensing or other restrictions.</p>
+
+ <h2><a name="Download-ContributedC%5CPackages"></a>Contributed C+&#43; Packages</h2>
+
+ <h3><a name="Download-PrebuiltLinuxPackages"></a>Pre-built Linux Packages</h3>
+
+ <h4><a name="Download-Fedora"></a>Fedora </h4>
+
+ <p>On Fedora, Qpid can be installed using yum. Because Java RPMs are not yet available in Fedora repos, the Java client is not in these distributions.</p>
+
+ <p>To install the server:</p>
+ <div><div>
+ <pre>
+# yum install qpidd
+ </pre>
+ </div></div>
+
+ <p>To install C+&#43; and Python clients:</p>
+ <div><div>
+ <pre>
+# yum install qpidc-devel
+ </pre>
+ </div></div>
+ <div><div>
+ <pre>
+# yum install amqp python-qpid
+ </pre>
+ </div></div>
+ <p>To install documentation:</p>
+ <div><div>
+
+ <pre>
+# yum install rhm-docs
+ </pre>
+ </div></div>
+ <p>To install persistence using an external store module:</p>
+ <div><div>
+ <pre>
+# yum install rhm
+ </pre>
+ </div></div>
+
+ <h3><a name="Download-WindowsInstaller"></a>Windows Installer</h3>
+
+ <p>The Windows installer is available from <a href="http://www.apache.org/dist/qpid/0.5-windows/qpidc-0.5.msi">http://www.apache.org/dist/qpid/0.5-windows/qpidc-0.5.msi</a>. It is built from the 0.5 C+&#43; broker and client source distribution listed above. It has been tested for Windows XP SP2 and above.</p>
+
+ <p>The Windows executables require the Visual C+&#43; 2008 SP1 run-time components. If the Visual C+&#43; 2008 SP1 runtime is not available, the Qpid broker will not execute. If you intend to run the broker and Visual C+&#43; 2008 is not installed, you must install the Visual C+&#43; 2008 SP1 Redistributable. Please see <a href="http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2&amp;displaylang=en">http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2&amp;displaylang=en</a> for download and installation instructions.</p>
+
+ <p>If you intend to develop Qpid client applications using this kit, you should install <a href="http://www.boostpro.com/download/boost_1_35_0_setup.exe">Boost version 1.35</a> (please be sure to select VC9 support when installing) in addition to Visual Studio 2008 SP1.</p>
+
+ <h2><a name="Download-SourceCodeRepository"></a>Source Code Repository</h2>
+
+ <p>The latest version of the code is always available in the <a href="/confluence/display/qpid/Source+Repository" title="Source Repository">Source Repository</a>.</p>
+</div>
+
diff --git a/doc/website/content/download.html~ b/doc/website/content/download.html~
new file mode 100644
index 0000000000..59c22be2af
--- /dev/null
+++ b/doc/website/content/download.html~
@@ -0,0 +1,45 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>Qpid Mailing lists</h1>
+
+<p>There are a number of lists listed below. Note when sening subscription emails it is best to have a value in the subjsct and body even if it is only 'subscribe'. This will help the ensure the email get past the spam filters.</p>
+
+<h2><a name="MailingLists-QpidUserList"></a>Qpid User List</h2>
+
+<p>The user's list is for discussions that relate to use or questions on Qpid. If you have questions about how a feature works, suggestions on additional requirements, or general questions about Qpid please use this list</p>
+
+<ul>
+ <li>To subscribe to the user's list send an e-mail with subject 'subscribe' to <a href="mailto:users-subscribe@qpid.apache.org" class="external-link" rel="nofollow">users-subscribe@qpid.apache.org</a></li>
+
+ <li>To remove yourself from the user's list send an e-mail with subject 'unsubscribe' to <a href="mailto:users-unsubscribe@qpid.apache.org" class="external-link" rel="nofollow">users-unsubscribe@qpid.apache.org</a></li>
+ <li>The user's mailing list is archived. You can view the archive at <a href="http://mail-archives.apache.org/mod_mbox/qpid-users/" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/qpid-users/</a><br/>
+Nabble achieve <a href="http://n2.nabble.com/Apache-Qpid-users-f2158936.html" class="external-link" rel="nofollow">http://n2.nabble.com/Apache-Qpid-users-f2158936.html</a></li>
+</ul>
+
+
+
+<h2><a name="MailingLists-QpidDeveloperList"></a>Qpid Developer List</h2>
+
+<p>The developer's list is for discussions that relate to the on going development of Qpid. If you have questions about how a feature is being developed, suggestions on how to implement a new feature, or requests for a new feature this is the list to use.</p>
+
+<ul>
+ <li>To subscribe to the developer's list send an e-mail with subject 'subscribe' to <a href="mailto:dev-subscribe@qpid.apache.org" class="external-link" rel="nofollow">dev-subscribe@qpid.apache.org</a></li>
+ <li>To remove yourself from the developer's list send an e-mail with subject 'unsubscribe' to <a href="mailto:dev-unsubscribe@qpid.apache.org" class="external-link" rel="nofollow">dev-unsubscribe@qpid.apache.org</a></li>
+ <li>The developer's mailing list is archived. You can view the archive at <a href="http://mail-archives.apache.org/mod_mbox/qpid-dev/" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/qpid-dev/</a></li>
+
+ <li>Nabble achieve <a href="http://www.nabble.com/Qpid-Developers-f16694.html" class="external-link" rel="nofollow">http://www.nabble.com/Qpid-Developers-f16694.html</a><br/>
+ <a href="http://n2.nabble.com/Apache-Qpid-developers-f2158895.html" class="external-link" rel="nofollow">http://n2.nabble.com/Apache-Qpid-developers-f2158895.html</a></li>
+</ul>
+
+
+<h2><a name="MailingLists-QpidCommitsList"></a>Qpid Commits List</h2>
+
+<p>The commits list is for recieving notifications about code being committed to the Qpid repository. The trafic on this list is automatically generated by Subversion. You should not post messages to this list.</p>
+
+<ul>
+
+ <li>To subscribe to the commits list send an e-mail with subject 'subscribe' to <a href="mailto:commits-subscribe@qpid.apache.org" class="external-link" rel="nofollow">commits-subscribe@qpid.apache.org</a></li>
+ <li>To remove yourself from the commits list send an e-mail with subject 'unsubscribe' to <a href="mailto:commits-unsubscribe@qpid.apache.org" class="external-link" rel="nofollow">commits-unsubscribe@qpid.apache.org</a></li>
+ <li>The commits mailing list is archived. You can view the archive at <a href="http://mail-archives.apache.org/mod_mbox/qpid-commits/" class="external-link" rel="nofollow">http://mail-archives.apache.org/mod_mbox/qpid-commits/</a></li>
+</ul>
+</div>
+
diff --git a/doc/website/content/getting_started.html b/doc/website/content/getting_started.html
new file mode 100644
index 0000000000..d39a68c2ea
--- /dev/null
+++ b/doc/website/content/getting_started.html
@@ -0,0 +1,69 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml" >
+ <h1>Getting Started with Apache Qpid</h1>
+ <p>To get started with Apache Qpid, follow the steps below.</p>
+
+ <ol>
+ <li>Download the software <a href="download.html" title="Download">Download</a></li>
+ <li>Start a broker.
+ <ul>
+ <li>Instructions for <a href="http://qpid.apache.org/getting-started-guide.html" title="Getting Started Guide">running a Qpid Java broker (AMQP 0-8, 0-9) </a></li>
+ <li>Instructions for <a href="http://qpid.apache.org/rasc.html" title="RASC">running a Qpid C++ broker (AMQP 0-10) </a></li>
+
+ <li><a href="http://qpid.apache.org/mgmtc.html" title="MgmtC++">Management tools </a> (AMQP 0-10, works with the Qpid C++ broker)</li>
+ </ul>
+ </li>
+ <li>Run an example program from the downloaded software, or from the following URLs (these are svn URLs, which you can use to browse the examples or check them out):
+ <ul>
+ <li>C++ (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/ </a></li>
+
+ <li><a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/README.txt">Running the C++ Examples </a></li>
+ </ul>
+ </li>
+ <li>Java JMS (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/ </a></li>
+ <li><a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/runSample.sh">Script for Running the Java JMS Examples </a></li>
+
+ </ul>
+ </li>
+ <li>Python (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/ </a></li>
+ <li><a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/README">Running the Python Examples </a></li>
+ </ul>
+ </li>
+
+ <li>Ruby (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/ </a></li>
+ </ul>
+ </li>
+ <li>.NET (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/">http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/ </a></li>
+
+ <li><a href="http://cwiki.apache.org/confluence/display/qpid/.NET+User+Guide">.NET Tutorial </a></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li>Read the API Guides and Documentation
+ <ul>
+ <li><a href="http://qpid.apache.org/docs/api/cpp/html/index.html">C++ Client API (AMQP 0-10) </a></li>
+
+ <li><a href="http://cwiki.apache.org/confluence/display/qpid/How+to+Use+JNDI">JNDI Configuration for Java JMS </a></li>
+ <li><a href="http://qpid.apache.org/docs/api/python/html/index.html">Python Client API (AMQP 0-10) </a></li>
+ <li><a href="/confluence/display/qpid/Documentation" title="Documentation">Documentation</a></li>
+ </ul>
+ </li>
+ <li>Get your Questions Answered
+ <ul>
+ <li>Read the <a href="/confluence/display/qpid/FAQ" title="FAQ">FAQ</a></li>
+
+ <li>Ask a question on the user list <a href="mailto:users-subscribe@qpid.apache.org">users-subscribe@qpid.apache.org</a></li>
+ </ul>
+ </li>
+ </ol>
+</div>
diff --git a/doc/website/content/getting_started.html~ b/doc/website/content/getting_started.html~
new file mode 100644
index 0000000000..a86620661e
--- /dev/null
+++ b/doc/website/content/getting_started.html~
@@ -0,0 +1,70 @@
+<div class="wiki-content" style="margin-right:10px;">
+ <!-- wiki content -->
+
+ <p>To get started with Apache Qpid, follow the steps below.</p>
+
+<ol>
+ <li>Download the software <a href="/confluence/display/qpid/Download" title="Download">Download</a></li>
+ <li>Start a broker.
+ <ul>
+ <li>Instructions for <a href="/confluence/display/qpid/Getting+Started+Guide" title="Getting Started Guide">running a Qpid Java broker (AMQP 0-8, 0-9) </a></li>
+ <li>Instructions for <a href="/confluence/display/qpid/RASC" title="RASC">running a Qpid C++ broker (AMQP 0-10) </a></li>
+
+ <li><a href="/confluence/pages/viewpage.action?pageId=82403" title="MgmtC++">Management tools </a> (AMQP 0-10, works with the Qpid C++ broker)</li>
+ </ul>
+ </li>
+ <li>Run an example program from the downloaded software, or from the following URLs (these are svn URLs, which you can use to browse the examples or check them out):
+ <ul>
+ <li>C++ (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/ </a></li>
+
+ <li><a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/README.txt" class="external-link" rel="nofollow">Running the C++ Examples </a></li>
+ </ul>
+ </li>
+ <li>Java JMS (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/ </a></li>
+ <li><a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/runSample.sh" class="external-link" rel="nofollow">Script for Running the Java JMS Examples </a></li>
+
+ </ul>
+ </li>
+ <li>Python (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/ </a></li>
+ <li><a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/README" class="external-link" rel="nofollow">Running the Python Examples </a></li>
+ </ul>
+ </li>
+
+ <li>Ruby (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/" class="external-link" rel="nofollow">https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/ </a></li>
+ </ul>
+ </li>
+ <li>.NET (AMQP 0-10):
+ <ul>
+ <li>Examples: <a href="http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/" class="external-link" rel="nofollow">http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/ </a></li>
+
+ <li><a href="http://cwiki.apache.org/confluence/display/qpid/.NET+User+Guide" class="external-link" rel="nofollow">.NET Tutorial </a></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li>Read the API Guides and Documentation
+ <ul>
+ <li><a href="http://qpid.apache.org/docs/api/cpp/html/index.html" class="external-link" rel="nofollow">C++ Client API (AMQP 0-10) </a></li>
+
+ <li><a href="http://cwiki.apache.org/confluence/display/qpid/How+to+Use+JNDI" class="external-link" rel="nofollow">JNDI Configuration for Java JMS </a></li>
+ <li><a href="http://qpid.apache.org/docs/api/python/html/index.html" class="external-link" rel="nofollow">Python Client API (AMQP 0-10) </a></li>
+ <li><a href="/confluence/display/qpid/Documentation" title="Documentation">Documentation</a></li>
+ </ul>
+ </li>
+ <li>Get your Questions Answered
+ <ul>
+ <li>Read the <a href="/confluence/display/qpid/FAQ" title="FAQ">FAQ</a></li>
+
+ <li>Ask a question on the user list <a href="mailto:users-subscribe@qpid.apache.org" class="external-link" rel="nofollow">users-subscribe@qpid.apache.org</a></li>
+ </ul>
+ </li>
+</ol>
+</div>
diff --git a/doc/website/content/home.html b/doc/website/content/home.html
new file mode 100644
index 0000000000..6ee32d1300
--- /dev/null
+++ b/doc/website/content/home.html
@@ -0,0 +1,70 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>Introduction</h1>
+ <p>Enterprise Messaging systems let programs communicate by
+ exchanging messages, much as people communicate by
+ exchanging email. Unlike email, enterprise messaging systems
+ provide guaranteed delivery, speed, security, and freedom
+ from spam. Until recently, there was no open standard for
+ Enterprise Messaging systems, so programmers either wrote
+ their own, or used expensive proprietary systems.</p>
+
+ <p>AMQP <a href="http://www.amqp.org/">Advanced Message
+ Queuing Protocol</a> is the first open standard for
+ Enterprise Messaging. It is designed to support messaging
+ for just about any distributed or business
+ application. Routing can be configured flexibly, easily
+ supporting common messaging paradigms like point-to-point,
+ fanout, publish-subscribe, and request-response.</p>
+
+ <p>Apache Qpid implements the latest AMQP specification, providing
+ transaction management, queuing, distribution, security,
+ management, clustering, federation and heterogeneous
+ multi-platform support and a lot more. And Apache Qpid is
+ extremely fast. Apache Qpid <a href="amqp-compatibility.html"
+ title="AMQP compatibility">aims to be 100% AMQP Compliant</a>.</p>
+
+ <div id="feature_box">
+ <div id="feature_box_column1">
+ <h3>AMQP Brokers</h3>
+ <ul>
+ <li><a href="#">Java Broker</a>
+ <ul>
+ <li><a href="#">Feature Guide</a></li>
+ </ul>
+ </li>
+ <li><a href="#">C++ Broker (Linux/Windows)</a>
+ <ul>
+ <li><a href="#">Feature Guide</a></li>
+ </ul>
+ </li>
+ </ul>
+ <br/>
+ <br/>
+ </div> <!-- end of feature_box_column -->
+
+ <div id="feature_box_column2">
+ <h3>AMQP Client APIs</h3>
+ <ul>
+ <li><a href="#">Java (JMS 1.1 compliant)</a></li>
+ <li><a href="#">C++ (Linux/Windows)</a></li>
+ <li><a href="#">C# .NET</a></li>
+ <li><a href="#">WCF Adapter (Windows Only)</a></li>
+ <li><a href="#">Python</a></li>
+ <li><a href="#">Ruby</a></li>
+ </ul>
+ </div> <!-- end of feature_box_column -->
+
+ <div id="feature_box_column3">
+ <h3>Qpid Management</h3>
+ <ul>
+ <li><a href="#">QMF Python API</a></li>
+ <li><a href="#">QMF C++ API</a> </li>
+ <li><a href="#">Python tools</a></li>
+ <li><a href="#">QMan (QMF&lt;=>JMX)</a></li>
+ </ul>
+ </div> <!-- end of feature_box_column -->
+
+ </div> <!-- end of feature_box -->
+
+</div> <!-- end of main_text_area_body -->
+
diff --git a/doc/website/content/images/README.txt b/doc/website/content/images/README.txt
new file mode 100644
index 0000000000..c53909bfd2
--- /dev/null
+++ b/doc/website/content/images/README.txt
@@ -0,0 +1 @@
+This directory is for images associated with content, not the images used in page templates.
diff --git a/doc/website/content/images/jprofiler.png b/doc/website/content/images/jprofiler.png
new file mode 100644
index 0000000000..7c5da2cf94
--- /dev/null
+++ b/doc/website/content/images/jprofiler.png
Binary files differ
diff --git a/doc/website/content/images/structure101.jpg b/doc/website/content/images/structure101.jpg
new file mode 100644
index 0000000000..9242ea9176
--- /dev/null
+++ b/doc/website/content/images/structure101.jpg
Binary files differ
diff --git a/doc/website/content/mailing_lists.html b/doc/website/content/mailing_lists.html
new file mode 100644
index 0000000000..f3d9fcb3c9
--- /dev/null
+++ b/doc/website/content/mailing_lists.html
@@ -0,0 +1,47 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>Qpid Mailing lists</h1>
+
+ <p>There are a number of lists listed below. Note when sening subscription emails it is best to have a value in the subjsct and body even if it is only 'subscribe'. This will help the ensure the email get past the spam filters.</p>
+
+ <h2>Qpid User List</h2>
+
+ <p>The user's list is for discussions that relate to use or questions
+ on Qpid. If you have questions about how a feature works, suggestions
+ on additional requirements, or general questions about Qpid please use
+ this list.</p>
+
+ <ul>
+ <li>To subscribe to the user's list send an e-mail with subject 'subscribe' to <a href="mailto:users-subscribe@qpid.apache.org">users-subscribe@qpid.apache.org</a></li>
+
+ <li>To remove yourself from the user's list send an e-mail with subject 'unsubscribe' to <a href="mailto:users-unsubscribe@qpid.apache.org">users-unsubscribe@qpid.apache.org</a></li>
+ <li>The user's mailing list is archived. You can view the archive at <a href="http://mail-archives.apache.org/mod_mbox/qpid-users/">http://mail-archives.apache.org/mod_mbox/qpid-users/</a><br/>
+ Nabble achieve <a href="http://n2.nabble.com/Apache-Qpid-users-f2158936.html">http://n2.nabble.com/Apache-Qpid-users-f2158936.html</a></li>
+ </ul>
+
+
+
+ <h2><a name="MailingLists-QpidDeveloperList"></a>Qpid Developer List</h2>
+
+ <p>The developer's list is for discussions that relate to the on going development of Qpid. If you have questions about how a feature is being developed, suggestions on how to implement a new feature, or requests for a new feature this is the list to use.</p>
+
+ <ul>
+ <li>To subscribe to the developer's list send an e-mail with subject 'subscribe' to <a href="mailto:dev-subscribe@qpid.apache.org">dev-subscribe@qpid.apache.org</a></li>
+ <li>To remove yourself from the developer's list send an e-mail with subject 'unsubscribe' to <a href="mailto:dev-unsubscribe@qpid.apache.org">dev-unsubscribe@qpid.apache.org</a></li>
+ <li>The developer's mailing list is archived. You can view the archive at <a href="http://mail-archives.apache.org/mod_mbox/qpid-dev/">http://mail-archives.apache.org/mod_mbox/qpid-dev/</a></li>
+
+ <li>Nabble achieve <a href="http://www.nabble.com/Qpid-Developers-f16694.html">http://www.nabble.com/Qpid-Developers-f16694.html</a><br/>
+ <a href="http://n2.nabble.com/Apache-Qpid-developers-f2158895.html">http://n2.nabble.com/Apache-Qpid-developers-f2158895.html</a></li>
+ </ul>
+
+
+ <h2><a name="MailingLists-QpidCommitsList"></a>Qpid Commits List</h2>
+
+ <p>The commits list is for recieving notifications about code being committed to the Qpid repository. The trafic on this list is automatically generated by Subversion. You should not post messages to this list.</p>
+
+ <ul>
+
+ <li>To subscribe to the commits list send an e-mail with subject 'subscribe' to <a href="mailto:commits-subscribe@qpid.apache.org">commits-subscribe@qpid.apache.org</a></li>
+ <li>To remove yourself from the commits list send an e-mail with subject 'unsubscribe' to <a href="mailto:commits-unsubscribe@qpid.apache.org">commits-unsubscribe@qpid.apache.org</a></li>
+ <li>The commits mailing list is archived. You can view the archive at <a href="http://mail-archives.apache.org/mod_mbox/qpid-commits/">http://mail-archives.apache.org/mod_mbox/qpid-commits/</a></li>
+ </ul>
+</div>
diff --git a/doc/website/content/people.html b/doc/website/content/people.html
new file mode 100644
index 0000000000..9cb7e53cb7
--- /dev/null
+++ b/doc/website/content/people.html
@@ -0,0 +1,76 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>People</h1>
+
+ <p>This page lists some of the people who have contributed to Qpid.</p>
+
+ <h2>Committers</h2>
+ <p>The people listed below have made significant contributions to
+ Qpid by working long and hard to make quality software for the rest
+ of the world to use.</p>
+
+ <p>In addition to providing us contribuions, or being commmitters
+ some of the following people are also members of the Project
+ Management Committee (PMC). Refer to the How the ASF works for
+ details on meritocracy.</p>
+
+ <p>If you would like to contribute to Qpid please look at the Get
+ Involved page to see how you can contribute.</p>
+
+ <div>
+ <ul>
+ <li>Aidan Skinner</li>
+ <li>Alan Conway</li>
+ <li>Andrea Gazzarini</li>
+ <li>Andrew Stitcher</li>
+ <li>Arnaud Simon</li>
+ <li>Carl Trieloff</li>
+ <li>Gordon Sim</li>
+ <li>Jim Meyering</li>
+ <li>John O'Hara</li>
+ <li>Jonathan Robie</li>
+ <li>Ken Giusti</li>
+ <li>Kim van der Riet</li>
+ <li>Lahiru Gunathilake</li>
+ <li>Manuel Teira</li>
+ <li>Marnie McCormack</li>
+ <li>Martin Ritchie</li>
+ <li>Michael Goulish</li>
+ <li>Nuno Santos</li>
+ <li>Paul Fremantle</li>
+ <li>Rafael Schloming</li>
+ <li>Rajith Attapattu</li>
+ <li>Robbie Gemmell</li>
+ <li>Robert Godfrey</li>
+ <li>Robert Greig</li>
+ <li>Rupert Smith</li>
+ <li>Steve Huston</li>
+ <li>Ted Ross</li>
+ <li>Yoav Shapira</li>
+ </ul>
+ </div>
+
+ <h2>Contributors</h2>
+
+
+ <p>Many thanks to the following people for providing contributions:</p>
+
+ <ul>
+ <li>Colin Crist</li>
+ <li>Bhupendra Bhardwaj</li>
+ <li>Kevin Smith</li>
+ <li>Steve Vinoski</li>
+ <li>Steven Shaw</li>
+ <li>Tomas Restrepo</li>
+</li>
+
+<h2>Mentors</h2>
+
+<p>And many thanks to our project's mentors:</p>
+
+<ul>
+ <li>Cliff Schmidt</li>
+ <li>Craig Russell</li>
+ <li>Paul Fremantle</li>
+ <li>Yoav Shapira</li>
+ <li>Scott Deboy</li>
+</ul>
diff --git a/doc/website/content/people.html~ b/doc/website/content/people.html~
new file mode 100644
index 0000000000..367819461e
--- /dev/null
+++ b/doc/website/content/people.html~
@@ -0,0 +1,92 @@
+<div class="wiki-content" style="margin-right:10px;">
+ <h1><a name="People-ApacheQpidCommitters"></a>Apache Qpid Committers</h1>
+
+<p>The people listed below have made significant contributions to Qpid by working long and hard to make quality software for the rest of the world to use.</p>
+
+<p>In addition to providing us contribuions, or being commmitters some of the following people are also members of the Project Management Committee (PMC). Refer to the How the ASF works for details on meritocracy.</p>
+
+<p>If you would like to contribute to Qpid please look at the Get Involved page to see how you can contribute.</p>
+
+
+<div class='table-wrap'>
+<table class='confluenceTable'><tbody>
+<tr>
+<td class='confluenceTd'>Aidan Skinner</td>
+<td class='confluenceTd'>Alan Conway</td>
+
+<td class='confluenceTd'>Arnaud Simon</td>
+<td class='confluenceTd'>Andrea Gazzarini</td>
+</tr>
+<tr>
+<td class='confluenceTd'>Andrew Stitcher</td>
+<td class='confluenceTd'>Carl Trieloff</td>
+<td class='confluenceTd'>Gordon Sim</td>
+<td class='confluenceTd'>Jim Meyering</td>
+</tr>
+<tr>
+<td class='confluenceTd'>Ken Giusti</td>
+
+<td class='confluenceTd'>John O'Hara</td>
+<td class='confluenceTd'>Jonathan Robie</td>
+<td class='confluenceTd'>Kim van der Riet</td>
+</tr>
+<tr>
+<td class='confluenceTd'>Lahiru Gunathilake</td>
+<td class='confluenceTd'>Manuel Teira</td>
+<td class='confluenceTd'>Marnie McCormack</td>
+<td class='confluenceTd'>Martin Ritchie</td>
+</tr>
+
+<tr>
+<td class='confluenceTd'>Michael Goulish</td>
+<td class='confluenceTd'>Nuno Santos</td>
+<td class='confluenceTd'>Paul Fremantle</td>
+<td class='confluenceTd'>Rafael Schloming</td>
+</tr>
+<tr>
+<td class='confluenceTd'>Rajith Attapattu</td>
+<td class='confluenceTd'>Robbie Gemmell</td>
+<td class='confluenceTd'>Robert Godfrey</td>
+
+<td class='confluenceTd'>Robert Greig</td>
+</tr>
+<tr>
+<td class='confluenceTd'>Rupert Smith</td>
+<td class='confluenceTd'>Steve Huston</td>
+<td class='confluenceTd'>Ted Ross</td>
+<td class='confluenceTd'>Yoav Shapira</td>
+</tr>
+</tbody></table>
+</div>
+
+
+<p>Many thanks to the following people for providing contributions:</p>
+
+<div class='table-wrap'>
+<table class='confluenceTable'><tbody>
+<tr>
+<td class='confluenceTd'>Colin Crist</td>
+<td class='confluenceTd'>Bhupendra Bhardwaj</td>
+<td class='confluenceTd'>Kevin Smith</td>
+<td class='confluenceTd'>Steve Vinoski</td>
+</tr>
+<tr>
+<td class='confluenceTd'>Steven Shaw</td>
+
+<td class='confluenceTd'>Tomas Restrepo</td>
+<td class='confluenceTd'>&nbsp;</td>
+<td class='confluenceTd'>&nbsp;</td>
+</tr>
+</tbody></table>
+</div>
+
+
+<p>And many thanks to our project's mentors:</p>
+
+<p>Scott Deboy<br/>
+Paul Fremantle<br/>
+Craig Russell<br/>
+
+Cliff Schmidt<br/>
+Yoav Shapira</p>
+</div>
diff --git a/doc/website/content/qpid_integrated_with.html b/doc/website/content/qpid_integrated_with.html
new file mode 100644
index 0000000000..4734901f69
--- /dev/null
+++ b/doc/website/content/qpid_integrated_with.html
@@ -0,0 +1,20 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+
+ <h1><a name="QpidIntegrations-AMQPintegrations"></a>AMQP integrations </h1>
+
+ <ul>
+ <li><a href="/confluence/display/qpid/HermesJMS" title="HermesJMS">HermesJMS</a> - The integration of Hermes JMS with Qpid</li>
+ <li>Twisted AMQP - <a href="https://launchpad.net/txamqp" class="external-link" rel="nofollow">https://launchpad.net/txamqp</a></li>
+ <li>Apache Camel - <a href="http://activemq.apache.org/camel/amqp.html" class="external-link" rel="nofollow">http://activemq.apache.org/camel/amqp.html</a></li>
+ <li>Apache Axis2 Java - <a href="http://wso2.org/library/3663" class="external-link" rel="nofollow">http://wso2.org/library/3663</a></li>
+
+ <li>Apache Axis2 C - <a href="http://ws.apache.org/axis2/c/docs/axis2c_manual.html#amqptrans" class="external-link" rel="nofollow">http://ws.apache.org/axis2/c/docs/axis2c_manual.html#amqptrans</a></li>
+ <li>Apache Synapse</li>
+ <li>libvirt - <a href="http://libvirt.org/" class="external-link" rel="nofollow">http://libvirt.org/</a> Provides QMF access to visualization</li>
+ <li>Ovirt - <a href="http://ovirt.org/" class="external-link" rel="nofollow">http://ovirt.org/</a> QMFC - used to build management tools</li>
+
+ <li>Python web plugin - Plug-in for AMQP support from web browser</li>
+ <li>Red Hat MRG - <a href="http://redhat.com/mrg" class="external-link" rel="nofollow">http://redhat.com/mrg</a> Distro of Qpid with added management console and persistence</li>
+ <li>Condor - <a href="http://www.cs.wisc.edu/condor/" class="external-link" rel="nofollow">http://www.cs.wisc.edu/condor/</a> QMF Agents and AMQP job routing</li>
+ </ul>
+</div>
diff --git a/doc/website/content/qpid_integrated_with.html~ b/doc/website/content/qpid_integrated_with.html~
new file mode 100644
index 0000000000..181c0b7c49
--- /dev/null
+++ b/doc/website/content/qpid_integrated_with.html~
@@ -0,0 +1,20 @@
+<div class="wiki-content" style="margin-right:10px;">
+ <!-- wiki content -->
+ <h3><a name="QpidIntegrations-AMQPintegrations"></a>AMQP integrations </h3>
+
+ <ul>
+ <li><a href="/confluence/display/qpid/HermesJMS" title="HermesJMS">HermesJMS</a> - The integration of Hermes JMS with Qpid</li>
+ <li>Twisted AMQP - <a href="https://launchpad.net/txamqp" class="external-link" rel="nofollow">https://launchpad.net/txamqp</a></li>
+ <li>Apache Camel - <a href="http://activemq.apache.org/camel/amqp.html" class="external-link" rel="nofollow">http://activemq.apache.org/camel/amqp.html</a></li>
+ <li>Apache Axis2 Java - <a href="http://wso2.org/library/3663" class="external-link" rel="nofollow">http://wso2.org/library/3663</a></li>
+
+ <li>Apache Axis2 C - <a href="http://ws.apache.org/axis2/c/docs/axis2c_manual.html#amqptrans" class="external-link" rel="nofollow">http://ws.apache.org/axis2/c/docs/axis2c_manual.html#amqptrans</a></li>
+ <li>Apache Synapse</li>
+ <li>libvirt - <a href="http://libvirt.org/" class="external-link" rel="nofollow">http://libvirt.org/</a> Provides QMF access to visualization</li>
+ <li>Ovirt - <a href="http://ovirt.org/" class="external-link" rel="nofollow">http://ovirt.org/</a> QMFC - used to build management tools</li>
+
+ <li>Python web plugin - Plug-in for AMQP support from web browser</li>
+ <li>Red Hat MRG - <a href="http://redhat.com/mrg" class="external-link" rel="nofollow">http://redhat.com/mrg</a> Distro of Qpid with added management console and persistence</li>
+ <li>Condor - <a href="http://www.cs.wisc.edu/condor/" class="external-link" rel="nofollow">http://www.cs.wisc.edu/condor/</a> QMF Agents and AMQP job routing</li>
+ </ul>
+</div>
diff --git a/doc/website/content/source_repository.html b/doc/website/content/source_repository.html
new file mode 100644
index 0000000000..c900b2d760
--- /dev/null
+++ b/doc/website/content/source_repository.html
@@ -0,0 +1,54 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>Source Code Repositories</h1>
+ <h2>Web Browsing of SVN</h2>
+
+ <p>To browse via the web use the ViewVC interface:</p>
+
+ <p><a href="http://svn.apache.org/viewvc/qpid/trunk/qpid">http://svn.apache.org/viewvc/qpid/trunk/qpid</a></p>
+
+ <p>Or to browse the source tree directly:</p>
+
+ <p><a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid">https://svn.apache.org/repos/asf/qpid/trunk/qpid</a></p>
+
+ <h2>Checking out from SVN</h2>
+
+ <p>The source code can be checked out anonymous over HTTP:</p>
+
+ <pre>
+svn co http://svn.apache.org/repos/asf/qpid/trunk
+ </pre>
+
+
+ <p>Committers can check out the code using HTTPS:</p>
+
+ <pre>
+svn co https://svn.apache.org/repos/asf/qpid/trunk
+ </pre>
+
+ <h2>Read only GIT repo</h2>
+
+ <p>A read only GIT repo is available:</p>
+
+ <p>It can be cloned with</p>
+ <pre>
+git clone git://git.apache.org/qpid.git qpid
+ </pre>
+
+ <p>or</p>
+
+<pre>
+git clone http://git.apache.org/qpid.git qpid
+</pre>
+
+ <p>and then git pull will fetch updates.</p>
+
+ <p>If you have commit access it is also possible to commit back with git svn dcommit by following the instructions on the <a href="http://wiki.apache.org/general/GitAtApache">GitAtApache</a> page.</p>
+
+ <h2>Setting up your subversion client</h2>
+
+ <p>When adding files to subversion, it's important that your subversion client is properly setup to the appropriate subversion properties are set. The client can do it automatically by modifying the auto-props section of the subversion config file. Use the contents of:</p>
+
+<pre>
+http://svn.apache.org/repos/asf/qpid/trunk/etc/svn-auto-props
+</pre>
+</div>
diff --git a/doc/website/content/source_repository.html~ b/doc/website/content/source_repository.html~
new file mode 100644
index 0000000000..b616239ba3
--- /dev/null
+++ b/doc/website/content/source_repository.html~
@@ -0,0 +1,60 @@
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+
+ <h2>Web Browsing of SVN</h2>
+
+ <p>To browse via the web use the ViewVC interface:</p>
+
+ <p><a href="http://svn.apache.org/viewvc/qpid/trunk/qpid">http://svn.apache.org/viewvc/qpid/trunk/qpid</a></p>
+
+<p>Or to browse the source tree directly:</p>
+
+<p><a href="https://svn.apache.org/repos/asf/qpid/trunk/qpid">https://svn.apache.org/repos/asf/qpid/trunk/qpid</a></p>
+
+<h3><a name="SourceRepository-CheckingoutfromSVN"></a>Checking out from SVN</h3>
+
+<p>The source code can be checked out anonymous over HTTP by doign:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+svn co http:<span class="code-comment">//svn.apache.org/repos/asf/qpid/trunk</span>
+</pre>
+</div></div>
+
+<p>Committers can check out the code over HTTPS:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+svn co https:<span class="code-comment">//svn.apache.org/repos/asf/qpid/trunk</span>
+</pre>
+</div></div>
+
+<h2><a name="SourceRepository-ReadonlyGITrepo"></a>Read only GIT repo</h2>
+
+<p>A read only GIT repo is available:</p>
+
+<p>It can be cloned with</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+git clone git:<span class="code-comment">//git.apache.org/qpid.git qpid</span>
+</pre>
+</div></div>
+
+<p>or </p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+git clone http:<span class="code-comment">//git.apache.org/qpid.git qpid</span>
+</pre>
+</div></div>
+
+<p>and then git pull will fetch updates.</p>
+
+<p>If you have commit access it is also possible to commit back with git svn dcommit by following the instructions on the <a href="http://wiki.apache.org/general/GitAtApache">GitAtApache</a> page.</p>
+
+<h2>Setting up your subversion client</h2>
+
+<p>When adding files to subversion, it's important that your subversion client is properly setup to the appropriate subversion properties are set. The client can do it automatically by modifying the auto-props section of the subversion config file. Use the contents of:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+http:<span class="code-comment">//svn.apache.org/repos/asf/qpid/trunk/etc/svn-auto-props</span>
+</pre>
+</div></div>
+</div>
diff --git a/doc/website/example/images/asf-logo.png b/doc/website/example/images/asf-logo.png
new file mode 100644
index 0000000000..d824fab768
--- /dev/null
+++ b/doc/website/example/images/asf-logo.png
Binary files differ
diff --git a/doc/website/example/images/asf_logo.gif b/doc/website/example/images/asf_logo.gif
new file mode 100644
index 0000000000..22eb9d7358
--- /dev/null
+++ b/doc/website/example/images/asf_logo.gif
Binary files differ
diff --git a/doc/website/example/images/header.png b/doc/website/example/images/header.png
new file mode 100644
index 0000000000..9cd149fb29
--- /dev/null
+++ b/doc/website/example/images/header.png
Binary files differ
diff --git a/doc/website/example/images/main_body.png b/doc/website/example/images/main_body.png
new file mode 100644
index 0000000000..a29bdeecd6
--- /dev/null
+++ b/doc/website/example/images/main_body.png
Binary files differ
diff --git a/doc/website/example/images/main_bottom.png b/doc/website/example/images/main_bottom.png
new file mode 100644
index 0000000000..319288a717
--- /dev/null
+++ b/doc/website/example/images/main_bottom.png
Binary files differ
diff --git a/doc/website/example/images/main_top.png b/doc/website/example/images/main_top.png
new file mode 100644
index 0000000000..ffefe05a8d
--- /dev/null
+++ b/doc/website/example/images/main_top.png
Binary files differ
diff --git a/doc/website/example/images/menu_body.png b/doc/website/example/images/menu_body.png
new file mode 100644
index 0000000000..39b2e22205
--- /dev/null
+++ b/doc/website/example/images/menu_body.png
Binary files differ
diff --git a/doc/website/example/images/menu_bottom.png b/doc/website/example/images/menu_bottom.png
new file mode 100644
index 0000000000..21bd16aeba
--- /dev/null
+++ b/doc/website/example/images/menu_bottom.png
Binary files differ
diff --git a/doc/website/example/images/menu_top.png b/doc/website/example/images/menu_top.png
new file mode 100644
index 0000000000..dea7164ef0
--- /dev/null
+++ b/doc/website/example/images/menu_top.png
Binary files differ
diff --git a/doc/website/example/images/qpid-logo-900x480.png b/doc/website/example/images/qpid-logo-900x480.png
new file mode 100644
index 0000000000..3e12816142
--- /dev/null
+++ b/doc/website/example/images/qpid-logo-900x480.png
Binary files differ
diff --git a/doc/website/example/images/qpid-logo.png b/doc/website/example/images/qpid-logo.png
new file mode 100644
index 0000000000..f6d4bfdbad
--- /dev/null
+++ b/doc/website/example/images/qpid-logo.png
Binary files differ
diff --git a/doc/website/example/index.html b/doc/website/example/index.html
new file mode 100644
index 0000000000..308ac94765
--- /dev/null
+++ b/doc/website/example/index.html
@@ -0,0 +1,185 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.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 xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Apache Qpid: Open Source AMQP Messaging</title>
+ <link href="style.css" rel="stylesheet" type="text/css"/>
+ </head>
+
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="logo">
+ <h1>Apache Qpid</h1>
+ <h2>Open Source AMQP Messaging</h2>
+ </div>
+ </div> <!-- end of header -->
+
+ <div id="menu_box">
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Apache Qpid</h3>
+ <ul>
+ <li><a href="#">Home</a></li>
+ <li><a href="#">Download</a></li>
+ <li><a href="#">Getting Started</a></li>
+ <li><a href="#">Roadmap</a></li>
+ <li><a href="#">License</a></li>
+ <li><a href="#">FAQ</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Documentation</h3>
+ <ul>
+ <li><a href="#">Version 0.6</a></li>
+ <li><a href="#">Version 0.5</a></li>
+ <li><a href="#">Archive</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Community</h3>
+ <ul>
+ <li><a href="#">Getting Involved</a></li>
+ <li><a href="#">Source Repository</a></li>
+ <li><a href="#">Mailing Lists</a></li>
+ <li><a href="#">Wiki</a></li>
+ <li><a href="#">Issue Reporting</a></li>
+ <li><a href="#">People</a></li>
+ <li><a href="#">Project Status</a></li>
+ <li><a href="#">Acknowledgements</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Developers</h3>
+ <ul>
+ <li><a href="#">Building Qpid</a></li>
+ <li><a href="#">Developer Pages</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>About AMQP</h3>
+ <ul>
+ <li><a href="#">What is AMQP?</a></li>
+ <li><a href="#">Specification</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ </div> <!-- end of menu_box -->
+
+ <div id="main_text_area">
+ <div id="main_text_area_top"></div>
+
+<div id="main_text_area_body" xmlns="http://www.w3.org/1999/xhtml">
+ <h1>Introduction</h1>
+ <p>Enterprise Messaging systems let programs communicate by
+ exchanging messages, much as people communicate by
+ exchanging email. Unlike email, enterprise messaging systems
+ provide guaranteed delivery, speed, security, and freedom
+ from spam. Until recently, there was no open standard for
+ Enterprise Messaging systems, so programmers either wrote
+ their own, or used expensive proprietary systems.</p>
+
+ <p>AMQP <a href="http://www.amqp.org/">Advanced Message
+ Queuing Protocol</a> is the first open standard for
+ Enterprise Messaging. It is designed to support messaging
+ for just about any distributed or business
+ application. Routing can be configured flexibly, easily
+ supporting common messaging paradigms like point-to-point,
+ fanout, publish-subscribe, and request-response.</p>
+
+ <p>Apache Qpid implements the latest AMQP specification, providing
+ transaction management, queuing, distribution, security,
+ management, clustering, federation and heterogeneous
+ multi-platform support and a lot more. And Apache Qpid is
+ extremely fast. Apache Qpid <a href="amqp-compatibility.html"
+ title="AMQP compatibility">aims to be 100% AMQP Compliant</a>.</p>
+
+ <div id="feature_box">
+ <div id="feature_box_column1">
+ <h3>AMQP Brokers</h3>
+ <ul>
+ <li><a href="#">Java Broker</a>
+ <ul>
+ <li><a href="#">Feature Guide</a></li>
+ </ul>
+ </li>
+ <li><a href="#">C++ Broker (Linux/Windows)</a>
+ <ul>
+ <li><a href="#">Feature Guide</a></li>
+ </ul>
+ </li>
+ </ul>
+ <br/>
+ <br/>
+ </div> <!-- end of feature_box_column -->
+
+ <div id="feature_box_column2">
+ <h3>AMQP Client APIs</h3>
+ <ul>
+ <li><a href="#">Java (JMS 1.1 compliant)</a></li>
+ <li><a href="#">C++ (Linux/Windows)</a></li>
+ <li><a href="#">C# .NET</a></li>
+ <li><a href="#">WCF Adapter (Windows Only)</a></li>
+ <li><a href="#">Python</a></li>
+ <li><a href="#">Ruby</a></li>
+ </ul>
+ </div> <!-- end of feature_box_column -->
+
+ <div id="feature_box_column3">
+ <h3>Qpid Management</h3>
+ <ul>
+ <li><a href="#">QMF Python API</a></li>
+ <li><a href="#">QMF C++ API</a> </li>
+ <li><a href="#">Python tools</a></li>
+ <li><a href="#">QMan (QMF&lt;=>JMX)</a></li>
+ </ul>
+ </div> <!-- end of feature_box_column -->
+
+ </div> <!-- end of feature_box -->
+
+</div> <!-- end of main_text_area_body -->
+
+
+ <div id="main_text_area_bottom"></div>
+ </div> <!-- end of main_text_area -->
+
+ <div id="footer">
+ Apache Qpid, Enterprise AMQP Messaging &#xA9; 2004-2010 The Apache Software Foundation.
+ </div>
+
+ </div>
+ </body>
+</html>
diff --git a/doc/website/example/style.css b/doc/website/example/style.css
new file mode 100644
index 0000000000..4df0bd3c71
--- /dev/null
+++ b/doc/website/example/style.css
@@ -0,0 +1,244 @@
+ul {
+ list-style-type:square;
+}
+
+th {
+ text-align: left;
+ font-weight: bold;
+}
+
+
+#body {
+ margin:0;
+ background:#FFFFFF;
+ font-family:"Verdana", sans-serif;
+}
+
+#container {
+ width:950px;
+ margin:0 auto;
+}
+
+#header {
+ height:100px;
+ width:950px;
+ background:url(images/header.png)
+}
+
+#logo {
+ text-align:center;
+ font-weight:600;
+ padding:0 0 0 0;
+ font-size:14px;
+ font-family:"Verdana", cursive;
+}
+
+#logo a {
+ color:#000000;
+ text-decoration:none;
+}
+
+#main_text_area {
+ margin-left:200px;
+}
+
+#main_text_area_top {
+ height:14px;
+ font-size:1px;
+}
+
+#main_text_area_bottom {
+ height:14px;
+ font-size:1px;
+ margin-bottom:4px;
+}
+
+#main_text_area_body {
+ padding:5px 24px;
+}
+
+#main_text_area_body p {
+ text-align:justify;
+}
+
+#main_text_area br {
+ line-height:10px;
+}
+
+#main_text_area h1 {
+ font-size:28px;
+ font-weight:600;
+ margin:0 0 24px 0;
+ color:#0c3b82;
+ font-family:"Verdana", Times, serif;
+}
+
+#main_text_area h2 {
+ font-size:24px;
+ font-weight:600;
+ margin:24px 0 8px 0;
+ color:#0c3b82;
+ font-family:"Verdana",Times, serif;
+}
+
+#main_text_area ol, #main_text_area ul {
+ padding:0;
+ margin:10px 0;
+ margin-left:20px;
+}
+
+#main_text_area li {
+/* margin-left:40px; */
+}
+
+#main_text_area, #menu_box {
+ font-size:13px;
+ line-height:17px;
+ color:#000000;
+}
+
+#main_text_area {
+ font-size:15px;
+}
+
+#main_text_area a {
+ color:#000000;
+}
+
+#main_text_area a:hover {
+ color:#000000;
+}
+
+#menu_box {
+ width:196px;
+ float:left;
+ margin-left:4px;
+}
+
+#menu_box_top {
+ background:url(images/menu_top.png) no-repeat;
+ height:14px;
+ font-size:1px;
+}
+
+#menu_box_body {
+ background:url(images/menu_body.png) repeat-y;
+ padding:5px 24px 5px 24px;
+}
+
+#menu_box_bottom {
+ background:url(images/menu_bottom.png) no-repeat;
+ height:14px;
+ font-size:1px;
+ margin-bottom:1px;
+}
+
+#menu_box h3 {
+ font-size:20px;
+ font-weight:500;
+ margin:0 0 8px 0;
+ color:#0c3b82;
+ font-family:"Verdana",Times, serif;
+}
+
+#menu_box ul {
+ margin:12px;
+ padding:0px;
+}
+
+#menu_box li {
+ list-style:square;
+}
+
+#menu_box a {
+ color:#000000;
+ text-decoration:none;
+}
+
+#menu_box a:hover {
+ color:#000000;
+ text-decoration:underline;
+}
+
+#feature_box {
+ width:750px;
+ repeat-y;
+ overflow:hidden;
+}
+
+#feature_box h3 {
+ font-size:18px;
+ font-weight:600;
+ margin:0 0 8px 0;
+ color:#0c3b82;
+ font-family:"Verdana", Times, serif;
+}
+
+#feature_box_column1 {
+ width:196px;
+ float:left;
+ padding:10px 15px 10px 15px;
+ margin-left:0px;
+}
+
+#feature_box_column2 {
+ width:196px;
+ float:left;
+ padding:10px 15px 10px 15px;
+ margin-left:0px;
+}
+
+#feature_box_column3 {
+ width:196px;
+ float:left;
+ padding:10px 15px 10px 15px;
+ margin-left:0px;
+}
+
+#feature_box ul {
+ margin:.8em .4em;
+ padding-left:1.2em;
+ padding:0;
+ list-style-type: square;
+}
+
+#feature_box ul li {
+ font-family:"Verdana",sans-serif;
+ font-size:14px;
+ color:#000;
+ margin:.4em 0;
+}
+
+#feature_box ul li ul {
+ padding-left:1.2em;
+ margin-left:2em;
+}
+
+#feature_box a {
+ color:#000000;
+ text-decoration:none;
+}
+
+#feature_box a:hover {
+ color:#000000;
+ text-decoration:underline;
+}
+
+#footer {
+ color:#000000;
+ clear:both;
+ text-align:center;
+ font-size:11px;
+ line-height:17px;
+ height:45px;
+ padding-top:18px;
+}
+
+#footer a {
+ color:#000000;
+}
+
+#footer a:hover {
+ color:#000000;
+}
+
diff --git a/doc/website/index.html b/doc/website/index.html
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/doc/website/index.html
diff --git a/doc/website/template.html b/doc/website/template.html
new file mode 100644
index 0000000000..750f74409f
--- /dev/null
+++ b/doc/website/template.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.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 xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Apache Qpid: Open Source AMQP Messaging</title>
+ <link href="style.css" rel="stylesheet" type="text/css"/>
+ </head>
+
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="logo">
+ <h1>Apache Qpid</h1>
+ <h2>Open Source AMQP Messaging</h2>
+ </div>
+ </div> <!-- end of header -->
+
+ <div id="menu_box">
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Apache Qpid</h3>
+ <ul>
+ <li><a href="#">Home</a></li>
+ <li><a href="#">Download</a></li>
+ <li><a href="#">Getting Started</a></li>
+ <li><a href="#">Roadmap</a></li>
+ <li><a href="#">License</a></li>
+ <li><a href="#">FAQ</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Documentation</h3>
+ <ul>
+ <li><a href="#">Version 0.6</a></li>
+ <li><a href="#">Version 0.5</a></li>
+ <li><a href="#">Archive</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Community</h3>
+ <ul>
+ <li><a href="#">Getting Involved</a></li>
+ <li><a href="#">Source Repository</a></li>
+ <li><a href="#">Mailing Lists</a></li>
+ <li><a href="#">Wiki</a></li>
+ <li><a href="#">Issue Reporting</a></li>
+ <li><a href="#">People</a></li>
+ <li><a href="#">Project Status</a></li>
+ <li><a href="#">Acknowledgements</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Developers</h3>
+ <ul>
+ <li><a href="#">Building Qpid</a></li>
+ <li><a href="#">Developer Pages</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>About AMQP</h3>
+ <ul>
+ <li><a href="#">What is AMQP?</a></li>
+ <li><a href="#">Specification</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ </div> <!-- end of menu_box -->
+
+ <div id="main_text_area">
+ <div id="main_text_area_top"></div>
+{.}
+ </div>
+
+ <div id="footer">
+ Apache Qpid, Enterprise AMQP Messaging &#xA9; 2004-2010 The Apache Software Foundation.
+ </div>
+
+ </div>
+ </body>
+</html>
diff --git a/doc/website/template/images/asf-logo.png b/doc/website/template/images/asf-logo.png
new file mode 100644
index 0000000000..d824fab768
--- /dev/null
+++ b/doc/website/template/images/asf-logo.png
Binary files differ
diff --git a/doc/website/template/images/asf_logo.gif b/doc/website/template/images/asf_logo.gif
new file mode 100644
index 0000000000..22eb9d7358
--- /dev/null
+++ b/doc/website/template/images/asf_logo.gif
Binary files differ
diff --git a/doc/website/template/images/header.png b/doc/website/template/images/header.png
new file mode 100644
index 0000000000..9cd149fb29
--- /dev/null
+++ b/doc/website/template/images/header.png
Binary files differ
diff --git a/doc/website/template/images/main_body.png b/doc/website/template/images/main_body.png
new file mode 100644
index 0000000000..a29bdeecd6
--- /dev/null
+++ b/doc/website/template/images/main_body.png
Binary files differ
diff --git a/doc/website/template/images/main_bottom.png b/doc/website/template/images/main_bottom.png
new file mode 100644
index 0000000000..319288a717
--- /dev/null
+++ b/doc/website/template/images/main_bottom.png
Binary files differ
diff --git a/doc/website/template/images/main_top.png b/doc/website/template/images/main_top.png
new file mode 100644
index 0000000000..ffefe05a8d
--- /dev/null
+++ b/doc/website/template/images/main_top.png
Binary files differ
diff --git a/doc/website/template/images/menu_body.png b/doc/website/template/images/menu_body.png
new file mode 100644
index 0000000000..39b2e22205
--- /dev/null
+++ b/doc/website/template/images/menu_body.png
Binary files differ
diff --git a/doc/website/template/images/menu_bottom.png b/doc/website/template/images/menu_bottom.png
new file mode 100644
index 0000000000..21bd16aeba
--- /dev/null
+++ b/doc/website/template/images/menu_bottom.png
Binary files differ
diff --git a/doc/website/template/images/menu_top.png b/doc/website/template/images/menu_top.png
new file mode 100644
index 0000000000..dea7164ef0
--- /dev/null
+++ b/doc/website/template/images/menu_top.png
Binary files differ
diff --git a/doc/website/template/images/qpid-logo-900x480.png b/doc/website/template/images/qpid-logo-900x480.png
new file mode 100644
index 0000000000..3e12816142
--- /dev/null
+++ b/doc/website/template/images/qpid-logo-900x480.png
Binary files differ
diff --git a/doc/website/template/images/qpid-logo.png b/doc/website/template/images/qpid-logo.png
new file mode 100644
index 0000000000..f6d4bfdbad
--- /dev/null
+++ b/doc/website/template/images/qpid-logo.png
Binary files differ
diff --git a/doc/website/template/style.css b/doc/website/template/style.css
new file mode 100644
index 0000000000..4df0bd3c71
--- /dev/null
+++ b/doc/website/template/style.css
@@ -0,0 +1,244 @@
+ul {
+ list-style-type:square;
+}
+
+th {
+ text-align: left;
+ font-weight: bold;
+}
+
+
+#body {
+ margin:0;
+ background:#FFFFFF;
+ font-family:"Verdana", sans-serif;
+}
+
+#container {
+ width:950px;
+ margin:0 auto;
+}
+
+#header {
+ height:100px;
+ width:950px;
+ background:url(images/header.png)
+}
+
+#logo {
+ text-align:center;
+ font-weight:600;
+ padding:0 0 0 0;
+ font-size:14px;
+ font-family:"Verdana", cursive;
+}
+
+#logo a {
+ color:#000000;
+ text-decoration:none;
+}
+
+#main_text_area {
+ margin-left:200px;
+}
+
+#main_text_area_top {
+ height:14px;
+ font-size:1px;
+}
+
+#main_text_area_bottom {
+ height:14px;
+ font-size:1px;
+ margin-bottom:4px;
+}
+
+#main_text_area_body {
+ padding:5px 24px;
+}
+
+#main_text_area_body p {
+ text-align:justify;
+}
+
+#main_text_area br {
+ line-height:10px;
+}
+
+#main_text_area h1 {
+ font-size:28px;
+ font-weight:600;
+ margin:0 0 24px 0;
+ color:#0c3b82;
+ font-family:"Verdana", Times, serif;
+}
+
+#main_text_area h2 {
+ font-size:24px;
+ font-weight:600;
+ margin:24px 0 8px 0;
+ color:#0c3b82;
+ font-family:"Verdana",Times, serif;
+}
+
+#main_text_area ol, #main_text_area ul {
+ padding:0;
+ margin:10px 0;
+ margin-left:20px;
+}
+
+#main_text_area li {
+/* margin-left:40px; */
+}
+
+#main_text_area, #menu_box {
+ font-size:13px;
+ line-height:17px;
+ color:#000000;
+}
+
+#main_text_area {
+ font-size:15px;
+}
+
+#main_text_area a {
+ color:#000000;
+}
+
+#main_text_area a:hover {
+ color:#000000;
+}
+
+#menu_box {
+ width:196px;
+ float:left;
+ margin-left:4px;
+}
+
+#menu_box_top {
+ background:url(images/menu_top.png) no-repeat;
+ height:14px;
+ font-size:1px;
+}
+
+#menu_box_body {
+ background:url(images/menu_body.png) repeat-y;
+ padding:5px 24px 5px 24px;
+}
+
+#menu_box_bottom {
+ background:url(images/menu_bottom.png) no-repeat;
+ height:14px;
+ font-size:1px;
+ margin-bottom:1px;
+}
+
+#menu_box h3 {
+ font-size:20px;
+ font-weight:500;
+ margin:0 0 8px 0;
+ color:#0c3b82;
+ font-family:"Verdana",Times, serif;
+}
+
+#menu_box ul {
+ margin:12px;
+ padding:0px;
+}
+
+#menu_box li {
+ list-style:square;
+}
+
+#menu_box a {
+ color:#000000;
+ text-decoration:none;
+}
+
+#menu_box a:hover {
+ color:#000000;
+ text-decoration:underline;
+}
+
+#feature_box {
+ width:750px;
+ repeat-y;
+ overflow:hidden;
+}
+
+#feature_box h3 {
+ font-size:18px;
+ font-weight:600;
+ margin:0 0 8px 0;
+ color:#0c3b82;
+ font-family:"Verdana", Times, serif;
+}
+
+#feature_box_column1 {
+ width:196px;
+ float:left;
+ padding:10px 15px 10px 15px;
+ margin-left:0px;
+}
+
+#feature_box_column2 {
+ width:196px;
+ float:left;
+ padding:10px 15px 10px 15px;
+ margin-left:0px;
+}
+
+#feature_box_column3 {
+ width:196px;
+ float:left;
+ padding:10px 15px 10px 15px;
+ margin-left:0px;
+}
+
+#feature_box ul {
+ margin:.8em .4em;
+ padding-left:1.2em;
+ padding:0;
+ list-style-type: square;
+}
+
+#feature_box ul li {
+ font-family:"Verdana",sans-serif;
+ font-size:14px;
+ color:#000;
+ margin:.4em 0;
+}
+
+#feature_box ul li ul {
+ padding-left:1.2em;
+ margin-left:2em;
+}
+
+#feature_box a {
+ color:#000000;
+ text-decoration:none;
+}
+
+#feature_box a:hover {
+ color:#000000;
+ text-decoration:underline;
+}
+
+#footer {
+ color:#000000;
+ clear:both;
+ text-align:center;
+ font-size:11px;
+ line-height:17px;
+ height:45px;
+ padding-top:18px;
+}
+
+#footer a {
+ color:#000000;
+}
+
+#footer a:hover {
+ color:#000000;
+}
+
diff --git a/doc/website/template/template.html b/doc/website/template/template.html
new file mode 100644
index 0000000000..0b8aadcb88
--- /dev/null
+++ b/doc/website/template/template.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.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 xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Apache Qpid: Open Source AMQP Messaging</title>
+ <link href="style.css" rel="stylesheet" type="text/css"/>
+ </head>
+
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="logo">
+ <h1>Apache Qpid</h1>
+ <h2>Open Source AMQP Messaging</h2>
+ </div>
+ </div> <!-- end of header -->
+
+ <div id="menu_box">
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Apache Qpid</h3>
+ <ul>
+ <li><a href="./index.html">Home</a></li>
+ <li><a href="./download.html">Download</a></li>
+ <li><a href="./getting_started.html">Getting Started</a></li>
+ <li><a href="./roadmap.html">Roadmap</a></li>
+ <li><a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/qpid/FAQ">FAQ</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Documentation</h3>
+ <ul>
+ <li><a href="#">Version 0.6</a></li>
+ <li><a href="#">Version 0.5</a></li>
+ <li><a href="#">Archive</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Community</h3>
+ <ul>
+ <li><a href="#">Getting Involved</a></li>
+ <li><a href="./source_repository.html">Source Repository</a></li>
+ <li><a href="./mailing_lists.html">Mailing Lists</a></li>
+ <li><a href="http://qpid.apache.org">Wiki</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/qpid">Issue Reporting</a></li>
+ <li><a href="./people.html">People</a></li>
+<!-- <li><a href="#">Project Status</a></li> -->
+ <li><a href="./acknowledgements.html">Acknowledgements</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>Developers</h3>
+ <ul>
+ <li><a href="#">Building Qpid</a></li>
+ <li><a href="#">Developer Pages</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ <div id="menu_box_top"></div>
+ <div id="menu_box_body">
+ <h3>About AMQP</h3>
+ <ul>
+ <li><a href="./amqp.html">What is AMQP?</a></li>
+ </ul>
+ </div> <!-- end of menu_box_body -->
+ <div id="menu_box_bottom"></div>
+
+ </div> <!-- end of menu_box -->
+
+ <div id="main_text_area">
+ <div id="main_text_area_top"></div>
+{.}
+ </div>
+
+ <div id="footer">
+ Apache Qpid, Enterprise AMQP Messaging &#xA9; 2004-2010 The Apache Software Foundation.
+ </div>
+
+ </div>
+ </body>
+</html>
diff --git a/doc/website/tools/wrap b/doc/website/tools/wrap
new file mode 100755
index 0000000000..56b3a3726f
--- /dev/null
+++ b/doc/website/tools/wrap
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+
+import sys
+
+if len(sys.argv) != 4:
+ print "Usage: $ wrap template.html content.html output.html"
+ exit()
+
+try:
+ template = open(sys.argv[1], "r")
+ content = open(sys.argv[2], "r")
+ output = open(sys.argv[3], "w")
+
+ for t in template:
+ if t.rstrip() == "{.}":
+ for c in content:
+ output.write( c )
+ else:
+ output.write( t )
+except:
+ print "Ooops!"
+ exit()
+
+template.close()
+content.close()
+output.close()