You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/11/14 21:52:09 UTC

[50/51] [partial] qpid-site git commit: Update site for Qpid Broker-J release 7.0.0

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/.htaccess
----------------------------------------------------------------------
diff --git a/content/.htaccess b/content/.htaccess
index c3e7358..b5c566a 100644
--- a/content/.htaccess
+++ b/content/.htaccess
@@ -21,6 +21,7 @@
    RewriteBase /
 
    RewriteRule ^components/qpid-jms/(.*) /components/jms/$1 [R=301,L]
+   RewriteRule ^components/java-broker/(.*) /components/broker-j/$1 [R=301,L]
 </IfModule>
 
 <IfModule mod_deflate.c>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/amqp/index.html
----------------------------------------------------------------------
diff --git a/content/amqp/index.html b/content/amqp/index.html
index 72fb33f..c001bf0 100644
--- a/content/amqp/index.html
+++ b/content/amqp/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -144,7 +144,7 @@ possibilities for messaging applications.</p>
 <ul>
 <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
 <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-<li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+<li><a href="/components/broker-j/index.html">Broker-J</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>
 <li><a href="/proton/index.html">Qpid Proton</a></li>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/amqp/type-reference.html
----------------------------------------------------------------------
diff --git a/content/amqp/type-reference.html b/content/amqp/type-reference.html
index 94e4bda..4a21be5 100644
--- a/content/amqp/type-reference.html
+++ b/content/amqp/type-reference.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/broker-j/index.html
----------------------------------------------------------------------
diff --git a/content/components/broker-j/index.html b/content/components/broker-j/index.html
new file mode 100644
index 0000000..899439b
--- /dev/null
+++ b/content/components/broker-j/index.html
@@ -0,0 +1,230 @@
+<!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>Broker-J - 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/broker-j/index.html">Broker-J</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="/components/index.html">Components</a></li><li>Broker-J</li></ul>
+
+        <div id="-middle-content">
+          <div id="-left-column">
+
+<h1 id="broker-j">Broker-J</h1>
+
+<div class="feature">
+
+<p>A <a href="http://en.wikipedia.org/wiki/Message-oriented_middleware">message-oriented middleware</a> message broker written in Java
+that stores, routes, and forwards messages using AMQP.</p>
+
+</div>
+
+<h2 id="features">Features</h2>
+
+<div class="two-column">
+
+<ul>
+<li><a href="http://www.oracle.com/technetwork/java/docs-136352.html">JMS 1.1</a> compliant</li>
+<li>Speaks and translates among all versions of AMQP</li>
+<li>Management via JMX, REST, QMF, and web console</li>
+<li><a href="/releases/qpid-broker-j-7.0.0/book/Java-Broker-Security-AccessControlProviders.html">Access control lists</a></li>
+<li>Flexible logging</li>
+<li>Flow to disk</li>
+<li>Header-based routing</li>
+<li>Heartbeats</li>
+<li><a href="/releases/qpid-broker-j-7.0.0/book/Java-Broker-High-Availability.html">High availability</a></li>
+<li>Message groups</li>
+<li>Pluggable persistence supporting Derby, SQL, and BDB stores</li>
+<li><a href="/releases/qpid-broker-j-7.0.0/book/Java-Broker-Security.html#Java-Broker-Security-Authentication-Providers">Pluggable authentication</a> supporting LDAP, Kerberos, and SSL client certificates</li>
+<li><a href="/releases/qpid-broker-j-7.0.0/book/Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control">Producer flow control</a></li>
+<li>Secure connection via SSL</li>
+<li>Server-side selectors</li>
+<li>Specialized queuing with last value queue, priority queue, and sorted queue</li>
+<li>Threshold alerts</li>
+<li>Transactions</li>
+<li><a href="/releases/qpid-broker-j-7.0.0/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html">Undeliverable message handling</a></li>
+<li>Virtual hosts</li>
+<li>Support for message compression</li>
+</ul>
+
+</div>
+
+<h2 id="documentation">Documentation</h2>
+
+<ul>
+<li><a href="/releases/qpid-broker-j-7.0.0/book/index.html">Broker book</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/qpid/How+To+Build+Qpid+Broker-J">How to build Apache Qpid for Java</a></li>
+</ul>
+
+</div>
+
+<div id="-right-column" class="right-column-adjusted">
+
+<h2 id="releases">Releases</h2>
+
+<ul>
+<li><a href="/releases/qpid-broker-j-7.0.0">Qpid Broker-J 7.0.0</a></li>
+<li><a href="/releases/index.html#past-releases">Past releases</a></li>
+</ul>
+
+<h2 id="issues">Issues</h2>
+
+<ul>
+<li><a href="https://issues.apache.org/jira/secure/CreateIssue.jspa?pid=12310520&amp;issuetype=1&amp;priority=3">Report a bug</a></li>
+<li><a href="https://issues.apache.org/jira/secure/CreateIssue.jspa?pid=12310520&amp;issuetype=4&amp;priority=3">Request an improvement</a></li>
+<li><form id="-jira-goto-form">Go to issue <input name="jira" value="QPID-"/></form></li>
+<li><a href="https://issues.apache.org/jira/browse/QPID">JIRA project page</a></li>
+</ul>
+
+<h2 id="source-code">Source code</h2>
+
+<ul>
+<li><a href="https://github.com/apache/qpid-broker-j">Browse via GitHub</a></li>
+<li><a href="https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git">Git clone URL</a></li>
+</ul>
+
+<h2 id="resources">Resources</h2>
+
+<ul>
+<li><a href="security.html">Security</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/qpid/qpid+java+faq">FAQ</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/qpid/java+broker+design">Design documents</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/qpid/qpid+extensions+to+amqp">Qpid extensions to AMQP</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/qpid/qpid+java+documentation">More on the wiki</a></li>
+</ul>
+
+</div>
+
+
+          <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/0e1f0cc4/content/components/broker-j/security.html
----------------------------------------------------------------------
diff --git a/content/components/broker-j/security.html b/content/components/broker-j/security.html
new file mode 100644
index 0000000..e0c8636
--- /dev/null
+++ b/content/components/broker-j/security.html
@@ -0,0 +1,183 @@
+<!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>Security - 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/broker-j/index.html">Broker-J</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="/components/index.html">Components</a></li><li><a href="/components/broker-j/index.html">Broker-J</a></li><li>Security</li></ul>
+
+        <div id="-middle-content">
+          <h1 id="security">Security</h1>
+
+<table>
+<thead>
+<tr>
+  <th>CVE-ID</th>
+  <th>Severity</th>
+  <th>Affected versions</th>
+  <th>Fixed versions</th>
+  <th>Summary</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+  <td><a href="/cves/CVE-2016-3094.html">CVE-2016-3094</a></td>
+  <td>Important</td>
+  <td>6.0.0, 6.0.1, and 6.0.2</td>
+  <td>6.0.3</td>
+  <td>Denial of service</td>
+</tr>
+<tr>
+  <td><a href="/cves/CVE-2016-4432.html">CVE-2016-4432</a></td>
+  <td>Important</td>
+  <td>6.0.2 and earlier</td>
+  <td>6.0.3</td>
+  <td>Authentication bypass</td>
+</tr>
+<tr>
+  <td><a href="/cves/CVE-2016-8741.html">CVE-2016-8741</a></td>
+  <td>Moderate</td>
+  <td>6.0.1, 6.0.2, 6.0.3, 6.0.4, 6.0.5, and 6.1.0</td>
+  <td>6.0.6, 6.1.1</td>
+  <td>Information leakage</td>
+</tr>
+</tbody>
+</table>
+
+<p>See the main <a href="/security.html">security</a> page for general
+information and details for other components.</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/0e1f0cc4/content/components/cpp-broker/index.html
----------------------------------------------------------------------
diff --git a/content/components/cpp-broker/index.html b/content/components/cpp-broker/index.html
index 6f7513b..ec6147c 100644
--- a/content/components/cpp-broker/index.html
+++ b/content/components/cpp-broker/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/cpp-broker/security.html
----------------------------------------------------------------------
diff --git a/content/components/cpp-broker/security.html b/content/components/cpp-broker/security.html
index a9071f0..5897a36 100644
--- a/content/components/cpp-broker/security.html
+++ b/content/components/cpp-broker/security.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/dispatch-router/addressing.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/addressing.html b/content/components/dispatch-router/addressing.html
index 5952a59..73bfb09 100644
--- a/content/components/dispatch-router/addressing.html
+++ b/content/components/dispatch-router/addressing.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/dispatch-router/amqp-mapping.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/amqp-mapping.html b/content/components/dispatch-router/amqp-mapping.html
index 09f46e6..1de9996 100644
--- a/content/components/dispatch-router/amqp-mapping.html
+++ b/content/components/dispatch-router/amqp-mapping.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/dispatch-router/index.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/index.html b/content/components/dispatch-router/index.html
index 4a6f171..1ff39d2 100644
--- a/content/components/dispatch-router/index.html
+++ b/content/components/dispatch-router/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/dispatch-router/overview.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/overview.html b/content/components/dispatch-router/overview.html
index c321b21..cfc1e86 100644
--- a/content/components/dispatch-router/overview.html
+++ b/content/components/dispatch-router/overview.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/dispatch-router/release-0.1.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/release-0.1.html b/content/components/dispatch-router/release-0.1.html
index b5ae8f2..a1075e5 100644
--- a/content/components/dispatch-router/release-0.1.html
+++ b/content/components/dispatch-router/release-0.1.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/index.html
----------------------------------------------------------------------
diff --git a/content/components/index.html b/content/components/index.html
index 28f2ea6..4e0e9c0 100644
--- a/content/components/index.html
+++ b/content/components/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -147,7 +147,7 @@ reliability.</p>
 <a href="http://en.wikipedia.org/wiki/Message-oriented_middleware">message-oriented middleware</a>
 brokers.  They offer specialized queueing behaviors, message
 persistence, and manageability.  Qpid offers pure-Java and native-code
-implementations, the <a href="java-broker/index.html">Broker for Java</a> and the
+implementations, the <a href="broker-j/index.html">Broker-J</a> and the
 <a href="cpp-broker/index.html">C++ broker</a>.</p>
 
 <p><a href="dispatch-router/index.html">Dispatch router</a> is a new kind of
@@ -165,7 +165,7 @@ connecting clients, brokers, and standalone services.</p>
 <h2 id="messaging-servers">Messaging servers</h2>
 
 <ul>
-<li><a href="java-broker/index.html">Broker for Java</a> - A pure-Java AMQP message broker</li>
+<li><a href="broker-j/index.html">Broker-J</a> - A pure-Java AMQP message broker</li>
 <li><a href="cpp-broker/index.html">C++ broker</a> - A native-code AMQP message broker</li>
 <li><a href="dispatch-router/index.html">Dispatch router</a> - An AMQP router for scalable messaging interconnect</li>
 </ul>
@@ -197,7 +197,7 @@ connecting clients, brokers, and standalone services.</p>
   <td>1.0</td>
 </tr>
 <tr>
-  <td><a href="/components/java-broker/index.html">Broker for Java</a></td>
+  <td><a href="/components/broker-j/index.html">Broker-J</a></td>
   <td>-</td>
   <td>JVM</td>
   <td>1.0, 0-10, 0-9-1, 0-9, 0-8</td>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/interop-test/index.html
----------------------------------------------------------------------
diff --git a/content/components/interop-test/index.html b/content/components/interop-test/index.html
index 1cac596..8f702a3 100644
--- a/content/components/interop-test/index.html
+++ b/content/components/interop-test/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/java-broker/index.html
----------------------------------------------------------------------
diff --git a/content/components/java-broker/index.html b/content/components/java-broker/index.html
index 92b0877..7b6cc26 100644
--- a/content/components/java-broker/index.html
+++ b/content/components/java-broker/index.html
@@ -21,7 +21,7 @@
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   <head>
-    <title>Broker for Java - Apache Qpid&#8482;</title>
+    <title>index.html - 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"/>
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -111,95 +111,14 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/components/index.html">Components</a></li><li>Broker for Java</li></ul>
+        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/components/index.html">Components</a></li><li>index.html</li></ul>
 
         <div id="-middle-content">
-          <div id="-left-column">
+          <script type="javascript">
+window.location.href="../broker-j/index.html";
+</script>
 
-<h1 id="broker-for-java">Broker for Java</h1>
-
-<div class="feature">
-
-<p>A <a href="http://en.wikipedia.org/wiki/Message-oriented_middleware">message-oriented middleware</a> message broker written in Java
-that stores, routes, and forwards messages using AMQP.</p>
-
-</div>
-
-<h2 id="features">Features</h2>
-
-<div class="two-column">
-
-<ul>
-<li><a href="http://www.oracle.com/technetwork/java/docs-136352.html">JMS 1.1</a> compliant</li>
-<li>Speaks and translates among all versions of AMQP</li>
-<li>Management via JMX, REST, QMF, and web console</li>
-<li><a href="/releases/qpid-java-6.1.4/java-broker/book/Java-Broker-Security-ACLs.html">Access control lists</a></li>
-<li>Flexible logging</li>
-<li>Flow to disk</li>
-<li>Header-based routing</li>
-<li>Heartbeats</li>
-<li><a href="/releases/qpid-java-6.1.4/java-broker/book/Java-Broker-High-Availability.html">High availability</a></li>
-<li>Message groups</li>
-<li>Pluggable persistence supporting Derby, SQL, and BDB stores</li>
-<li><a href="/releases/qpid-java-6.1.4/java-broker/book/Java-Broker-Security.html#Java-Broker-Security-Authentication-Providers">Pluggable authentication</a> supporting LDAP, Kerberos, and SSL client certificates</li>
-<li><a href="/releases/qpid-java-6.1.4/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control">Producer flow control</a></li>
-<li>Secure connection via SSL</li>
-<li>Server-side selectors</li>
-<li>Specialized queuing with last value queue, priority queue, and sorted queue</li>
-<li>Threshold alerts</li>
-<li>Transactions</li>
-<li><a href="/releases/qpid-java-6.1.4/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html">Undeliverable message handling</a></li>
-<li>Virtual hosts</li>
-<li>Support for message compression</li>
-</ul>
-
-</div>
-
-<h2 id="documentation">Documentation</h2>
-
-<ul>
-<li><a href="/releases/qpid-java-6.1.4/java-broker/book/index.html">Broker book</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/qpid/qpid+java+build+how+to">How to build Apache Qpid for Java</a></li>
-</ul>
-
-</div>
-
-<div id="-right-column" class="right-column-adjusted">
-
-<h2 id="releases">Releases</h2>
-
-<ul>
-<li><a href="/releases/qpid-java-6.1.4">Qpid for Java 6.1.4</a></li>
-<li><a href="/releases/index.html#past-releases">Past releases</a></li>
-</ul>
-
-<h2 id="issues">Issues</h2>
-
-<ul>
-<li><a href="https://issues.apache.org/jira/secure/CreateIssue.jspa?pid=12310520&amp;issuetype=1&amp;priority=3">Report a bug</a></li>
-<li><a href="https://issues.apache.org/jira/secure/CreateIssue.jspa?pid=12310520&amp;issuetype=4&amp;priority=3">Request an improvement</a></li>
-<li><form id="-jira-goto-form">Go to issue <input name="jira" value="QPID-"/></form></li>
-<li><a href="https://issues.apache.org/jira/browse/QPID">JIRA project page</a></li>
-</ul>
-
-<h2 id="source-code">Source code</h2>
-
-<ul>
-<li><a href="https://github.com/apache/qpid-broker-j">Browse via GitHub</a></li>
-<li><a href="https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git">Git clone URL</a></li>
-</ul>
-
-<h2 id="resources">Resources</h2>
-
-<ul>
-<li><a href="security.html">Security</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/qpid/qpid+java+faq">FAQ</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/qpid/java+broker+design">Design documents</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/qpid/qpid+extensions+to+amqp">Qpid extensions to AMQP</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/qpid/qpid+java+documentation">More on the wiki</a></li>
-</ul>
-
-</div>
+<p>The page was moved <a href="../broker-j/index.html">here</a>.</p>
 
 
           <hr/>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/java-broker/security.html
----------------------------------------------------------------------
diff --git a/content/components/java-broker/security.html b/content/components/java-broker/security.html
index 20706a5..58d8019 100644
--- a/content/components/java-broker/security.html
+++ b/content/components/java-broker/security.html
@@ -21,7 +21,7 @@
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   <head>
-    <title>Security - Apache Qpid&#8482;</title>
+    <title>security.html - 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"/>
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -111,48 +111,14 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/components/index.html">Components</a></li><li><a href="/components/java-broker/index.html">Broker for Java</a></li><li>Security</li></ul>
+        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/components/index.html">Components</a></li><li><a href="/components/java-broker/index.html">index.html</a></li><li>security.html</li></ul>
 
         <div id="-middle-content">
-          <h1 id="security">Security</h1>
-
-<table>
-<thead>
-<tr>
-  <th>CVE-ID</th>
-  <th>Severity</th>
-  <th>Affected versions</th>
-  <th>Fixed versions</th>
-  <th>Summary</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-  <td><a href="/cves/CVE-2016-3094.html">CVE-2016-3094</a></td>
-  <td>Important</td>
-  <td>6.0.0, 6.0.1, and 6.0.2</td>
-  <td>6.0.3</td>
-  <td>Denial of service</td>
-</tr>
-<tr>
-  <td><a href="/cves/CVE-2016-4432.html">CVE-2016-4432</a></td>
-  <td>Important</td>
-  <td>6.0.2 and earlier</td>
-  <td>6.0.3</td>
-  <td>Authentication bypass</td>
-</tr>
-<tr>
-  <td><a href="/cves/CVE-2016-8741.html">CVE-2016-8741</a></td>
-  <td>Moderate</td>
-  <td>6.0.1, 6.0.2, 6.0.3, 6.0.4, 6.0.5, and 6.1.0</td>
-  <td>6.0.6, 6.1.1</td>
-  <td>Information leakage</td>
-</tr>
-</tbody>
-</table>
-
-<p>See the main <a href="/security.html">security</a> page for general
-information and details for other components.</p>
+          <script type="javascript">
+window.location.href="../broker-j/security.html";
+</script>
+
+<p>The page was moved <a href="../broker-j/security.html">here</a>.</p>
 
 
           <hr/>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/jms/amqp-0-x.html
----------------------------------------------------------------------
diff --git a/content/components/jms/amqp-0-x.html b/content/components/jms/amqp-0-x.html
index b7403a3..a95d7e0 100644
--- a/content/components/jms/amqp-0-x.html
+++ b/content/components/jms/amqp-0-x.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/jms/index.html
----------------------------------------------------------------------
diff --git a/content/components/jms/index.html b/content/components/jms/index.html
index fab62a0..3d51333 100644
--- a/content/components/jms/index.html
+++ b/content/components/jms/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/jms/security-0-x.html
----------------------------------------------------------------------
diff --git a/content/components/jms/security-0-x.html b/content/components/jms/security-0-x.html
index cf9c0cf..eb5cc50 100644
--- a/content/components/jms/security-0-x.html
+++ b/content/components/jms/security-0-x.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/jms/security.html
----------------------------------------------------------------------
diff --git a/content/components/jms/security.html b/content/components/jms/security.html
index d25781e..025fdff 100644
--- a/content/components/jms/security.html
+++ b/content/components/jms/security.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/components/messaging-api/index.html
----------------------------------------------------------------------
diff --git a/content/components/messaging-api/index.html b/content/components/messaging-api/index.html
index b05ad9d..3e080b6 100644
--- a/content/components/messaging-api/index.html
+++ b/content/components/messaging-api/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/contributors.html
----------------------------------------------------------------------
diff --git a/content/contributors.html b/content/contributors.html
index 0f9a4bd..a09fb38 100644
--- a/content/contributors.html
+++ b/content/contributors.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2014-3629.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2014-3629.html b/content/cves/CVE-2014-3629.html
index 761953e..d7554d7 100644
--- a/content/cves/CVE-2014-3629.html
+++ b/content/cves/CVE-2014-3629.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2015-0203.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2015-0203.html b/content/cves/CVE-2015-0203.html
index 5b7d096..297e62a 100644
--- a/content/cves/CVE-2015-0203.html
+++ b/content/cves/CVE-2015-0203.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2015-0223.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2015-0223.html b/content/cves/CVE-2015-0223.html
index 86b4f1b..c760f35 100644
--- a/content/cves/CVE-2015-0223.html
+++ b/content/cves/CVE-2015-0223.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2015-0224.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2015-0224.html b/content/cves/CVE-2015-0224.html
index 26d1a84..b44c70c 100644
--- a/content/cves/CVE-2015-0224.html
+++ b/content/cves/CVE-2015-0224.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2016-2166.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2016-2166.html b/content/cves/CVE-2016-2166.html
index c00eafa..b5e7e25 100644
--- a/content/cves/CVE-2016-2166.html
+++ b/content/cves/CVE-2016-2166.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2016-3094.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2016-3094.html b/content/cves/CVE-2016-3094.html
index 9648dcd..0758502 100644
--- a/content/cves/CVE-2016-3094.html
+++ b/content/cves/CVE-2016-3094.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -122,7 +122,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 
 <h2 id="affected-components">Affected components</h2>
 
-<p>Broker for Java</p>
+<p>Broker-J</p>
 
 <h2 id="affected-versions">Affected versions</h2>
 
@@ -137,7 +137,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <p>Denial of Service.</p>
 
 <p>A malformed authentication attempt may cause the broker to terminate.
-The Apache Qpid Broker for Java supports a number of configurable
+The Apache Qpid Broker-J supports a number of configurable
 authentication providers each supporting various SASL mechanisms. Some
 mechanisms need (or can be configured to accept) plain-text passwords
 being sent to the Broker (using the SASL "PLAIN" mechanism).  Where
@@ -153,7 +153,7 @@ on non-TLS ports, but enabled on TLS connections).</p>
 
 <h2 id="mitigation">Mitigation</h2>
 
-<p>Users should upgrade their Apache Qpid Broker for Java to
+<p>Users should upgrade their Apache Qpid Broker-J to
 version 6.0.3 or later.  If this is not possible, users can disable
 the PLAIN mechanism for their authentication manager on versions 0.32
 and later by adding "PLAIN" to the list of disabledMechanisms on their

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2016-4432.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2016-4432.html b/content/cves/CVE-2016-4432.html
index 7e19dfe..8ab3d60 100644
--- a/content/cves/CVE-2016-4432.html
+++ b/content/cves/CVE-2016-4432.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -122,7 +122,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 
 <h2 id="affected-components">Affected components</h2>
 
-<p>Qpid Broker for Java</p>
+<p>Qpid Broker-J</p>
 
 <h2 id="affected-versions">Affected versions</h2>
 
@@ -150,7 +150,7 @@ require SSL client authentication for all messaging connections.</p>
 
 <h2 id="resolution">Resolution</h2>
 
-<p>Users should upgrade the Apache Qpid Broker for Java to
+<p>Users should upgrade the Apache Qpid Broker-J to
 version 6.0.3 or later (recommended).</p>
 
 <h2 id="mitigation">Mitigation</h2>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2016-4467.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2016-4467.html b/content/cves/CVE-2016-4467.html
index 48a6dc4..ec373af 100644
--- a/content/cves/CVE-2016-4467.html
+++ b/content/cves/CVE-2016-4467.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2016-4974.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2016-4974.html b/content/cves/CVE-2016-4974.html
index 0f13648..f38b3d6 100644
--- a/content/cves/CVE-2016-4974.html
+++ b/content/cves/CVE-2016-4974.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2016-4974_0-x.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2016-4974_0-x.html b/content/cves/CVE-2016-4974_0-x.html
index f1de83e..accd8d6 100644
--- a/content/cves/CVE-2016-4974_0-x.html
+++ b/content/cves/CVE-2016-4974_0-x.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/CVE-2016-8741.html
----------------------------------------------------------------------
diff --git a/content/cves/CVE-2016-8741.html b/content/cves/CVE-2016-8741.html
index 6835235..5b933f2 100644
--- a/content/cves/CVE-2016-8741.html
+++ b/content/cves/CVE-2016-8741.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -122,7 +122,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 
 <h2 id="affected-components">Affected components</h2>
 
-<p>Qpid Broker for Java</p>
+<p>Qpid Broker-J</p>
 
 <h2 id="affected-versions">Affected versions</h2>
 
@@ -136,7 +136,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 
 <p>Information Leakage.</p>
 
-<p>The Qpid Broker for Java can be configured to use different so called
+<p>The Qpid Broker-J can be configured to use different so called
 AuthenticationProviders to handle user authentication.  Among the
 choices are the SCRAM-SHA-1 and SCRAM-SHA-256 AuthenticationProvider
 types.</p>
@@ -151,7 +151,7 @@ SCRAM-SHA-1 and SCRAM-SHA-256.</p>
 
 <h2 id="mitigation">Mitigation</h2>
 
-<p>Users should upgrade the Qpid Broker for Java to version 6.0.6,
+<p>Users should upgrade the Qpid Broker-J to version 6.0.6,
 6.1.1, or later (recommended).</p>
 
 <p>If upgrading is not possible, the vulnerability can be mitigated by

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/cves/template.html
----------------------------------------------------------------------
diff --git a/content/cves/template.html b/content/cves/template.html
index 31e5664..ed72f48 100644
--- a/content/cves/template.html
+++ b/content/cves/template.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/dashboard.html
----------------------------------------------------------------------
diff --git a/content/dashboard.html b/content/dashboard.html
index 04adc5a..7685983 100644
--- a/content/dashboard.html
+++ b/content/dashboard.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -140,9 +140,9 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 </thead>
 <tbody>
 <tr>
-  <td><a href="/components/java-broker/index.html">Qpid Broker-J</a></td>
-  <td><a href="/releases/qpid-java-6.1.4">6.1.4</a></td>
-  <td><a href="https://issues.apache.org/jira/projects/QPID">Summary</a> &#x2022; <a href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPID+and+resolution+is+null+and+component+in+%28%22Java+Broker%22%2C+%22Java+Build%22%2C+%22Java+Client%22%2C+%22Java+Common%22%2C+%22Java+Documentation%22%2C+%22Java+Performance+Tests%22%2C+%22Java+Tests%22%2C+%22Java+Tools%22%2C+%22JCA%22%29">Open issues</a> &#x2022; <a href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPID+and+component+in+%28%22Java+Broker%22%2C+%22Java+Build%22%2C+%22Java+Client%22%2C+%22Java+Common%22%2C+%22Java+Documentation%22%2C+%22Java+Performance+Tests%22%2C+%22Java+Tests%22%2C+%22Java+Tools%22%2C+%22JCA%22%29">All issues</a> &#x2022; <a href="https://issues.apache.org/jira/secure/CreateIssue!default.jspa?pid=12310520">Create issue</a></td>
+  <td><a href="/components/broker-j/index.html">Qpid Broker-J</a></td>
+  <td><a href="/releases/qpid-broker-j-7.0.0">7.0.0</a></td>
+  <td><a href="https://issues.apache.org/jira/projects/QPID">Summary</a> &#x2022; <a href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPID+and+resolution+is+null+and+component+in+%28%22Java+Broker%22%2C+%22Java+Build%22%2C+%22Java+Documentation%22%2C+%22Java+Performance+Tests%22%2C+%22Java+Tests%22%2C+%22Java+Tools%22%29">Open issues</a> &#x2022; <a href="https://issues.apache.org/jira/issues/?jql=project+%3D+QPID+and+component+in+%28%22Java+Broker%22%2C+%22Java+Build%22%2C+%22Java+Documentation%22%2C+%22Java+Performance+Tests%22%2C+%22Java+Tests%22%2C+%22Java+Tools%22%29">All issues</a> &#x2022; <a href="https://issues.apache.org/jira/secure/CreateIssue!default.jspa?pid=12310520">Create issue</a></td>
   <td><a href="https://builds.apache.org/blue/organizations/jenkins/Qpid-BrokerForJava-Test-IBMJDK1.8/activity"><img src="https://builds.apache.org/buildStatus/icon?job=Qpid-BrokerForJava-Test-IBMJDK1.8" height="20"/></a> <a href="https://builds.apache.org/blue/organizations/jenkins/Qpid-BrokerForJava-Checks/activity"><img src="https://builds.apache.org/buildStatus/icon?job=Qpid-BrokerForJava-Checks" height="20"/></a> <a href="https://builds.apache.org/blue/organizations/jenkins/Qpid-Python-Java-Test/activity"><img src="https://builds.apache.org/buildStatus/icon?job=Qpid-Python-Java-Test" height="20"/></a></td>
   <td><a href="https://git-wip-us.apache.org/repos/asf/qpid-broker-j.git">Git</a> &#x2022; <a href="https://github.com/apache/qpid-broker-j">GitHub</a></td>
 </tr>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/discussion.html
----------------------------------------------------------------------
diff --git a/content/discussion.html b/content/discussion.html
index 875d8dd..2f56f7e 100644
--- a/content/discussion.html
+++ b/content/discussion.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -169,7 +169,7 @@ unsubscribe address.</p>
 <p><strong>NOTE</strong>: The Qpid project offers various components in many different
 languages. When mailing the lists, please be specific about which
 component, or even which part of a given component, that you are
-using. For example, "I'm using the Qpid Broker for Java
+using. For example, "I'm using the Qpid Broker-J
 &lt;version&gt; with the Qpid JMS &lt;version&gt; AMQP 1.0 client"
 rather than "I'm using the broker and JMS client".</p>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/documentation.html
----------------------------------------------------------------------
diff --git a/content/documentation.html b/content/documentation.html
index d38cc65..245ea41 100644
--- a/content/documentation.html
+++ b/content/documentation.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -177,11 +177,11 @@ You can find older versions with our
 
 <section>
 
-<h3 id="broker-for-java">Broker for Java</h3>
+<h3 id="broker-j">Broker-J</h3>
 
 <ul>
-<li><a href="/components/java-broker/index.html">Overview</a></li>
-<li><a href="/releases/qpid-java-6.1.4/java-broker/book/index.html">Broker book</a></li>
+<li><a href="/components/broker-j/index.html">Overview</a></li>
+<li><a href="/releases/qpid-broker-j-7.0.0/book/index.html">Broker book</a></li>
 </ul>
 
 </section>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/download.html
----------------------------------------------------------------------
diff --git a/content/download.html b/content/download.html
index 4ff7073..975513f 100644
--- a/content/download.html
+++ b/content/download.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -181,9 +181,9 @@ process. The downloads on this page are from our
 </thead>
 <tbody>
 <tr>
-  <td><a href="/components/java-broker/index.html">Broker for Java</a></td>
-  <td><a href="http://www.apache.org/dyn/closer.lua/qpid/java/6.1.4/binaries/qpid-broker-6.1.4-bin.tar.gz">qpid-broker-6.1.4-bin.tar.gz</a>*</td>
-  <td><a href="http://www.apache.org/dist/qpid/java/6.1.4/binaries/qpid-broker-6.1.4-bin.tar.gz.asc">ASC</a>, <a href="http://www.apache.org/dist/qpid/java/6.1.4/binaries/qpid-broker-6.1.4-bin.tar.gz.md5">MD5</a>, <a href="http://www.apache.org/dist/qpid/java/6.1.4/binaries/qpid-broker-6.1.4-bin.tar.gz.sha">SHA512</a></td>
+  <td><a href="/components/broker-j/index.html">Broker-J</a></td>
+  <td><a href="http://www.apache.org/dyn/closer.lua/qpid/broker-j/7.0.0/binaries/apache-qpid-broker-j-7.0.0-bin.tar.gz">apache-qpid-broker-j-7.0.0-bin.tar.gz</a>*</td>
+  <td><a href="http://www.apache.org/dist/qpid/broker-j/7.0.0/binaries/apache-qpid-broker-j-7.0.0-bin.tar.gz.asc">ASC</a>, <a href="http://www.apache.org/dist/qpid/broker-j/7.0.0/binaries/apache-qpid-broker-j-7.0.0-bin.tar.gz.md5">MD5</a>, <a href="http://www.apache.org/dist/qpid/broker-j/7.0.0/binaries/apache-qpid-broker-j-7.0.0-bin.tar.gz.sha512">SHA512</a></td>
 </tr>
 <tr>
   <td><a href="/components/cpp-broker/index.html">C++ broker</a></td>
@@ -210,6 +210,11 @@ and
 <a href="http://www.apache.org/dist/qpid/jms/0.27.0/apache-qpid-jms-0.27.0-src.tar.gz.md5">MD5</a>,
 <a href="http://www.apache.org/dist/qpid/jms/0.27.0/apache-qpid-jms-0.27.0-src.tar.gz.sha512">SHA512</a>]
 and
+<a href="http://www.apache.org/dyn/closer.lua/qpid/broker-j/7.0.0/apache-qpid-broker-j-7.0.0-src.tar.gz">Qpid Broker-J source release</a>
+[<a href="http://www.apache.org/dist/qpid/broker-j/7.0.0/apache-qpid-broker-j-7.0.0-src.tar.gz.asc">ASC</a>,
+<a href="http://www.apache.org/dist/qpid/broker-j/7.0.0/apache-qpid-broker-j-7.0.0-src.tar.gz.md5">MD5</a>,
+<a href="http://www.apache.org/dist/qpid/broker-j/7.0.0/apache-qpid-broker-j-7.0.0-src.tar.gz.sha512">SHA512</a>]
+and
 <a href="http://www.apache.org/dyn/closer.lua/qpid/java/6.1.4/qpid-java-6.1.4.tar.gz">Qpid for Java source release</a>
 [<a href="http://www.apache.org/dist/qpid/java/6.1.4/qpid-java-6.1.4.tar.gz.asc">ASC</a>,
 <a href="http://www.apache.org/dist/qpid/java/6.1.4/qpid-java-6.1.4.tar.gz.md5">MD5</a>,

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/electron/index.html
----------------------------------------------------------------------
diff --git a/content/electron/index.html b/content/electron/index.html
index a6fe6fb..5db916a 100644
--- a/content/electron/index.html
+++ b/content/electron/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/get-involved.html
----------------------------------------------------------------------
diff --git a/content/get-involved.html b/content/get-involved.html
index 3fa0c69..4c672f2 100644
--- a/content/get-involved.html
+++ b/content/get-involved.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index c06df76..3a5216b 100644
--- a/content/index.html
+++ b/content/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -142,7 +142,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
   <h2>Deploy AMQP networks</h2>
   
   <ul>
-    <li><a href="/components/java-broker/index.html">Broker for Java</a> - A pure-Java AMQP message broker</li>
+    <li><a href="/components/broker-j/index.html">Broker-J</a> - A pure-Java AMQP message broker</li>
     <li><a href="/components/cpp-broker/index.html">C++ broker</a> - A native-code AMQP message broker</li>
     <li><a href="/components/dispatch-router/index.html">Dispatch router</a> - A lightweight AMQP message router</li>
   </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/issues.html
----------------------------------------------------------------------
diff --git a/content/issues.html b/content/issues.html
index 561dac6..8f99ee5 100644
--- a/content/issues.html
+++ b/content/issues.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/maven.html
----------------------------------------------------------------------
diff --git a/content/maven.html b/content/maven.html
index f5089b9..ef543d8 100644
--- a/content/maven.html
+++ b/content/maven.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/overview.html
----------------------------------------------------------------------
diff --git a/content/overview.html b/content/overview.html
index aad849c..ba77ac9 100644
--- a/content/overview.html
+++ b/content/overview.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/packages.html
----------------------------------------------------------------------
diff --git a/content/packages.html b/content/packages.html
index 2fb008c..f8e2e01 100644
--- a/content/packages.html
+++ b/content/packages.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/proton/contributing.html
----------------------------------------------------------------------
diff --git a/content/proton/contributing.html b/content/proton/contributing.html
index 14cd8ca..52a78f7 100644
--- a/content/proton/contributing.html
+++ b/content/proton/contributing.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/proton/index.html
----------------------------------------------------------------------
diff --git a/content/proton/index.html b/content/proton/index.html
index 9d9810c..3e6b5ec 100644
--- a/content/proton/index.html
+++ b/content/proton/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/proton/messenger.html
----------------------------------------------------------------------
diff --git a/content/proton/messenger.html b/content/proton/messenger.html
index e9e67b6..f04a46b 100644
--- a/content/proton/messenger.html
+++ b/content/proton/messenger.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/proton/overview.html
----------------------------------------------------------------------
diff --git a/content/proton/overview.html b/content/proton/overview.html
index b50c373..70b6845 100644
--- a/content/proton/overview.html
+++ b/content/proton/overview.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/proton/security.html
----------------------------------------------------------------------
diff --git a/content/proton/security.html b/content/proton/security.html
index 57adb61..ec04bab 100644
--- a/content/proton/security.html
+++ b/content/proton/security.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/proton/submitting-patches.html
----------------------------------------------------------------------
diff --git a/content/proton/submitting-patches.html b/content/proton/submitting-patches.html
index 431d9d5..08039de 100644
--- a/content/proton/submitting-patches.html
+++ b/content/proton/submitting-patches.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/index.html
----------------------------------------------------------------------
diff --git a/content/releases/index.html b/content/releases/index.html
index 7ca7a90..3d08028 100644
--- a/content/releases/index.html
+++ b/content/releases/index.html
@@ -83,7 +83,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for Java</a></li>
+              <li><a href="/components/broker-j/index.html">Broker-J</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>
@@ -126,6 +126,7 @@ the
 <div class="two-column">
 
 <ul>
+<li><a href="qpid-broker-j-7.0.0/index.html">Qpid Broker-J 7.0.0</a>, November 2017</li>
 <li><a href="qpid-jms-0.27.0/index.html">Qpid JMS 0.27.0</a>, October 2017</li>
 <li><a href="qpid-proton-0.18.1/index.html">Qpid Proton 0.18.1</a>, November 2017</li>
 <li><a href="qpid-proton-j-0.23.0/index.html">Qpid Proton-J 0.23.0</a>, October 2017</li>


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