qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jr...@apache.org
Subject [15/51] [partial] qpid-site git commit: QPID-7353: Update for the Qpid C++ 1.35.0 release
Date Tue, 06 Sep 2016 16:59:38 GMT
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/spout.cpp.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/spout.cpp.html b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/spout.cpp.html
new file mode 100644
index 0000000..2e07006
--- /dev/null
+++ b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/spout.cpp.html
@@ -0,0 +1,316 @@
+<!DOCTYPE html>
+<!--
+ -
+ - 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" xml:lang="en">
+  <head>
+    <title>spout.cpp - Apache Qpid&#8482;</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
+    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
+    <script type="text/javascript">var _deferredFunctions = [];</script>
+    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
+    <!--[if lte IE 8]>
+      <link rel="stylesheet" href="/ie.css" type="text/css"/>
+      <script type="text/javascript" src="/html5shiv.js"></script>
+    <![endif]-->
+
+    <!-- Redirects for `go get` and godoc.org -->
+    <meta name="go-import"
+          content="qpid.apache.org git https://git-wip-us.apache.org/repos/asf/qpid-proton.git"/>
+    <meta name="go-source"
+          content="qpid.apache.org
+https://github.com/apache/qpid-proton/blob/go1/README.md
+https://github.com/apache/qpid-proton/tree/go1{/dir}
+https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
+  </head>
+  <body>
+    <div id="-content">
+      <div id="-top" class="panel">
+        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
+
+        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
+
+        <ul id="-global-navigation">
+          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
+          <li><a href="/documentation.html">Documentation</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/discussion.html">Discussion</a></li>
+        </ul>
+      </div>
+
+      <div id="-menu" class="panel" style="display: none;">
+        <div class="flex">
+          <section>
+            <h3>Project</h3>
+
+            <ul>
+              <li><a href="/overview.html">Overview</a></li>
+              <li><a href="/components/index.html">Components</a></li>
+              <li><a href="/releases/index.html">Releases</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Messaging APIs</h3>
+
+            <ul>
+              <li><a href="/proton/index.html">Qpid Proton</a></li>
+              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
+              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Servers and tools</h3>
+
+            <ul>
+              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
+              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Resources</h3>
+
+            <ul>
+              <li><a href="/dashboard.html">Dashboard</a></li>
+              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
+              <li><a href="/resources.html">More resources</a></li>
+            </ul>
+          </section>
+        </div>
+      </div>
+
+      <div id="-search" class="panel" style="display: none;">
+        <form action="http://www.google.com/search" method="get">
+          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
+          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
+          <button type="submit">Search</button>
+          <a href="/search.html">More ways to search</a>
+        </form>
+      </div>
+
+      <div id="-middle" class="panel">
+        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-cpp-1.35.0/index.html">Qpid C++ 1.35.0</a></li><li><a href="/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/index.html">C++ Messaging API Examples</a></li><li>spout.cpp</li></ul>
+
+        <div id="-middle-content">
+          
+<h1>spout.cpp</h1>
+<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">&lt;qpid/messaging/Address.h&gt;</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">&lt;qpid/messaging/Connection.h&gt;</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">&lt;qpid/messaging/Message.h&gt;</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">&lt;qpid/messaging/Message_io.h&gt;</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">&lt;qpid/messaging/Sender.h&gt;</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">&lt;qpid/messaging/Session.h&gt;</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">&lt;qpid/types/Variant.h&gt;</span><span class="cp"></span>
+
+<span class="cp">#include</span> <span class="cpf">&lt;iostream&gt;</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">&lt;sstream&gt;</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">&lt;vector&gt;</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">&lt;ctime&gt;</span><span class="cp"></span>
+
+<span class="cp">#include</span> <span class="cpf">&quot;OptionParser.h&quot;</span><span class="cp"></span>
+
+<span class="k">using</span> <span class="k">namespace</span> <span class="n">qpid</span><span class="o">::</span><span class="n">messaging</span><span class="p">;</span>
+<span class="k">using</span> <span class="k">namespace</span> <span class="n">qpid</span><span class="o">::</span><span class="n">types</span><span class="p">;</span>
+
+<span class="k">typedef</span> <span class="n">std</span><span class="o">::</span><span class="n">vector</span><span class="o">&lt;</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">&gt;</span> <span class="n">string_vector</span><span class="p">;</span>
+
+<span class="k">struct</span> <span class="nl">Options</span> <span class="p">:</span> <span class="n">OptionParser</span>
+<span class="p">{</span>
+    <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">url</span><span class="p">;</span>
+    <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">address</span><span class="p">;</span>
+    <span class="kt">int</span> <span class="n">timeout</span><span class="p">;</span>
+    <span class="kt">bool</span> <span class="n">durable</span><span class="p">;</span>
+    <span class="kt">int</span> <span class="n">count</span><span class="p">;</span>
+    <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">id</span><span class="p">;</span>
+    <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">replyto</span><span class="p">;</span>
+    <span class="n">string_vector</span> <span class="n">properties</span><span class="p">;</span>
+    <span class="n">string_vector</span> <span class="n">entries</span><span class="p">;</span>
+    <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">content</span><span class="p">;</span>
+    <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">connectionOptions</span><span class="p">;</span>
+    <span class="kt">bool</span> <span class="n">print</span><span class="p">;</span>
+
+    <span class="n">Options</span><span class="p">()</span>
+        <span class="o">:</span> <span class="n">OptionParser</span><span class="p">(</span><span class="s">&quot;Usage: spout [OPTIONS] ADDRESS&quot;</span><span class="p">,</span> <span class="s">&quot;Send messages to the specified address&quot;</span><span class="p">),</span>
+          <span class="n">url</span><span class="p">(</span><span class="s">&quot;127.0.0.1&quot;</span><span class="p">),</span>
+          <span class="n">timeout</span><span class="p">(</span><span class="mi">0</span><span class="p">),</span>
+          <span class="n">count</span><span class="p">(</span><span class="mi">1</span><span class="p">),</span>
+          <span class="n">durable</span><span class="p">(</span><span class="nb">false</span><span class="p">),</span>
+          <span class="n">print</span><span class="p">(</span><span class="nb">false</span><span class="p">)</span>
+    <span class="p">{</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;broker,b&quot;</span><span class="p">,</span> <span class="n">url</span><span class="p">,</span> <span class="s">&quot;url of broker to connect to&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;timeout,t&quot;</span><span class="p">,</span> <span class="n">timeout</span><span class="p">,</span> <span class="s">&quot;exit after the specified time&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;durable,d&quot;</span><span class="p">,</span> <span class="n">durable</span><span class="p">,</span> <span class="s">&quot;make the message durable (def. transient)&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;count,c&quot;</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="s">&quot;stop after count messages have been sent, zero disables&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;id,i&quot;</span><span class="p">,</span> <span class="n">id</span><span class="p">,</span> <span class="s">&quot;use the supplied id instead of generating one&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;reply-to&quot;</span><span class="p">,</span> <span class="n">replyto</span><span class="p">,</span> <span class="s">&quot;specify reply-to address&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;property,P&quot;</span><span class="p">,</span> <span class="n">properties</span><span class="p">,</span> <span class="s">&quot;specify message property&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;map,M&quot;</span><span class="p">,</span> <span class="n">entries</span><span class="p">,</span> <span class="s">&quot;specify entry for map content&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;content&quot;</span><span class="p">,</span> <span class="n">content</span><span class="p">,</span> <span class="s">&quot;specify textual content&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;connection-options&quot;</span><span class="p">,</span> <span class="n">connectionOptions</span><span class="p">,</span> <span class="s">&quot;connection options string in the form {name1:value1, name2:value2}&quot;</span><span class="p">);</span>
+        <span class="n">add</span><span class="p">(</span><span class="s">&quot;print&quot;</span><span class="p">,</span> <span class="n">print</span><span class="p">,</span> <span class="s">&quot;print each message sent&quot;</span><span class="p">);</span>
+    <span class="p">}</span>
+
+    <span class="k">static</span> <span class="kt">bool</span> <span class="n">nameval</span><span class="p">(</span><span class="k">const</span> <span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">&amp;</span> <span class="n">in</span><span class="p">,</span> <span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">&amp;</span> <span class="n">name</span><span class="p">,</span> <span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">&amp;</span> <span class="n">value</span><span class="p">)</span>
+    <span class="p">{</span>
+        <span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">::</span><span class="n">size_type</span> <span class="n">i</span> <span class="o">=</span> <span class="n">in</span><span class="p">.</span><span class="n">find</span><span class="p">(</span><span class="s">&quot;=&quot;</span><span class="p">);</span>
+        <span class="k">if</span> <span class="p">(</span><span class="n">i</span> <span class="o">==</span> <span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">::</span><span class="n">npos</span><span class="p">)</span> <span class="p">{</span>
+            <span class="n">name</span> <span class="o">=</span> <span class="n">in</span><span class="p">;</span>
+            <span class="k">return</span> <span class="nb">false</span><span class="p">;</span>
+        <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
+            <span class="n">name</span> <span class="o">=</span> <span class="n">in</span><span class="p">.</span><span class="n">substr</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
+            <span class="k">if</span> <span class="p">(</span><span class="n">i</span><span class="o">+</span><span class="mi">1</span> <span class="o">&lt;</span> <span class="n">in</span><span class="p">.</span><span class="n">size</span><span class="p">())</span> <span class="p">{</span>
+                <span class="n">value</span> <span class="o">=</span> <span class="n">in</span><span class="p">.</span><span class="n">substr</span><span class="p">(</span><span class="n">i</span><span class="o">+</span><span class="mi">1</span><span class="p">);</span>
+                <span class="k">return</span> <span class="nb">true</span><span class="p">;</span>
+            <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
+                <span class="k">return</span> <span class="nb">false</span><span class="p">;</span>
+            <span class="p">}</span>
+        <span class="p">}</span>
+    <span class="p">}</span>
+
+    <span class="k">static</span> <span class="kt">void</span> <span class="n">setProperty</span><span class="p">(</span><span class="n">Message</span><span class="o">&amp;</span> <span class="n">message</span><span class="p">,</span> <span class="k">const</span> <span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">&amp;</span> <span class="n">property</span><span class="p">)</span>
+    <span class="p">{</span>
+        <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">name</span><span class="p">;</span>
+        <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">value</span><span class="p">;</span>
+        <span class="k">if</span> <span class="p">(</span><span class="n">nameval</span><span class="p">(</span><span class="n">property</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">value</span><span class="p">))</span> <span class="p">{</span>
+            <span class="n">message</span><span class="p">.</span><span class="n">getProperties</span><span class="p">()[</span><span class="n">name</span><span class="p">]</span> <span class="o">=</span> <span class="n">value</span><span class="p">;</span>
+            <span class="n">message</span><span class="p">.</span><span class="n">getProperties</span><span class="p">()[</span><span class="n">name</span><span class="p">].</span><span class="n">setEncoding</span><span class="p">(</span><span class="s">&quot;utf8&quot;</span><span class="p">);</span>
+        <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
+            <span class="n">message</span><span class="p">.</span><span class="n">getProperties</span><span class="p">()[</span><span class="n">name</span><span class="p">]</span> <span class="o">=</span> <span class="n">Variant</span><span class="p">();</span>
+        <span class="p">}</span>
+    <span class="p">}</span>
+
+    <span class="kt">void</span> <span class="n">setProperties</span><span class="p">(</span><span class="n">Message</span><span class="o">&amp;</span> <span class="n">message</span><span class="p">)</span> <span class="k">const</span>
+    <span class="p">{</span>
+        <span class="k">for</span> <span class="p">(</span><span class="n">string_vector</span><span class="o">::</span><span class="n">const_iterator</span> <span class="n">i</span> <span class="o">=</span> <span class="n">properties</span><span class="p">.</span><span class="n">begin</span><span class="p">();</span> <span class="n">i</span> <span class="o">!=</span> <span class="n">properties</span><span class="p">.</span><span class="n">end</span><span class="p">();</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
+            <span class="n">setProperty</span><span class="p">(</span><span class="n">message</span><span class="p">,</span> <span class="o">*</span><span class="n">i</span><span class="p">);</span>
+        <span class="p">}</span>
+    <span class="p">}</span>
+
+    <span class="kt">void</span> <span class="n">setEntries</span><span class="p">(</span><span class="n">Variant</span><span class="o">::</span><span class="n">Map</span><span class="o">&amp;</span> <span class="n">content</span><span class="p">)</span> <span class="k">const</span>
+    <span class="p">{</span>
+        <span class="k">for</span> <span class="p">(</span><span class="n">string_vector</span><span class="o">::</span><span class="n">const_iterator</span> <span class="n">i</span> <span class="o">=</span> <span class="n">entries</span><span class="p">.</span><span class="n">begin</span><span class="p">();</span> <span class="n">i</span> <span class="o">!=</span> <span class="n">entries</span><span class="p">.</span><span class="n">end</span><span class="p">();</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
+            <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">name</span><span class="p">;</span>
+            <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">value</span><span class="p">;</span>
+            <span class="k">if</span> <span class="p">(</span><span class="n">nameval</span><span class="p">(</span><span class="o">*</span><span class="n">i</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">value</span><span class="p">))</span> <span class="p">{</span>
+                <span class="n">content</span><span class="p">[</span><span class="n">name</span><span class="p">]</span> <span class="o">=</span> <span class="n">value</span><span class="p">;</span>
+            <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
+                <span class="n">content</span><span class="p">[</span><span class="n">name</span><span class="p">]</span> <span class="o">=</span> <span class="n">Variant</span><span class="p">();</span>
+            <span class="p">}</span>
+        <span class="p">}</span>
+    <span class="p">}</span>
+
+    <span class="kt">bool</span> <span class="n">checkAddress</span><span class="p">()</span>
+    <span class="p">{</span>
+        <span class="k">if</span> <span class="p">(</span><span class="n">getArguments</span><span class="p">().</span><span class="n">empty</span><span class="p">())</span> <span class="p">{</span>
+            <span class="n">error</span><span class="p">(</span><span class="s">&quot;Address is required&quot;</span><span class="p">);</span>
+            <span class="k">return</span> <span class="nb">false</span><span class="p">;</span>
+        <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
+            <span class="n">address</span> <span class="o">=</span> <span class="n">getArguments</span><span class="p">()[</span><span class="mi">0</span><span class="p">];</span>
+            <span class="k">return</span> <span class="nb">true</span><span class="p">;</span>
+        <span class="p">}</span>
+    <span class="p">}</span>
+
+    <span class="kt">bool</span> <span class="n">isDurable</span><span class="p">()</span> <span class="k">const</span>
+    <span class="p">{</span>
+      <span class="k">return</span> <span class="n">durable</span><span class="p">;</span>
+    <span class="p">}</span>
+<span class="p">};</span>
+
+<span class="kt">int</span> <span class="nf">main</span><span class="p">(</span><span class="kt">int</span> <span class="n">argc</span><span class="p">,</span> <span class="kt">char</span><span class="o">**</span> <span class="n">argv</span><span class="p">)</span>
+<span class="p">{</span>
+    <span class="n">Options</span> <span class="n">options</span><span class="p">;</span>
+    <span class="k">if</span> <span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">parse</span><span class="p">(</span><span class="n">argc</span><span class="p">,</span> <span class="n">argv</span><span class="p">)</span> <span class="o">&amp;&amp;</span> <span class="n">options</span><span class="p">.</span><span class="n">checkAddress</span><span class="p">())</span> <span class="p">{</span>
+        <span class="n">Connection</span> <span class="n">connection</span><span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">url</span><span class="p">,</span> <span class="n">options</span><span class="p">.</span><span class="n">connectionOptions</span><span class="p">);</span>
+        <span class="k">try</span> <span class="p">{</span>
+            <span class="n">connection</span><span class="p">.</span><span class="n">open</span><span class="p">();</span>
+            <span class="n">Session</span> <span class="n">session</span> <span class="o">=</span> <span class="n">connection</span><span class="p">.</span><span class="n">createSession</span><span class="p">();</span>
+            <span class="n">Sender</span> <span class="n">sender</span> <span class="o">=</span> <span class="n">session</span><span class="p">.</span><span class="n">createSender</span><span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">address</span><span class="p">);</span>
+
+            <span class="n">Message</span> <span class="n">message</span><span class="p">;</span>
+            <span class="n">message</span><span class="p">.</span><span class="n">setDurable</span><span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">isDurable</span><span class="p">());</span>
+            <span class="n">options</span><span class="p">.</span><span class="n">setProperties</span><span class="p">(</span><span class="n">message</span><span class="p">);</span>
+            <span class="n">Variant</span><span class="o">&amp;</span> <span class="n">obj</span> <span class="o">=</span> <span class="n">message</span><span class="p">.</span><span class="n">getContentObject</span><span class="p">();</span>
+            <span class="k">if</span> <span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">entries</span><span class="p">.</span><span class="n">size</span><span class="p">())</span> <span class="p">{</span>
+                <span class="n">Variant</span><span class="o">::</span><span class="n">Map</span> <span class="n">content</span><span class="p">;</span>
+                <span class="n">options</span><span class="p">.</span><span class="n">setEntries</span><span class="p">(</span><span class="n">content</span><span class="p">);</span>
+                <span class="n">obj</span> <span class="o">=</span> <span class="n">content</span><span class="p">;</span>
+            <span class="p">}</span> <span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">content</span><span class="p">.</span><span class="n">size</span><span class="p">())</span> <span class="p">{</span>
+                <span class="n">obj</span> <span class="o">=</span> <span class="n">options</span><span class="p">.</span><span class="n">content</span><span class="p">;</span>
+                <span class="n">obj</span><span class="p">.</span><span class="n">setEncoding</span><span class="p">(</span><span class="s">&quot;utf8&quot;</span><span class="p">);</span>
+            <span class="p">}</span>
+            <span class="n">std</span><span class="o">::</span><span class="kt">time_t</span> <span class="n">start</span> <span class="o">=</span> <span class="n">std</span><span class="o">::</span><span class="n">time</span><span class="p">(</span><span class="mi">0</span><span class="p">);</span>
+            <span class="k">for</span> <span class="p">(</span><span class="kt">int</span> <span class="n">count</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> 
+                <span class="p">(</span><span class="n">count</span> <span class="o">&lt;</span> <span class="n">options</span><span class="p">.</span><span class="n">count</span> <span class="o">||</span> <span class="n">options</span><span class="p">.</span><span class="n">count</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)</span> <span class="o">&amp;&amp;</span> 
+                <span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">timeout</span> <span class="o">==</span> <span class="mi">0</span> <span class="o">||</span> <span class="n">std</span><span class="o">::</span><span class="n">difftime</span><span class="p">(</span><span class="n">std</span><span class="o">::</span><span class="n">time</span><span class="p">(</span><span class="mi">0</span><span class="p">),</span> <span class="n">start</span><span class="p">)</span> <span class="o">&lt;</span> <span class="n">options</span><span class="p">.</span><span class="n">timeout</span><span class="p">);</span> 
+                <span class="n">count</span><span class="o">++</span><span class="p">)</span> <span class="p">{</span>
+                <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">options</span><span class="p">.</span><span class="n">replyto</span><span class="p">.</span><span class="n">empty</span><span class="p">())</span> <span class="n">message</span><span class="p">.</span><span class="n">setReplyTo</span><span class="p">(</span><span class="n">Address</span><span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">replyto</span><span class="p">));</span>
+                <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">id</span> <span class="o">=</span> <span class="n">options</span><span class="p">.</span><span class="n">id</span><span class="p">.</span><span class="n">empty</span><span class="p">()</span> <span class="o">?</span> <span class="n">Uuid</span><span class="p">(</span><span class="nb">true</span><span class="p">).</span><span class="n">str</span><span class="p">()</span> <span class="o">:</span> <span class="n">options</span><span class="p">.</span><span class="n">id</span><span class="p">;</span>
+                <span class="n">std</span><span class="o">::</span><span class="n">stringstream</span> <span class="n">spoutid</span><span class="p">;</span>
+                <span class="n">spoutid</span> <span class="o">&lt;&lt;</span> <span class="n">id</span> <span class="o">&lt;&lt;</span> <span class="s">&quot;:&quot;</span> <span class="o">&lt;&lt;</span> <span class="n">count</span><span class="p">;</span>
+                <span class="n">message</span><span class="p">.</span><span class="n">getProperties</span><span class="p">()[</span><span class="s">&quot;spout-id&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">spoutid</span><span class="p">.</span><span class="n">str</span><span class="p">();</span>
+                <span class="k">if</span> <span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">print</span><span class="p">)</span> <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o">&lt;&lt;</span> <span class="n">message</span> <span class="o">&lt;&lt;</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+                <span class="n">sender</span><span class="p">.</span><span class="n">send</span><span class="p">(</span><span class="n">message</span><span class="p">);</span>
+            <span class="p">}</span>
+            <span class="n">session</span><span class="p">.</span><span class="n">sync</span><span class="p">();</span>
+            <span class="n">connection</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
+            <span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
+        <span class="p">}</span> <span class="k">catch</span><span class="p">(</span><span class="k">const</span> <span class="n">std</span><span class="o">::</span><span class="n">exception</span><span class="o">&amp;</span> <span class="n">error</span><span class="p">)</span> <span class="p">{</span>
+            <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o">&lt;&lt;</span> <span class="n">error</span><span class="p">.</span><span class="n">what</span><span class="p">()</span> <span class="o">&lt;&lt;</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+            <span class="n">connection</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
+        <span class="p">}</span>
+    <span class="p">}</span>
+    <span class="k">return</span> <span class="mi">1</span><span class="p">;</span>
+<span class="p">}</span>
+</pre></div>
+
+<p><a href="spout.cpp">Download this file</a></p>
+
+
+          <hr/>
+
+          <ul id="-apache-navigation">
+            <li><a href="http://www.apache.org/">Apache</a></li>
+            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
+            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+          </ul>
+
+          <p id="-legal">
+            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
+            The Apache Software Foundation; Licensed under
+            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
+            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            project logo are trademarks of The Apache Software
+            Foundation; All other marks mentioned may be trademarks or
+            registered trademarks of their respective owners
+          </p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/content/releases/qpid-cpp-1.35.0/release-notes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/release-notes.html b/content/releases/qpid-cpp-1.35.0/release-notes.html
new file mode 100644
index 0000000..1ce7fd6
--- /dev/null
+++ b/content/releases/qpid-cpp-1.35.0/release-notes.html
@@ -0,0 +1,219 @@
+<!DOCTYPE html>
+<!--
+ -
+ - 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" xml:lang="en">
+  <head>
+    <title>Qpid C++ 1.35.0 Release Notes - Apache Qpid&#8482;</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
+    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
+    <script type="text/javascript">var _deferredFunctions = [];</script>
+    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
+    <!--[if lte IE 8]>
+      <link rel="stylesheet" href="/ie.css" type="text/css"/>
+      <script type="text/javascript" src="/html5shiv.js"></script>
+    <![endif]-->
+
+    <!-- Redirects for `go get` and godoc.org -->
+    <meta name="go-import"
+          content="qpid.apache.org git https://git-wip-us.apache.org/repos/asf/qpid-proton.git"/>
+    <meta name="go-source"
+          content="qpid.apache.org
+https://github.com/apache/qpid-proton/blob/go1/README.md
+https://github.com/apache/qpid-proton/tree/go1{/dir}
+https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
+  </head>
+  <body>
+    <div id="-content">
+      <div id="-top" class="panel">
+        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
+
+        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
+
+        <ul id="-global-navigation">
+          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
+          <li><a href="/documentation.html">Documentation</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/discussion.html">Discussion</a></li>
+        </ul>
+      </div>
+
+      <div id="-menu" class="panel" style="display: none;">
+        <div class="flex">
+          <section>
+            <h3>Project</h3>
+
+            <ul>
+              <li><a href="/overview.html">Overview</a></li>
+              <li><a href="/components/index.html">Components</a></li>
+              <li><a href="/releases/index.html">Releases</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Messaging APIs</h3>
+
+            <ul>
+              <li><a href="/proton/index.html">Qpid Proton</a></li>
+              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
+              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Servers and tools</h3>
+
+            <ul>
+              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
+              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Resources</h3>
+
+            <ul>
+              <li><a href="/dashboard.html">Dashboard</a></li>
+              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
+              <li><a href="/resources.html">More resources</a></li>
+            </ul>
+          </section>
+        </div>
+      </div>
+
+      <div id="-search" class="panel" style="display: none;">
+        <form action="http://www.google.com/search" method="get">
+          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
+          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
+          <button type="submit">Search</button>
+          <a href="/search.html">More ways to search</a>
+        </form>
+      </div>
+
+      <div id="-middle" class="panel">
+        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-cpp-1.35.0/index.html">Qpid C++ 1.35.0</a></li><li>Qpid C++ 1.35.0 Release Notes</li></ul>
+
+        <div id="-middle-content">
+          <h1 id="qpid-c-1350-release-notes">Qpid C++ 1.35.0 Release Notes</h1>
+
+<p>Qpid C++ offers a connection-oriented messaging API supporting many
+programming languages and a message broker written in C++ that stores,
+routes, and forwards messages using AMQP.</p>
+
+<p>For more information about this release, including download links and
+documentation, see the <a href="index.html">release overview</a>.</p>
+
+<h2 id="new-features-and-improvements">New features and improvements</h2>
+
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/QPID-2549">QPID-2549</a> - Port qpid to FreeBSD</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-4397">QPID-4397</a> - C++ Broker Improve log statement for expired messages</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6391">QPID-6391</a> - [C++ Broker] [AMQP 1.0] add support for a 'no-local' filter</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6665">QPID-6665</a> - update hello_world.cpp example to use setContentObject</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6730">QPID-6730</a> - Make the journal flush timeout configurable in the C++ broker</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6757">QPID-6757</a> - [linearstore] Add qpid-txtest mode to qpid-qls-analyze which extracts message number from message body</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6783">QPID-6783</a> - qpidd should dynamically set the SASL service name based on protocol.</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7130">QPID-7130</a> - qpid C++ with SSL authentication returning dummy string from Connection::getAuthenticatedUsername()</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7171">QPID-7171</a> - Allow disable-auto-decode to be set via env var or conf file</li>
+</ul>
+
+<h2 id="bugs-fixed">Bugs fixed</h2>
+
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/QPID-5855">QPID-5855</a> - JAVA Client Can not recieve message with qpid ha cluster "Session exception occured while trying to commit"</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6308">QPID-6308</a> - [C++ Messaging] Server example never sends utf8 responses</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6435">QPID-6435</a> - No error info logged for io errors with ssl</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6577">QPID-6577</a> - HA - backup broker messages are larger than primary messages.</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6639">QPID-6639</a> - Incoming connection using "cut-through" ANONYMOUS SASL fails</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6648">QPID-6648</a> - Spelling, grammar errors in qpid::messaging::Receiver API doc</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6654">QPID-6654</a> - mgmt-disable option set to false causes segv on CentOS 6.3</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6659">QPID-6659</a> - [AMQP 1.0] qpid::messaging can't handle multi-frame transfers</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6660">QPID-6660</a> - [AMQP 1.0] broker attempts to process incoming messages for closed session</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6661">QPID-6661</a> - [AMQP 1.0] heartbeat anomalies</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6668">QPID-6668</a> - [C++] INSTALL-WINDOWS is out of date</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6698">QPID-6698</a> - [amqp1.0] connections drop when heartbeat is used and the time of day changes</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6714">QPID-6714</a> - Add support for JMSHeaders in selectors</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6717">QPID-6717</a> - selector can match incorrectly due to different type for values</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6718">QPID-6718</a> - parsing errors for integer literals in selectors</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6790">QPID-6790</a> - qpidd crashes in the interop_tests unit test.</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6834">QPID-6834</a> - allow lifetime of delete-on-close in queue policy</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6858">QPID-6858</a> - Port all python swig input files to support python 3 and 2</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6870">QPID-6870</a> - [AMQP 1.0]: qpidd does not honour the undeliverable-here field of MODIFIED disposition</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6924">QPID-6924</a> - Qpidd fails to compile against trunk 0.12-SNAPSHOT proton-c</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-6966">QPID-6966</a> - C++ broker and client to support TLS1.1 and TLS1.2 by default</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7010">QPID-7010</a> - assertion failure if disposition sent for previously settled delivery</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7020">QPID-7020</a> - uint16 AMQP0-10 message properties decoded as uint8</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7100">QPID-7100</a> - qpid-perftest divide by zero when mode is shared and nsubs is zero</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7127">QPID-7127</a> - [C++ broker] Setting large idle timeout cause confuses timers in the C++ broker</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7131">QPID-7131</a> - snd-settle-mode advertised is always 'mixed'</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7134">QPID-7134</a> - [C++ client] Message::setContent("") does not work</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7137">QPID-7137</a> - Abi tests fail with new libstdc++ abi</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7145">QPID-7145</a> - auto_ptr is deprecated from C++11 and onwards and its use causes a warning with GCC 6</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7147">QPID-7147</a> - When compiling with C++11/14 bind() use gets found as std::bind()</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7149">QPID-7149</a> - [HA] active HA broker memory leak when ring queue discards overflow messages</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7182">QPID-7182</a> - [C++ broker] high CPU usage on backup brokers following QPID-7149 scenario</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7225">QPID-7225</a> - PriorityQueue doesn't check that released message is acquired</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7233">QPID-7233</a> - qpid-receive uses 0 prefetch unless an explicit message count is provided</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7234">QPID-7234</a> - client does not update credit for expired messages</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7235">QPID-7235</a> - Observers should have a virtual destructor</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7240">QPID-7240</a> - acquired messages are not evicted from priority-ring queue</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7250">QPID-7250</a> - Durable message that exceeds page queue size prevents broker restart</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7302">QPID-7302</a> - race between auto-delete and re-declare/consume </li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7306">QPID-7306</a> - Fix memory bugs and race conditions found in a Qpid HA deployment</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7324">QPID-7324</a> - [AMQP 1.0] support 'undeliverable-here' field for MODIFIED outcome</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7326">QPID-7326</a> - Memory bloat on HA primary broker</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7329">QPID-7329</a> - [AMQP 1.0]: support message-annotations field for MODIFIED outcome</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7357">QPID-7357</a> - c++ HA Backup crash during re-connect in failover</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7361">QPID-7361</a> - [AMQP-1.0] sender sometimes waits for credit without flushing buffered transfers to disk</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7373">QPID-7373</a> - memory leak in broker with idle worker threads</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7376">QPID-7376</a> - fetch with capacity=0 can hang or timeout if fetched message expires client-side</li>
+<li><a href="https://issues.apache.org/jira/browse/QPID-7383">QPID-7383</a> - [linearstore] Overwrite-before-return causes latencies for clients</li>
+</ul>
+
+
+          <hr/>
+
+          <ul id="-apache-navigation">
+            <li><a href="http://www.apache.org/">Apache</a></li>
+            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
+            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+          </ul>
+
+          <p id="-legal">
+            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
+            The Apache Software Foundation; Licensed under
+            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
+            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            project logo are trademarks of The Apache Software
+            Foundation; All other marks mentioned may be trademarks or
+            registered trademarks of their respective owners
+          </p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/content/releases/qpid-cpp-trunk/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-trunk/index.html b/content/releases/qpid-cpp-trunk/index.html
index 2015ab4..b413e23 100644
--- a/content/releases/qpid-cpp-trunk/index.html
+++ b/content/releases/qpid-cpp-trunk/index.html
@@ -121,7 +121,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <h2 id="warning-this-is-a-snapshot-of-work-in-progress">Warning! This is a snapshot of work in progress</h2>
 
 <p>Code and documentation found here may be unstable, incorrect, or
-incomplete.  For a smoother experience, see the <a href="/releases/qpid-cpp-0.34/index.html">current stable
+incomplete.  For a smoother experience, see the <a href="/releases/qpid-cpp-1.35.0/index.html">current stable
 release</a>.</p>
 
 <p>This content was generated at 06:02  on Tuesday, 29 September 2015.</p>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/content/releases/qpid-java-6.0.0/java-broker/book/Java-Broker-Introduction.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.0/java-broker/book/Java-Broker-Introduction.html b/content/releases/qpid-java-6.0.0/java-broker/book/Java-Broker-Introduction.html
index 455257a..6c42983 100644
--- a/content/releases/qpid-java-6.0.0/java-broker/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-java-6.0.0/java-broker/book/Java-Broker-Introduction.html
@@ -117,7 +117,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;1.&#160;Introduction</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="index.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Introduction"></a>Chapter&#160;1.&#160;Introduction</h1></div></div></div><p>The Java Broker is a powerful open-source message broker that implements all versions of the
       <a class="ulink" href="http://www.amqp.org" target="_top"> Advanced Message Queuing Protocol (AMQP)</a>. The Java
     Broker is actually one of two message brokers provided by the <a class="ulink" href="http://qpid.apache.org" target="_top">Apache Qpid project</a>: the Java Broker and the C++
-    Broker.</p><p>This document relates to the Java Broker. The <a class="ulink" href="../../../qpid-cpp-0.34/cpp-broker/book/" target="_top">C++ Broker is
+    Broker.</p><p>This document relates to the Java Broker. The <a class="ulink" href="../../../qpid-cpp-1.35.0/cpp-broker/book/" target="_top">C++ Broker is
     described separately</a>.</p><p><span class="emphasis"><em>Headline features</em></span></p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>100% Java implementation - runs on any platform supporting Java 1.7 or higher</p></li><li class="listitem"><p>Messaging clients support in Java, C++, Python.</p></li><li class="listitem"><p>JMS 1.1 compliance (Java client).</p></li><li class="listitem"><p>Persistent and non-persistent (transient) message support</p></li><li class="listitem"><p>Supports for all common messaging patterns (point-to-point, publish/subscribe, fan-out
         etc).</p></li><li class="listitem"><p>Transaction support including XA<a class="footnote" href="#ftn.idm140683147832592" id="idm140683147832592"><sup class="footnote">[1]</sup></a></p></li><li class="listitem"><p>Supports for all versions of the AMQP protocol</p></li><li class="listitem"><p>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</p></li><li class="listitem"><p>Pluggable authentication architecture with out-of-the-box support for Kerberos, LDAP,
         External, and file-based authentication mechanisms.</p></li><li class="listitem"><p>Support for message compression</p></li><li class="listitem"><p>Client support for end to end message encryption</p></li><li class="listitem"><p>Pluggable storage architecture with implementations including <a class="ulink" href="http://db.apache.org/derby/" target="_top">Apache Derby</a>, <a class="ulink" href="http://www.oracle.com/technetwork/products/berkeleydb/overview/index-093405.html" target="_top">Oracle BDB JE</a><a class="footnote" href="#ftn.idm140683147825488" id="idm140683147825488"><sup class="footnote">[2]</sup></a>, and External Database</p></li><li class="listitem"><p>Web based management interface and programmatic management interfaces  via REST and JMX

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/content/releases/qpid-java-6.0.1/java-broker/book/Java-Broker-Introduction.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.1/java-broker/book/Java-Broker-Introduction.html b/content/releases/qpid-java-6.0.1/java-broker/book/Java-Broker-Introduction.html
index ce437c3..dcfd3e3 100644
--- a/content/releases/qpid-java-6.0.1/java-broker/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-java-6.0.1/java-broker/book/Java-Broker-Introduction.html
@@ -117,7 +117,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;1.&#160;Introduction</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Introduction"></a>Chapter&#160;1.&#160;Introduction</h1></div></div></div><p>The Java Broker is a powerful open-source message broker that implements all versions of the
       <a class="link" href="http://www.amqp.org" target="_top"> Advanced Message Queuing Protocol (AMQP)</a>. The Java
     Broker is actually one of two message brokers provided by the <a class="link" href="http://qpid.apache.org" target="_top">Apache Qpid project</a>: the Java Broker and the C++
-    Broker.</p><p>This document relates to the Java Broker. The <a class="link" href="/releases/qpid-cpp-0.34/cpp-broker/book/" target="_top">C++ Broker is
+    Broker.</p><p>This document relates to the Java Broker. The <a class="link" href="/releases/qpid-cpp-1.35.0/cpp-broker/book/" target="_top">C++ Broker is
     described separately</a>.</p><p><span class="emphasis"><em>Headline features</em></span></p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem" style="list-style-type: circle"><p>100% Java implementation - runs on any platform supporting Java 1.7 or higher</p></li><li class="listitem" style="list-style-type: circle"><p>Messaging clients support in Java, C++, Python.</p></li><li class="listitem" style="list-style-type: circle"><p>JMS 1.1 compliance (Java client).</p></li><li class="listitem" style="list-style-type: circle"><p>Persistent and non-persistent (transient) message support</p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all common messaging patterns (point-to-point, publish/subscribe, fan-out
         etc).</p></li><li class="listitem" style="list-style-type: circle"><p>Transaction support including XA<a class="footnote" href="#ftn.d0e44" id="d0e44"><sup class="footnote">[1]</sup></a></p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all versions of the AMQP protocol</p></li><li class="listitem" style="list-style-type: circle"><p>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable authentication architecture with out-of-the-box support for Kerberos, LDAP,
         External, and file-based authentication mechanisms.</p></li><li class="listitem" style="list-style-type: circle"><p>Support for message compression</p></li><li class="listitem" style="list-style-type: circle"><p>Client support for end to end message encryption</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable storage architecture with implementations including <a class="link" href="http://db.apache.org/derby/" target="_top">Apache Derby</a>, <a class="link" href="${oracleBdbProductOverviewUrl}" target="_top">Oracle BDB JE</a><a class="footnote" href="#ftn.d0e70" id="d0e70"><sup class="footnote">[2]</sup></a>, and External Database</p></li><li class="listitem" style="list-style-type: circle"><p>Web based management interface and programmatic management interfaces via REST.</p></li><li class="listitem" style="list-style-type: circle"><p>SSL support</p></li><li class="listitem" style="list-style-type: circle"><p>High availability (HA) support.<a class="f
 ootnote" href="#ftn.d0e83" id="d0e83"><sup class="footnote">[3]</sup></a></p></li></ul></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e44"><p><a class="para" href="#d0e44"><sup class="para">[1] </sup></a>XA provided when using AMQP 0-10</p></div><div class="footnote" id="ftn.d0e70"><p><a class="para" href="#d0e70"><sup class="para">[2] </sup></a>Oracle BDB JE must be downloaded separately.</p></div><div class="footnote" id="ftn.d0e83"><p><a class="para" href="#d0e83"><sup class="para">[3] </sup></a>HA currently only available to users of the optional BDB JE HA based message store.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installat
 ion.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">AMQP Messaging Broker (Java)&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;2.&#160;Installation</td></tr></table></div></div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/content/releases/qpid-java-6.0.2/java-broker/book/Java-Broker-Introduction.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.2/java-broker/book/Java-Broker-Introduction.html b/content/releases/qpid-java-6.0.2/java-broker/book/Java-Broker-Introduction.html
index d44e5ea..8b7b679 100644
--- a/content/releases/qpid-java-6.0.2/java-broker/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-java-6.0.2/java-broker/book/Java-Broker-Introduction.html
@@ -117,7 +117,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;1.&#160;Introduction</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Introduction"></a>Chapter&#160;1.&#160;Introduction</h1></div></div></div><p>The Java Broker is a powerful open-source message broker that implements all versions of the
       <a class="link" href="http://www.amqp.org" target="_top"> Advanced Message Queuing Protocol (AMQP)</a>. The Java
     Broker is actually one of two message brokers provided by the <a class="link" href="http://qpid.apache.org" target="_top">Apache Qpid project</a>: the Java Broker and the C++
-    Broker.</p><p>This document relates to the Java Broker. The <a class="link" href="/releases/qpid-cpp-0.34/cpp-broker/book/" target="_top">C++ Broker is
+    Broker.</p><p>This document relates to the Java Broker. The <a class="link" href="/releases/qpid-cpp-1.35.0/cpp-broker/book/" target="_top">C++ Broker is
     described separately</a>.</p><p><span class="emphasis"><em>Headline features</em></span></p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem" style="list-style-type: circle"><p>100% Java implementation - runs on any platform supporting Java 1.7 or higher</p></li><li class="listitem" style="list-style-type: circle"><p>Messaging clients support in Java, C++, Python.</p></li><li class="listitem" style="list-style-type: circle"><p>JMS 1.1 compliance (Java client).</p></li><li class="listitem" style="list-style-type: circle"><p>Persistent and non-persistent (transient) message support</p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all common messaging patterns (point-to-point, publish/subscribe, fan-out
         etc).</p></li><li class="listitem" style="list-style-type: circle"><p>Transaction support including XA<a class="footnote" href="#ftn.d0e44" id="d0e44"><sup class="footnote">[1]</sup></a></p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all versions of the AMQP protocol</p></li><li class="listitem" style="list-style-type: circle"><p>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable authentication architecture with out-of-the-box support for Kerberos, LDAP,
         External, and file-based authentication mechanisms.</p></li><li class="listitem" style="list-style-type: circle"><p>Support for message compression</p></li><li class="listitem" style="list-style-type: circle"><p>Client support for end to end message encryption</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable storage architecture with implementations including <a class="link" href="http://db.apache.org/derby/" target="_top">Apache Derby</a>, <a class="link" href="${oracleBdbProductOverviewUrl}" target="_top">Oracle BDB JE</a><a class="footnote" href="#ftn.d0e70" id="d0e70"><sup class="footnote">[2]</sup></a>, and External Database</p></li><li class="listitem" style="list-style-type: circle"><p>Web based management interface and programmatic management interfaces via REST.</p></li><li class="listitem" style="list-style-type: circle"><p>SSL support</p></li><li class="listitem" style="list-style-type: circle"><p>High availability (HA) support.<a class="f
 ootnote" href="#ftn.d0e83" id="d0e83"><sup class="footnote">[3]</sup></a></p></li></ul></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e44"><p><a class="para" href="#d0e44"><sup class="para">[1] </sup></a>XA provided when using AMQP 0-10</p></div><div class="footnote" id="ftn.d0e70"><p><a class="para" href="#d0e70"><sup class="para">[2] </sup></a>Oracle BDB JE must be downloaded separately.</p></div><div class="footnote" id="ftn.d0e83"><p><a class="para" href="#d0e83"><sup class="para">[3] </sup></a>HA currently only available to users of the optional BDB JE HA based message store.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installat
 ion.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">AMQP Messaging Broker (Java)&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;2.&#160;Installation</td></tr></table></div></div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/content/releases/qpid-java-6.0.3/java-broker/book/Java-Broker-Introduction.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.3/java-broker/book/Java-Broker-Introduction.html b/content/releases/qpid-java-6.0.3/java-broker/book/Java-Broker-Introduction.html
index 60d8584..a4a58e1 100644
--- a/content/releases/qpid-java-6.0.3/java-broker/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-java-6.0.3/java-broker/book/Java-Broker-Introduction.html
@@ -117,7 +117,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;1.&#160;Introduction</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Introduction"></a>Chapter&#160;1.&#160;Introduction</h1></div></div></div><p>The Java Broker is a powerful open-source message broker that implements all versions of the
       <a class="link" href="http://www.amqp.org" target="_top"> Advanced Message Queuing Protocol (AMQP)</a>. The Java
     Broker is actually one of two message brokers provided by the <a class="link" href="http://qpid.apache.org" target="_top">Apache Qpid project</a>: the Java Broker and the C++
-    Broker.</p><p>This document relates to the Java Broker. The <a class="link" href="/releases/qpid-cpp-0.34/cpp-broker/book/" target="_top">C++ Broker is
+    Broker.</p><p>This document relates to the Java Broker. The <a class="link" href="/releases/qpid-cpp-1.35.0/cpp-broker/book/" target="_top">C++ Broker is
     described separately</a>.</p><p><span class="emphasis"><em>Headline features</em></span></p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem" style="list-style-type: circle"><p>100% Java implementation - runs on any platform supporting Java 1.7 or higher</p></li><li class="listitem" style="list-style-type: circle"><p>Messaging clients support in Java, C++, Python.</p></li><li class="listitem" style="list-style-type: circle"><p>JMS 1.1 compliance (Java client).</p></li><li class="listitem" style="list-style-type: circle"><p>Persistent and non-persistent (transient) message support</p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all common messaging patterns (point-to-point, publish/subscribe, fan-out
         etc).</p></li><li class="listitem" style="list-style-type: circle"><p>Transaction support including XA<a class="footnote" href="#ftn.d0e44" id="d0e44"><sup class="footnote">[1]</sup></a></p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all versions of the AMQP protocol</p></li><li class="listitem" style="list-style-type: circle"><p>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable authentication architecture with out-of-the-box support for Kerberos, LDAP,
         External, and file-based authentication mechanisms.</p></li><li class="listitem" style="list-style-type: circle"><p>Support for message compression</p></li><li class="listitem" style="list-style-type: circle"><p>Client support for end to end message encryption</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable storage architecture with implementations including <a class="link" href="http://db.apache.org/derby/" target="_top">Apache Derby</a>, <a class="link" href="${oracleBdbProductOverviewUrl}" target="_top">Oracle BDB JE</a><a class="footnote" href="#ftn.d0e70" id="d0e70"><sup class="footnote">[2]</sup></a>, and External Database</p></li><li class="listitem" style="list-style-type: circle"><p>Web based management interface and programmatic management interfaces via REST.</p></li><li class="listitem" style="list-style-type: circle"><p>SSL support</p></li><li class="listitem" style="list-style-type: circle"><p>High availability (HA) support.<a class="f
 ootnote" href="#ftn.d0e83" id="d0e83"><sup class="footnote">[3]</sup></a></p></li></ul></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e44"><p><a class="para" href="#d0e44"><sup class="para">[1] </sup></a>XA provided when using AMQP 0-10</p></div><div class="footnote" id="ftn.d0e70"><p><a class="para" href="#d0e70"><sup class="para">[2] </sup></a>Oracle BDB JE must be downloaded separately.</p></div><div class="footnote" id="ftn.d0e83"><p><a class="para" href="#d0e83"><sup class="para">[3] </sup></a>HA currently only available to users of the optional BDB JE HA based message store.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installat
 ion.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">AMQP Messaging Broker (Java)&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;2.&#160;Installation</td></tr></table></div></div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html
index fbf843d..9199a1f 100644
--- a/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-java-6.0.4/java-broker/book/Java-Broker-Introduction.html
@@ -117,7 +117,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;1.&#160;Introduction</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Introduction"></a>Chapter&#160;1.&#160;Introduction</h1></div></div></div><p>The Java Broker is a powerful open-source message broker that implements all versions of the
       <a class="link" href="http://www.amqp.org" target="_top"> Advanced Message Queuing Protocol (AMQP)</a>. The Java
     Broker is actually one of two message brokers provided by the <a class="link" href="http://qpid.apache.org" target="_top">Apache Qpid project</a>: the Java Broker and the C++
-    Broker.</p><p>This document relates to the Java Broker. The <a class="link" href="/releases/qpid-cpp-0.34/cpp-broker/book/" target="_top">C++ Broker is
+    Broker.</p><p>This document relates to the Java Broker. The <a class="link" href="/releases/qpid-cpp-1.35.0/cpp-broker/book/" target="_top">C++ Broker is
     described separately</a>.</p><p><span class="emphasis"><em>Headline features</em></span></p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem" style="list-style-type: circle"><p>100% Java implementation - runs on any platform supporting Java 1.7 or higher</p></li><li class="listitem" style="list-style-type: circle"><p>Messaging clients support in Java, C++, Python.</p></li><li class="listitem" style="list-style-type: circle"><p>JMS 1.1 compliance (Java client).</p></li><li class="listitem" style="list-style-type: circle"><p>Persistent and non-persistent (transient) message support</p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all common messaging patterns (point-to-point, publish/subscribe, fan-out
         etc).</p></li><li class="listitem" style="list-style-type: circle"><p>Transaction support including XA<a class="footnote" href="#ftn.d0e44" id="d0e44"><sup class="footnote">[1]</sup></a></p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all versions of the AMQP protocol</p></li><li class="listitem" style="list-style-type: circle"><p>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable authentication architecture with out-of-the-box support for Kerberos, LDAP,
         External, and file-based authentication mechanisms.</p></li><li class="listitem" style="list-style-type: circle"><p>Support for message compression</p></li><li class="listitem" style="list-style-type: circle"><p>Client support for end to end message encryption</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable storage architecture with implementations including <a class="link" href="http://db.apache.org/derby/" target="_top">Apache Derby</a>, <a class="link" href="${oracleBdbProductOverviewUrl}" target="_top">Oracle BDB JE</a><a class="footnote" href="#ftn.d0e70" id="d0e70"><sup class="footnote">[2]</sup></a>, and External Database</p></li><li class="listitem" style="list-style-type: circle"><p>Web based management interface and programmatic management interfaces via REST.</p></li><li class="listitem" style="list-style-type: circle"><p>SSL support</p></li><li class="listitem" style="list-style-type: circle"><p>High availability (HA) support.<a class="f
 ootnote" href="#ftn.d0e83" id="d0e83"><sup class="footnote">[3]</sup></a></p></li></ul></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e44"><p><a class="para" href="#d0e44"><sup class="para">[1] </sup></a>XA provided when using AMQP 0-10</p></div><div class="footnote" id="ftn.d0e70"><p><a class="para" href="#d0e70"><sup class="para">[2] </sup></a>Oracle BDB JE must be downloaded separately.</p></div><div class="footnote" id="ftn.d0e83"><p><a class="para" href="#d0e83"><sup class="para">[3] </sup></a>HA currently only available to users of the optional BDB JE HA based message store.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installat
 ion.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">AMQP Messaging Broker (Java)&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;2.&#160;Installation</td></tr></table></div></div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html
index edd83d0..dd1db79 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html
@@ -117,7 +117,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;1.&#160;Introduction</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Introduction"></a>Chapter&#160;1.&#160;Introduction</h1></div></div></div><p>The Apache Qpid Broker for Java is a powerful open-source message broker that implements all versions of the
       <a class="link" href="http://www.amqp.org" target="_top"> Advanced Message Queuing Protocol (AMQP)</a>. The Apache Qpid Broker for Java
     is actually one of two message brokers provided by the <a class="link" href="http://qpid.apache.org" target="_top">Apache Qpid project</a>: Broker for Java and the C++
-    Broker.</p><p>This document relates to the Apache Qpid Broker for Java. The <a class="link" href="/releases/qpid-cpp-0.34/cpp-broker/book/" target="_top">C++ Broker is
+    Broker.</p><p>This document relates to the Apache Qpid Broker for Java. The <a class="link" href="/releases/qpid-cpp-1.35.0/cpp-broker/book/" target="_top">C++ Broker is
     described separately</a>.</p><p><span class="emphasis"><em>Headline features</em></span></p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem" style="list-style-type: circle"><p>100% Java implementation - runs on any platform supporting Java 1.7 or higher</p></li><li class="listitem" style="list-style-type: circle"><p>Messaging clients support in Java, C++, Python.</p></li><li class="listitem" style="list-style-type: circle"><p>JMS 1.1 compliance (Java client).</p></li><li class="listitem" style="list-style-type: circle"><p>Persistent and non-persistent (transient) message support</p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all common messaging patterns (point-to-point, publish/subscribe, fan-out
         etc).</p></li><li class="listitem" style="list-style-type: circle"><p>Transaction support including XA<a class="footnote" href="#ftn.d0e44" id="d0e44"><sup class="footnote">[1]</sup></a></p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all versions of the AMQP protocol</p></li><li class="listitem" style="list-style-type: circle"><p>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable authentication architecture with out-of-the-box support for Kerberos, LDAP,
         External, OAuth2, and file-based authentication mechanisms.</p></li><li class="listitem" style="list-style-type: circle"><p>Support for message compression</p></li><li class="listitem" style="list-style-type: circle"><p>Client support for end to end message encryption</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable storage architecture with implementations including <a class="link" href="http://db.apache.org/derby/" target="_top">Apache Derby</a>, <a class="link" href="${oracleBdbProductOverviewUrl}" target="_top">Oracle BDB JE</a><a class="footnote" href="#ftn.d0e70" id="d0e70"><sup class="footnote">[2]</sup></a>, and External Database</p></li><li class="listitem" style="list-style-type: circle"><p>Web based management interface and programmatic management interfaces via REST.</p></li><li class="listitem" style="list-style-type: circle"><p>SSL support</p></li><li class="listitem" style="list-style-type: circle"><p>High availability (HA) support.<a 
 class="footnote" href="#ftn.d0e83" id="d0e83"><sup class="footnote">[3]</sup></a></p></li></ul></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e44"><p><a class="para" href="#d0e44"><sup class="para">[1] </sup></a>XA provided when using AMQP 0-10</p></div><div class="footnote" id="ftn.d0e70"><p><a class="para" href="#d0e70"><sup class="para">[2] </sup></a>Oracle BDB JE must be downloaded separately.</p></div><div class="footnote" id="ftn.d0e83"><p><a class="para" href="#d0e83"><sup class="para">[3] </sup></a>HA currently only available to users of the optional BDB JE HA based message store.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-I
 nstallation.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Apache Qpid Broker for Java&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;2.&#160;Installation</td></tr></table></div></div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/input/_transom_config.py
----------------------------------------------------------------------
diff --git a/input/_transom_config.py b/input/_transom_config.py
index 1a00e2b..410046b 100644
--- a/input/_transom_config.py
+++ b/input/_transom_config.py
@@ -19,7 +19,7 @@ class _Release(object):
 
 qpid_release = _Release("Qpid", "qpid", "0.32")
 
-cpp_release = _Release("Qpid C++", "qpid-cpp", "0.34")
+cpp_release = _Release("Qpid C++", "qpid-cpp", "1.35.0")
 python_release = _Release("Qpid Python", "qpid-python", "1.35.0")
 dispatch_release = _Release("Qpid Dispatch", "qpid-dispatch", "0.6.1")
 java_release = _Release("Qpid for Java", "qpid-java", "6.0.4")

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/input/components/cpp-broker/index.md
----------------------------------------------------------------------
diff --git a/input/components/cpp-broker/index.md b/input/components/cpp-broker/index.md
index 7726b0f..e781fe4 100644
--- a/input/components/cpp-broker/index.md
+++ b/input/components/cpp-broker/index.md
@@ -63,7 +63,7 @@ that stores, routes, and forwards messages using AMQP.
 
  - [C++ broker book]({{current_cpp_release_url}}/cpp-broker/book/index.html)
  - [Managing the C++ broker]({{current_cpp_release_url}}/cpp-broker/book/chapter-Managing-CPP-Broker.html#section-Managing-CPP-Broker)
- - [Installing Qpid C++](http://svn.apache.org/repos/asf/qpid/tags/qpid-cpp-{{current_cpp_release}}/qpid/cpp/INSTALL)
+ - [Installing Qpid C++](https://raw.githubusercontent.com/apache/qpid-cpp/master/INSTALL.txt)
  - [Qpid extensions to AMQP](https://cwiki.apache.org/confluence/display/qpid/qpid+extensions+to+amqp)
 
 </div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/input/components/messaging-api/index.md
----------------------------------------------------------------------
diff --git a/input/components/messaging-api/index.md b/input/components/messaging-api/index.md
index f87bfa1..244a40e 100644
--- a/input/components/messaging-api/index.md
+++ b/input/components/messaging-api/index.md
@@ -36,13 +36,13 @@ find previous versions with our
 
 <div class="two-column" markdown="1">
 
- - [Using the Qpid Messaging API]({{current_release_url}}/programming/book/ch02.html)
- - [C++ API reference]({{current_release_url}}/messaging-api/cpp/api/index.html)
- - [C++ examples]({{current_release_url}}/messaging-api/cpp/examples/index.html)
+ - [Using the Qpid Messaging API]({{site_url}}/releases/qpid-0.32/programming/book/ch02.html)
+ - [C++ API reference]({{current_cpp_release_url}}/messaging-api/cpp/api/annotated.html)
+ - [C++ examples]({{current_cpp_release_url}}/messaging-api/cpp/examples/index.html)
  - [Python API reference]({{current_python_release_url}}/messaging-api/api/index.html)
  - [Python examples]({{current_python_release_url}}/messaging-api/examples/index.html)
- - [Installing Qpid C++](http://svn.apache.org/repos/asf/qpid/tags/{{current_release}}/qpid/cpp/INSTALL)
- - [Installing Qpid Python](http://svn.apache.org/repos/asf/qpid/tags/{{current_release}}/qpid/python/README.txt)
+ - [Installing Qpid C++](https://raw.githubusercontent.com/apache/qpid-cpp/master/INSTALL.txt)
+ - [Installing Qpid Python](https://raw.githubusercontent.com/apache/qpid-python/master/README.md)
 
 </div>
 
@@ -50,7 +50,7 @@ find previous versions with our
 
   | Language | Hello World | Client | Server | Spout | Drain |
   | - | - | - | - | - | - |
-  | *C++* | [hello_world.cpp]({{current_release_url}}/messaging-api/cpp/examples/hello_world.cpp.html) | [client.cpp]({{current_release_url}}/messaging-api/cpp/examples/client.cpp.html) | [server.cpp]({{current_release_url}}/messaging-api/cpp/examples/server.cpp.html) | [spout.cpp]({{current_release_url}}/messaging-api/cpp/examples/spout.cpp.html) | [drain.cpp]({{current_release_url}}/messaging-api/cpp/examples/drain.cpp.html) |
+  | *C++* | [hello_world.cpp]({{current_cpp_release_url}}/messaging-api/cpp/examples/hello_world.cpp.html) | [client.cpp]({{current_cpp_release_url}}/messaging-api/cpp/examples/client.cpp.html) | [server.cpp]({{current_cpp_release_url}}/messaging-api/cpp/examples/server.cpp.html) | [spout.cpp]({{current_cpp_release_url}}/messaging-api/cpp/examples/spout.cpp.html) | [drain.cpp]({{current_cpp_release_url}}/messaging-api/cpp/examples/drain.cpp.html) |
   | *Python* | [hello]({{current_python_release_url}}/messaging-api/examples/hello.html) |  | [server]({{current_python_release_url}}/messaging-api/examples/server.html) | [spout]({{current_python_release_url}}/messaging-api/examples/spout.html) | [drain]({{current_python_release_url}}/messaging-api/examples/drain.html) |
 
 ## Issues

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/eff0fe55/input/documentation.md
----------------------------------------------------------------------
diff --git a/input/documentation.md b/input/documentation.md
index 5857062..6ef24c9 100644
--- a/input/documentation.md
+++ b/input/documentation.md
@@ -36,9 +36,9 @@ You can find older versions with our
 ### Qpid Messaging API
 
  - [Overview]({{site_url}}/components/messaging-api/index.html)
- - [Using the Qpid Messaging API]({{current_release_url}}/programming/book/ch02.html) ([PDF]({{current_release_url}}/programming/programming-book.pdf))
- - [C++ API reference]({{current_release_url}}/messaging-api/cpp/api/index.html)
- - [C++ examples]({{current_release_url}}/messaging-api/cpp/examples/index.html)
+ - [Using the Qpid Messaging API]({{site_url}}/releases/qpid-0.32/programming/book/ch02.html) ([PDF]({{site_url}}/releases/qpid-0.32/programming/programming-book.pdf))
+ - [C++ API reference]({{current_cpp_release_url}}/messaging-api/cpp/api/index.html)
+ - [C++ examples]({{current_cpp_release_url}}/messaging-api/cpp/examples/index.html)
 
 </section>
 </div>
@@ -79,5 +79,5 @@ You can find older versions with our
 ## More information
 
  - [Past and current releases]({{site_url}}/releases/index.html)
- - [Development snapshots]({{site_url}}/releases/index.html#development-snapshots)
+;; - [Development snapshots]({{site_url}}/releases/index.html#development-snapshots)
  - [Components]({{site_url}}/components/index.html)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message