qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r1135272 [1/6] - in /qpid/site/docs: ./ includes/ template/
Date Mon, 13 Jun 2011 20:48:07 GMT
Author: robbie
Date: Mon Jun 13 20:48:06 2011
New Revision: 1135272

URL: http://svn.apache.org/viewvc?rev=1135272&view=rev
Log:
NO-JIRA: update website files to use Server Side Includes

Added:
    qpid/site/docs/README.txt
    qpid/site/docs/template/
    qpid/site/docs/template/template.html   (with props)
Removed:
    qpid/site/docs/download.cgi
Modified:
    qpid/site/docs/.htaccess
    qpid/site/docs/acknowledgements.html   (contents, props changed)
    qpid/site/docs/amqp.html   (contents, props changed)
    qpid/site/docs/compatibility.html   (contents, props changed)
    qpid/site/docs/documentation.html   (contents, props changed)
    qpid/site/docs/download.html
    qpid/site/docs/getting_involved.html   (contents, props changed)
    qpid/site/docs/getting_started.html   (contents, props changed)
    qpid/site/docs/includes/menu.include
    qpid/site/docs/index.html   (contents, props changed)
    qpid/site/docs/mailing_lists.html   (contents, props changed)
    qpid/site/docs/people.html   (contents, props changed)
    qpid/site/docs/qpid_integrated_with.html   (contents, props changed)
    qpid/site/docs/qpid_project_etiquette_guide.html   (contents, props changed)
    qpid/site/docs/release_notes_0.10.html   (contents, props changed)
    qpid/site/docs/release_notes_0.8.html   (contents, props changed)
    qpid/site/docs/source_repository.html   (contents, props changed)
    qpid/site/docs/style.css

Modified: qpid/site/docs/.htaccess
URL: http://svn.apache.org/viewvc/qpid/site/docs/.htaccess?rev=1135272&r1=1135271&r2=1135272&view=diff
==============================================================================
--- qpid/site/docs/.htaccess (original)
+++ qpid/site/docs/.htaccess Mon Jun 13 20:48:06 2011
@@ -18,5 +18,5 @@
 #
 Options +Includes
 XBitHack On
-Redirect /download.html http://qpid.apache.org/download.cgi
+Redirect /download.cgi http://qpid.apache.org/download.html
 Redirect /licence.html http://www.apache.org/licenses/

Added: qpid/site/docs/README.txt
URL: http://svn.apache.org/viewvc/qpid/site/docs/README.txt?rev=1135272&view=auto
==============================================================================
--- qpid/site/docs/README.txt (added)
+++ qpid/site/docs/README.txt Mon Jun 13 20:48:06 2011
@@ -0,0 +1,28 @@
+#############################################################################
+This directory contains the HTML files for the Qpid website. Any changes made
+to these files in our repository will be deployed to the web server.
+#############################################################################
+
+While adding a new page, follow these initial instructions:
+
+1. Copy the template from template/template.html, renaming it as desired to
+   serve as a basis for your new page. Eg:
+
+     svn cp template/template.html <new-page-name>.html
+
+2. Ensure that the svn:executable property is set on the new file (This should
+   already be present if you followed step 1), required to make the Apache web
+   server action the Server Side Include elements present within the template.
+
+     svn propset svn:executable '*' <new-page-name>.html
+
+3. Add the new content to the file at the location indicated by the marker
+   comment, which should be removed:
+
+     <!-- ### NEW CONTENT GOES HERE #### -->
+
+4. Check in your new file.
+
+
+The menu, header, and footer sections of all pages can be edited by altering
+the .include files in the includes directory.

Modified: qpid/site/docs/acknowledgements.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/acknowledgements.html?rev=1135272&r1=1135271&r2=1135272&view=diff
==============================================================================
--- qpid/site/docs/acknowledgements.html (original)
+++ qpid/site/docs/acknowledgements.html Mon Jun 13 20:48:06 2011
@@ -19,7 +19,6 @@
  - under the License.
  -
 -->
-
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -29,135 +28,44 @@
 
   <body>
     <div class="container">
-      <div class="header">
-        <div class="logo">
-          <h1>Apache Qpid&#8482;</h1>
-          <h2>Open Source AMQP Messaging</h2>
-        </div>
-      </div>  <!-- end of header --> 
-
-      <div class="menu_box">
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Apache Qpid</h3>
-	  <ul>
-	    <li><a href="index.html">Home</a></li>
-	    <li><a href="download.cgi">Download</a></li>
-	    <li><a href="getting_started.html">Getting Started</a></li>
-	    <li><a href="http://www.apache.org/licenses/">License</a></li>
-	    <li><a href="https://cwiki.apache.org/qpid/faq.html">FAQ</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body --> 
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Documentation</h3>
-	  <ul>
-	    <li><a href="documentation.html#doc-release">0.10 Release</a></li>
-	    <li><a href="documentation.html#doc-trunk">Trunk</a></li>
-	    <li><a href="documentation.html#doc-archives">Archive</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Community</h3>
-	  <ul>
-	    <li><a href="getting_involved.html">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="https://cwiki.apache.org/qpid/">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="acknowledgements.html">Acknowledgements</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Developers</h3>
-	  <ul>
-	    <li><a href="https://cwiki.apache.org/qpid/building.html">Building Qpid</a></li>
-	    <li><a href="https://cwiki.apache.org/qpid/developer-pages.html">Developer Pages</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="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 class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>About Apache</h3>
-	  <ul>
-	    <li><a href="http://www.apache.org">Home</a></li>
-	    <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	    <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-	    <li><a href="http://www.apache.org/security/">Security</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-      </div> <!-- end of menu_box -->
+      <!-- begin header -->
+      <!--#include virtual="/includes/header.include" -->
+      <!-- end header -->
+
+      <!-- begin menu -->
+      <!--#include virtual="/includes/menu.include" -->
+      <!-- end menu -->
 
+      <!-- begin content -->
       <div class="main_text_area">
-	<div class="main_text_area_top"></div>
-<!--
- -
- - 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.
- -
--->
-<div class="main_text_area_body">
-  <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>
-      </div>
+        <div class="main_text_area_top"></div>
 
-      <div class="footer">
-        <p>
-          &#xA9; 2004-2011 The Apache Software Foundation.<br />
-          Apache Qpid, Qpid, Apache, the Apache feather logo, and the Apache Qpid project logo are trademarks of The Apache Software Foundation.<br />
-          All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-        </p>
+        <div class="main_text_area_body">
+          <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>
+        <div class="main_text_area_bottom"></div>
       </div>
+      <!-- end content -->
+
+      <!-- begin footer -->
+      <!--#include virtual="/includes/footer.include" -->
+      <!-- end footer -->
 
     </div>
   </body>

Propchange: qpid/site/docs/acknowledgements.html
------------------------------------------------------------------------------
    svn:executable = *

Modified: qpid/site/docs/amqp.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/amqp.html?rev=1135272&r1=1135271&r2=1135272&view=diff
==============================================================================
--- qpid/site/docs/amqp.html (original)
+++ qpid/site/docs/amqp.html Mon Jun 13 20:48:06 2011
@@ -19,7 +19,6 @@
  - under the License.
  -
 -->
-
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -29,167 +28,76 @@
 
   <body>
     <div class="container">
-      <div class="header">
-        <div class="logo">
-          <h1>Apache Qpid&#8482;</h1>
-          <h2>Open Source AMQP Messaging</h2>
-        </div>
-      </div>  <!-- end of header --> 
-
-      <div class="menu_box">
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Apache Qpid</h3>
-	  <ul>
-	    <li><a href="index.html">Home</a></li>
-	    <li><a href="download.cgi">Download</a></li>
-	    <li><a href="getting_started.html">Getting Started</a></li>
-	    <li><a href="http://www.apache.org/licenses/">License</a></li>
-	    <li><a href="https://cwiki.apache.org/qpid/faq.html">FAQ</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body --> 
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Documentation</h3>
-	  <ul>
-	    <li><a href="documentation.html#doc-release">0.10 Release</a></li>
-	    <li><a href="documentation.html#doc-trunk">Trunk</a></li>
-	    <li><a href="documentation.html#doc-archives">Archive</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Community</h3>
-	  <ul>
-	    <li><a href="getting_involved.html">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="https://cwiki.apache.org/qpid/">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="acknowledgements.html">Acknowledgements</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Developers</h3>
-	  <ul>
-	    <li><a href="https://cwiki.apache.org/qpid/building.html">Building Qpid</a></li>
-	    <li><a href="https://cwiki.apache.org/qpid/developer-pages.html">Developer Pages</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="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 class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>About Apache</h3>
-	  <ul>
-	    <li><a href="http://www.apache.org">Home</a></li>
-	    <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	    <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-	    <li><a href="http://www.apache.org/security/">Security</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-      </div> <!-- end of menu_box -->
+      <!-- begin header -->
+      <!--#include virtual="/includes/header.include" -->
+      <!-- end header -->
+
+      <!-- begin menu -->
+      <!--#include virtual="/includes/menu.include" -->
+      <!-- end menu -->
 
+      <!-- begin content -->
       <div class="main_text_area">
-	<div class="main_text_area_top"></div>
-<!--
- -
- - 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.
- -
--->
-<div class="main_text_area_body">
-  <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="compatibility.html" 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>
+        <div class="main_text_area_top"></div>
 
+        <div class="main_text_area_body">
+          <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="compatibility.html" 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>
+        
+        <div class="main_text_area_bottom"></div>
       </div>
+      <!-- end content -->
 
-      <div class="footer">
-        <p>
-          &#xA9; 2004-2011 The Apache Software Foundation.<br />
-          Apache Qpid, Qpid, Apache, the Apache feather logo, and the Apache Qpid project logo are trademarks of The Apache Software Foundation.<br />
-          All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-        </p>
-      </div>
+      <!-- begin footer -->
+      <!--#include virtual="/includes/footer.include" -->
+      <!-- end footer -->
 
     </div>
   </body>

Propchange: qpid/site/docs/amqp.html
------------------------------------------------------------------------------
    svn:executable = *

Modified: qpid/site/docs/compatibility.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/compatibility.html?rev=1135272&r1=1135271&r2=1135272&view=diff
==============================================================================
--- qpid/site/docs/compatibility.html (original)
+++ qpid/site/docs/compatibility.html Mon Jun 13 20:48:06 2011
@@ -19,7 +19,6 @@
  - under the License.
  -
 -->
-
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -29,482 +28,391 @@
 
   <body>
     <div class="container">
-      <div class="header">
-        <div class="logo">
-          <h1>Apache Qpid&#8482;</h1>
-          <h2>Open Source AMQP Messaging</h2>
-        </div>
-      </div>  <!-- end of header --> 
-
-      <div class="menu_box">
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Apache Qpid</h3>
-	  <ul>
-	    <li><a href="index.html">Home</a></li>
-	    <li><a href="download.cgi">Download</a></li>
-	    <li><a href="getting_started.html">Getting Started</a></li>
-	    <li><a href="http://www.apache.org/licenses/">License</a></li>
-	    <li><a href="https://cwiki.apache.org/qpid/faq.html">FAQ</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body --> 
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Documentation</h3>
-	  <ul>
-	    <li><a href="documentation.html#doc-release">0.10 Release</a></li>
-	    <li><a href="documentation.html#doc-trunk">Trunk</a></li>
-	    <li><a href="documentation.html#doc-archives">Archive</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Community</h3>
-	  <ul>
-	    <li><a href="getting_involved.html">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="https://cwiki.apache.org/qpid/">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="acknowledgements.html">Acknowledgements</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Developers</h3>
-	  <ul>
-	    <li><a href="https://cwiki.apache.org/qpid/building.html">Building Qpid</a></li>
-	    <li><a href="https://cwiki.apache.org/qpid/developer-pages.html">Developer Pages</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="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 class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>About Apache</h3>
-	  <ul>
-	    <li><a href="http://www.apache.org">Home</a></li>
-	    <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	    <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-	    <li><a href="http://www.apache.org/security/">Security</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-      </div> <!-- end of menu_box -->
+      <!-- begin header -->
+      <!--#include virtual="/includes/header.include" -->
+      <!-- end header -->
+
+      <!-- begin menu -->
+      <!--#include virtual="/includes/menu.include" -->
+      <!-- end menu -->
 
+      <!-- begin content -->
       <div class="main_text_area">
-	<div class="main_text_area_top"></div>
-<!--
- -
- - 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.
- -
--->
-<div class="main_text_area_body">
-  <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.cgi" title="Download"><b>downloaded here</b></a></b>.</p>
-
-  <p>There are two brokers:</p>
-
-  <ul>
-    <li>C+&#43; with support for AMQP 0-10.</li>
-    <li>Java with support for AMQP 0-8, 0-9, and 0-10.</li>
-  </ul>
-
-  <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 Qpid 0.6.</li>
-    <li>The JMS client supports 0-8, 0-9 and 0-10 and interoperates with both brokers.</li>
-    <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 Qpid 0.6, or prior to that you can use 0-8 or 0-9.</li>
-    <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 to 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>
-	  <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>
-	  <th > 0.8 </th>
-	  <th > 0.10 </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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <td > Y </td>
-	  <td > Y </td>
-	</tr>
-	<tr>
+        <div class="main_text_area_top"></div>
 
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <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>
-	  <td > Y </td>
-	  <td >&nbsp;</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>
-	  <td > Y </td>
-	  <td >&nbsp;</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>
-	  <td > Y </td>
-	  <td >&nbsp;</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>
-	  <td > Y </td>
-	  <td >&nbsp;</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>
-	  <th >Component</th>
-	  <th >Release </th>
-
-	  <th > 0-8 </th>
-	  <th > 0-9 </th>
-	  <th > 0-10 </th>
-	</tr>
-	<tr>
-	  <td > Java client </td>
-	  <td > M3, M4, 0.5, 0.6, 0.8, 0.10</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, 0.8, 0.10</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, 0.8, 0.10</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, 0.8, 0.10</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 > WCF channel </td>
-	  <td > 0.6, 0.8, 0.10</td>
-
-	  <td > N </td>
-	  <td > N </td>
-	  <td > Y </td>
-	</tr>
-	<tr>
-	  <td > Ruby client </td>
-	  <td > M4, 0.5, 0.6, 0.8</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, 0.8</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, 0.8</td>
-
-	  <td > Y </td>
-	  <td > N </td>
-	  <td > N </td>
-	</tr>
-    </tbody></table>
-  </div>
-</div>
+        <div class="main_text_area_body">
+          <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>
+        
+          <ul>
+            <li>C+&#43; with support for AMQP 0-10.</li>
+            <li>Java with support for AMQP 0-8, 0-9, and 0-10.</li>
+          </ul>
+        
+          <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 Qpid 0.6.</li>
+            <li>The JMS client supports 0-8, 0-9 and 0-10 and interoperates with both brokers.</li>
+            <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 Qpid 0.6, or prior to that you can use 0-8 or 0-9.</li>
+            <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 to 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>
+        	  <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>
+        	  <th > 0.8 </th>
+        	  <th > 0.10 </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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <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>
+        	  <td > Y </td>
+        	  <td >&nbsp;</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>
+        	  <td > Y </td>
+        	  <td >&nbsp;</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>
+        	  <td > Y </td>
+        	  <td >&nbsp;</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>
+        	  <td > Y </td>
+        	  <td >&nbsp;</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>
+        	  <th >Component</th>
+        	  <th >Release </th>
+        
+        	  <th > 0-8 </th>
+        	  <th > 0-9 </th>
+        	  <th > 0-10 </th>
+        	</tr>
+        	<tr>
+        	  <td > Java client </td>
+        	  <td > M3, M4, 0.5, 0.6, 0.8, 0.10</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, 0.8, 0.10</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, 0.8, 0.10</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, 0.8, 0.10</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 > WCF channel </td>
+        	  <td > 0.6, 0.8, 0.10</td>
+        
+        	  <td > N </td>
+        	  <td > N </td>
+        	  <td > Y </td>
+        	</tr>
+        	<tr>
+        	  <td > Ruby client </td>
+        	  <td > M4, 0.5, 0.6, 0.8</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, 0.8</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, 0.8</td>
+        
+        	  <td > Y </td>
+        	  <td > N </td>
+        	  <td > N </td>
+        	</tr>
+            </tbody></table>
+          </div>
+        </div>
+        <div class="main_text_area_bottom"></div>
       </div>
+      <!-- end content -->
 
-      <div class="footer">
-        <p>
-          &#xA9; 2004-2011 The Apache Software Foundation.<br />
-          Apache Qpid, Qpid, Apache, the Apache feather logo, and the Apache Qpid project logo are trademarks of The Apache Software Foundation.<br />
-          All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-        </p>
-      </div>
+      <!-- begin footer -->
+      <!--#include virtual="/includes/footer.include" -->
+      <!-- end footer -->
 
     </div>
   </body>

Propchange: qpid/site/docs/compatibility.html
------------------------------------------------------------------------------
    svn:executable = *

Modified: qpid/site/docs/documentation.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/documentation.html?rev=1135272&r1=1135271&r2=1135272&view=diff
==============================================================================
--- qpid/site/docs/documentation.html (original)
+++ qpid/site/docs/documentation.html Mon Jun 13 20:48:06 2011
@@ -19,7 +19,6 @@
  - under the License.
  -
 -->
-
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -29,188 +28,97 @@
 
   <body>
     <div class="container">
-      <div class="header">
-        <div class="logo">
-          <h1>Apache Qpid&#8482;</h1>
-          <h2>Open Source AMQP Messaging</h2>
-        </div>
-      </div>  <!-- end of header --> 
-
-      <div class="menu_box">
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Apache Qpid</h3>
-	  <ul>
-	    <li><a href="index.html">Home</a></li>
-	    <li><a href="download.cgi">Download</a></li>
-	    <li><a href="getting_started.html">Getting Started</a></li>
-	    <li><a href="http://www.apache.org/licenses/">License</a></li>
-	    <li><a href="https://cwiki.apache.org/qpid/faq.html">FAQ</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body --> 
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Documentation</h3>
-	  <ul>
-	    <li><a href="documentation.html#doc-release">0.10 Release</a></li>
-	    <li><a href="documentation.html#doc-trunk">Trunk</a></li>
-	    <li><a href="documentation.html#doc-archives">Archive</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Community</h3>
-	  <ul>
-	    <li><a href="getting_involved.html">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="https://cwiki.apache.org/qpid/">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="acknowledgements.html">Acknowledgements</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>Developers</h3>
-	  <ul>
-	    <li><a href="https://cwiki.apache.org/qpid/building.html">Building Qpid</a></li>
-	    <li><a href="https://cwiki.apache.org/qpid/developer-pages.html">Developer Pages</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="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 class="menu_box_bottom"></div>
-
-	<div class="menu_box_top"></div>
-	<div class="menu_box_body">
-	  <h3>About Apache</h3>
-	  <ul>
-	    <li><a href="http://www.apache.org">Home</a></li>
-	    <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-	    <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-	    <li><a href="http://www.apache.org/security/">Security</a></li>
-	  </ul>
-	</div> <!-- end of menu_box_body -->
-	<div class="menu_box_bottom"></div>
-      </div> <!-- end of menu_box -->
+      <!-- begin header -->
+      <!--#include virtual="/includes/header.include" -->
+      <!-- end header -->
+
+      <!-- begin menu -->
+      <!--#include virtual="/includes/menu.include" -->
+      <!-- end menu -->
 
+      <!-- begin content -->
       <div class="main_text_area">
-	<div class="main_text_area_top"></div>
-<!--
- -
- - 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.
- -
--->
-<div class="main_text_area_body">
-  <h1>Qpid Documentation</h1>
-
-  <h2 id="doc-release">Documentation for Qpid 0.10 release</h2>
+        <div class="main_text_area_top"></div>
 
-  <p>This documentation was converted from the Wiki and organized into
-  book form. <a href="#doc-archives">The archives</a> contain the
-  original content of the Wiki.</p>
-
-  <ul>
-    <li><a href="getting_started.html">Getting Started</a></li>
-    <li><p>AMQP Messaging Broker (C++ implementation for Linux, Windows, Solaris)</p>
-      <p>
-      <a href="books/0.10/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
-	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> |
-      <a href="books/0.10/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
-    <li><p>AMQP Messaging Broker (Java implemementation)</p>
-      <p><a href="books/0.10/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
-	 name="AMQP Messaging Broker (Java implemementation)">PDF</a> |
-      <a href="books/0.10/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li>
-    <li><p>Programming in Apache Qpid: Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python</p>
-      <p>
-      <a href="books/0.10/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf"
-	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">PDF</a> |
-      <a href="books/0.10/Programming-In-Apache-Qpid/html/index.html"
-	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">HTML</a></p></li>
-    <li><p>For programming examples and documentation for Qpid,
-    see the <a href="getting_started.html">Getting Started</a>
-    page.</p></li>
-    <li><p>API Reference Documentation</p>
-      <p>C++:    <a href="apis/0.10/cpp/html/index.html">HTML</a> | <a href="apis/0.10/cpp/qpid-cpp-doxygen-0.10.html.tar.gz">qpid-cpp-doxygen-0.10.html.tar.gz</a></p>
-      <p>Python: <a href="apis/0.10/python/html/index.html">HTML</a> | <a href="apis/0.10/python/qpid-python-epydoc-0.10.html.tar.gz">qpid-python-epydoc-0.10.html.tar.gz</a></p></li>
-    </ul>
-
-
-  <h2 id="doc-trunk">Documentation for Qpid development trunk</h2>
-  <ul>
-    <li><a href="getting_started.html">Getting Started</a></li>
-    <li><p>AMQP Messaging Broker (C++ implementation for Linux, Windows, Solaris)</p>
-      <p>
-      <a href="books/trunk/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
-	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> |
-      <a href="books/trunk/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
-    <li><p>AMQP Messaging Broker (Java implemementation)</p>
-      <p><a href="books/trunk/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
-	 name="AMQP Messaging Broker (Java implemementation)">PDF</a> |
-      <a href="books/trunk/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li>
-    <li><p>Programming in Apache Qpid: Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python</p>
-      <p>
-      <a href="books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf"
-	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">PDF</a> |
-      <a href="books/trunk/Programming-In-Apache-Qpid/html/index.html"
-	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">HTML</a></p></li>
-  </ul>
-
-
-
-    <h2 id="doc-archives">Documentation Archives</h2>
-
-    <ul>
-      <li><p>Qpid Wiki converted to PDF format on 26 May 2010</p>
-      <a href="archives/qpid-2010-05-26.html.zip">HTML</a> |
-      <a href="archives/qpid-2010-05-26.pdf">PDF</a></li>
-    </ul>
-
-    <h2 id="qpid-wiki">Qpid Wiki</h2>
-
-    <ul>
-      <li><p><a href="https://cwiki.apache.org/qpid/">Qpid Wiki</a></p></li>
-    </ul>
-
-</div>
+        <div class="main_text_area_body">
+          <h1>Qpid Documentation</h1>
+        
+          <h2 id="doc-release">Documentation for Qpid 0.10 release</h2>
+        
+          <p>This documentation was converted from the Wiki and organized into
+          book form. <a href="#doc-archives">The archives</a> contain the
+          original content of the Wiki.</p>
+        
+          <ul>
+            <li><a href="getting_started.html">Getting Started</a></li>
+            <li><p>AMQP Messaging Broker (C++ implementation for Linux, Windows, Solaris)</p>
+              <p>
+              <a href="books/0.10/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
+        	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> |
+              <a href="books/0.10/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
+            <li><p>AMQP Messaging Broker (Java implemementation)</p>
+              <p><a href="books/0.10/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
+        	 name="AMQP Messaging Broker (Java implemementation)">PDF</a> |
+              <a href="books/0.10/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li>
+            <li><p>Programming in Apache Qpid: Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python</p>
+              <p>
+              <a href="books/0.10/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf"
+        	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">PDF</a> |
+              <a href="books/0.10/Programming-In-Apache-Qpid/html/index.html"
+        	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">HTML</a></p></li>
+            <li><p>For programming examples and documentation for Qpid,
+            see the <a href="getting_started.html">Getting Started</a>
+            page.</p></li>
+            <li><p>API Reference Documentation</p>
+              <p>C++:    <a href="apis/0.10/cpp/html/index.html">HTML</a> | <a href="apis/0.10/cpp/qpid-cpp-doxygen-0.10.html.tar.gz">qpid-cpp-doxygen-0.10.html.tar.gz</a></p>
+              <p>Python: <a href="apis/0.10/python/html/index.html">HTML</a> | <a href="apis/0.10/python/qpid-python-epydoc-0.10.html.tar.gz">qpid-python-epydoc-0.10.html.tar.gz</a></p></li>
+            </ul>
+        
+        
+          <h2 id="doc-trunk">Documentation for Qpid development trunk</h2>
+          <ul>
+            <li><a href="getting_started.html">Getting Started</a></li>
+            <li><p>AMQP Messaging Broker (C++ implementation for Linux, Windows, Solaris)</p>
+              <p>
+              <a href="books/trunk/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
+        	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> |
+              <a href="books/trunk/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
+            <li><p>AMQP Messaging Broker (Java implemementation)</p>
+              <p><a href="books/trunk/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
+        	 name="AMQP Messaging Broker (Java implemementation)">PDF</a> |
+              <a href="books/trunk/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li>
+            <li><p>Programming in Apache Qpid: Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python</p>
+              <p>
+              <a href="books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf"
+        	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">PDF</a> |
+              <a href="books/trunk/Programming-In-Apache-Qpid/html/index.html"
+        	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">HTML</a></p></li>
+          </ul>
+        
+        
+        
+            <h2 id="doc-archives">Documentation Archives</h2>
+        
+            <ul>
+              <li><p>Qpid Wiki converted to PDF format on 26 May 2010</p>
+              <a href="archives/qpid-2010-05-26.html.zip">HTML</a> |
+              <a href="archives/qpid-2010-05-26.pdf">PDF</a></li>
+            </ul>
+        
+            <h2 id="qpid-wiki">Qpid Wiki</h2>
+        
+            <ul>
+              <li><p><a href="https://cwiki.apache.org/qpid/">Qpid Wiki</a></p></li>
+            </ul>
+        
+        </div>
+        <div class="main_text_area_bottom"></div>
       </div>
+      <!-- end content -->
 
-      <div class="footer">
-        <p>
-          &#xA9; 2004-2011 The Apache Software Foundation.<br />
-          Apache Qpid, Qpid, Apache, the Apache feather logo, and the Apache Qpid project logo are trademarks of The Apache Software Foundation.<br />
-          All other marks mentioned may be trademarks or registered trademarks of their respective owners.
-        </p>
-      </div>
+      <!-- begin footer -->
+      <!--#include virtual="/includes/footer.include" -->
+      <!-- end footer -->
 
     </div>
   </body>

Propchange: qpid/site/docs/documentation.html
------------------------------------------------------------------------------
    svn:executable = *



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message