QPID-5610: add/update LICENSE,NOTICE,README.txt and dep check reference files for the source tree/archive and the binary assembly releases

merge from trunk r1617244


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1617249 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 715 insertions, 126 deletions

diff --git a/qpid/tools/src/java/qpid-qmf2-tools/LICENSE b/qpid/tools/src/java/LICENSE
index d645695673..9f8ad3766d 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/LICENSE
+++ b/qpid/tools/src/java/LICENSE
@@ -200,3 +200,67 @@
    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.
+
+
+
+###############################################
+# Third Party Dependency Licensing Information:
+###############################################
+
+qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/jquery.js
+
+The QMF2 tools bundle jquery.js which is under the MIT licence:
+
+
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+###############################################
+
+qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/iscroll.js
+
+The QMF2 tools bundle iscroll.js which is under the MIT licence:
+
+
+Copyright (c) 2012 Matteo Spinelli, http://cubiq.org/
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+###############################################
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/NOTICE b/qpid/tools/src/java/NOTICE
index 10ecbc6884..cac16200cc 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/NOTICE
+++ b/qpid/tools/src/java/NOTICE
@@ -1,4 +1,4 @@
-Apache Qpid QMF2 Tools
+Apache Qpid QMF2 Java
 Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/qpid/tools/src/java/README.txt b/qpid/tools/src/java/README.txt
index 48b609049c..60beaf303b 100644
--- a/qpid/tools/src/java/README.txt
+++ b/qpid/tools/src/java/README.txt
@@ -37,10 +37,10 @@ the combined tools package and the broker plugin which can be extracted for inst
 There is fairly comprehensive JavaDoc available, which you can generate in a couple of ways:
 
 mvn javadoc:aggregate  - Builds the Javadoc for all the modules combined, output located at:
-qpid/tools/src/java/target/site/apidocs/index.html
+target/site/apidocs/index.html
 
 mvn javadoc:javadoc    - Builds the Javadoc for each module in turn individually, output located at:
-qpid/tools/src/java/<module>/target/site/apidocs/index.html
+<module>/target/site/apidocs/index.html
 
 
 N.B. At the moment the QMF2 API and tools use the "traditional" Qpid AMQP 0.10 JMS API. The intention is that
@@ -54,16 +54,16 @@ https://cwiki.apache.org/confluence/display/qpid/QMFv2+API+Proposal
 
 Once built as described earlier, the API jar is included in the overall tools bundle described below, and
 additionally the API jar itself file will be placed in:
-qpid/tools/src/java/qpid-qmf2/target
+qpid-qmf2/target
 
 There is fairly comprehensive JavaDoc available, see earlier for build instructions.
 
 Looking at the source code for the tools (see "The Tools" below) might be a quicker way to get started.
 
 The source code for the Java QMF2 API can be found under:
-qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console
-qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent
-qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common
+qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console
+qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent
+qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common
 
 console: contains the classes for the QMF2 "console", which is what most of the tools make use of
 agent: contains the classes for the QMF2 "agent", which it what exposes management services, this is
@@ -76,44 +76,24 @@ A number of Java based tools are provided, and additionally a web based GUI with
 are described later, utilising the core components from the API outlined above.
 
 Once built as described earlier, the tools jar is included in the overall tools release tar.gz placed in:
-qpid/tools/src/java/qpid-qmf2-tools/target
+qpid-qmf2-tools/target
 
 There are executable shell scripts included in the tools bundle that should allow the tools to be run fairly
 easily. To use them, extract the tar.gz release to your preferred installation location, and open the
 included bin/ directory.
 
 The source code for the Java QMF2 Tools can be found under:
-qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools
-
-The available tools are:
-QpidConfig: Is a Java port of the standard Python based qpid-config tool. This exercises most of the QMF2 API
-            and is probably a good bet to see how things work if you want to use the API in your own projects.
-QpidCtrl: Is a Java port of the qpid-ctrl tool found in qpid/cpp/src/tests. This is a little known, but useful
-          little tool that lets one send low-level QMF constructs from the command line. The JavaDoc is the
-          best place to look for example usage (see earlier for build instructions).
-QpidPrintEvents: Is a Java port of the Python qpid-printevents and illustrates the asynchronous delivery
-                 of QMF2 notification events.
-QpidQueueStats: Is a Java port of the Python qpid-queue-stats. This was written mainly to illustrate the use
-                of the QMF2 "QuerySubscription" API that lets one specify how to be asynchronously notified
-                of changes to QMF Management Objects matching a specified set of criteria.
-ConnectionAudit: Is a tool that allows one to audit connections to one or more Qpid brokers. It uses QMF
-                 Events to identify when connections have been made to a broker and if so it logs information
-                 about the connection. A whitelist can be specified to flag connections that you don't
-                 want to have logged (e.g. ones that you like).
-ConnectionLogger: Is similar to ConnectionAudit but a bit simpler this tool just logs connections being made
-                  the tool is mainly there to illustrate how to dereference the associations between the
-                  various QMF Management Objects (Connection, Session, Subscription, Queue, Binding Exchange etc.)
-QueueFuse: Is a tool that monitors QMF Events looking for a QueueThresholdExceeded, which occurs when a queue
-           gets more than 80% full. When this Event occurs the tool sends a QMF method to "purge" 10% of the
-           messages off the offending queue, i.e. it acts rather like a fuse. It's mainly a bit of a toy, but
-           it's a pretty good illustration of how to trigger QMF method invocation from QMF Events. It would
-           be pretty easy to modify this to redirect messages to a different queue if a particular queue fills.
-QpidRestAPI: This is a Web Service that exposes QMF2 via a REST API, see "The GUI" section below for details.
+qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools
+
+
+For more details of the available tools, see the README.txt in the qpid-qmf2-tools folder, which is also
+included in the tar.gz release.
 
 ************************************************* The GUI *************************************************
 
 Included in the tools package, there is a fairly comprehensive Web based GUI available for Qpid that works
-with the C++ Broker and also the Java Broker if the QMF plugin has been installed (see README-Java-Broker.txt).
+with the C++ Broker and also the Java Broker if the QMF management plugin has been installed (see the
+qpid-broker-plugins-management-qmf2 directory and contained README.txt).
 
 The GUI is in the form of a pure client side "single page" Web App written in JavaScript that uses the
 QpidRestAPI to proxy the QMF API, and also serve up the GUI.
@@ -126,89 +106,6 @@ QpidServer: This provides documentation for the actual REST API itself, in effec
 QpidRestAPI provides a fairly complete REST mapping for QMF, it was primarily written as the back-end to
 the GUI, but there's no reason why it couldn't be used in its own right.
 
-To get started, after you have extracted the tools release as described earlier, the simplest and probably
-most common use case can be kicked offby changing into the bin/ directory and firing up the REST API via:
-./QpidRestAPI
-
-This will bind the HTTP port to 8080 on the "wildcard" address (0.0.0.0). The QMF connection will default to
-the host that QpidRestAPI is running on and use the default AMQP port 5672.
-
-If you point a Browser to <host>:8080 the GUI should start up asking for a User Name and Password, the
-defaults for those are the rather "traditional" admin admin.
-
-
-If you have a non-trivial broker set-up you'll probably see "Failed to Connect", which is most likely due
-to having authentication enabled (you can check this by firing up the C++ broker using qpidd --auth no)
-
-
-There are a few ways to configure the Brokers that you can control via the GUI:
-The first way is to specify the -a (or --broker-addr) command line option e.g.
-./QpidRestAPI -a guest/guest@localhost
-
-This option accepts the Broker Address syntax used by the standard Python tools and it also accepts the
-Java ConnectionURL syntax specified here (though to be honest the syntax used by the Python tools is simpler)
-http://qpid.apache.org/releases/qpid-0.24/programming/book/QpidJNDI.html#section-jms-connection-url
-
-
-This way of specifying the AMQP address of the default broker that you want to manage is probably the best
-approach, but it is possible to add as many QMF Console Connections as you like by clicking
-"Add QMF Console Connection" on the GUI Settings page. The popup lets you specify the Address URL such as
-"guest/guest@host:5672" - again it also accepts the JMS Connection URLs, though I only use them if I'm
-doing a copy/paste of an existing Connection URL.
-The Name is simply a "friendly name" that you want to use to identify a particular Broker.
-
-
-Clearly if you want to be able to manage a number of brokers you'd probably prefer not to have to enter
-them every time you fire up the GUI - particularly because the list gets wiped if you hit refresh :-)
-
-The good news is that the initial set of Console Connections is configurable via the file:
-qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/config.js
-
-
-This is a simple JSON file and it contains example Console Connection configuration including a fairly complex one
-
-If you use this mechanism to configure the GUI you can quickly switch between however many Brokers
-you'd like to be able to control.
-
-
-As mentioned above the default User Name and Password are admin and admin, these are set in the file
-qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/authentication/account.properties
-
-
-It's worth pointing out that at the moment authentication is limited to basic uthentication. This is mainly
-due to lack of time/energy/motivation to do anything fancier (I only tend to use it on a private network)
-I also had a need to minimise dependencies, so the Web Server is actually based on the Java 1.6
-com.sun.net.httpserver Web Server.
-
-
-In practice though basic authentication shouldn't be as much of a restriction as it might sound especially
-if you're only managing a single Broker.
-
-When one fires up QpidRestAPI with the -a option the Broker connection information does not pass between the
-GUI and the QpidRestAPI so it's ultimately no less secure than using say qpid-config in this case though
-note that if one configures multiple Brokers via config.js the contents of that file get served to the GUI
-when it gets loaded so you probably want to restrict use of the GUI to the same network you'd be happy to
-run qpid-config from.
-
-
-
-
-
-*********************************************** Important!! ***********************************************
-*  If your Qpid C++ broker is older than 0.10 the QMF2 API won't work unless your setup is as follows:    *
-*********************************************** Important!! ***********************************************
-
-Note that if you are talking to a broker < Qpid 0.10
-you need to set "--mgmt-qmf2 yes" when you start up qpidd if you want to get QMF2 Events and heartbeats pushed.
-This is particularly important to note if you are using the Qpid GUI, as in default mode its updates are
-triggered by the QMF2 heartbeats. If "--mgmt-qmf2 yes" isn't set on a 0.8 broker you'll see "Broker Disconnected"
-flash briefly every 30 seconds or so as timeouts occur. Creating a QMF Console Connecton in the GUI with
-"Disable Events" selected uses a timed poll rather than a heartbeat so it may be better to do that for cases
-where access to the broker configuration is not available.
-
-***********************************************************************************************************
-
-Note 1: This uses QMF2 so requires that the "--mgmt-qmf2 yes" option is applied to the broker (this is
-        the default from Qpid 0.10 onwards)
 
-Note 2: In order to use QMF2 the app-id field needs to be set. This requires the Qpid 0.12+ Java client
+For more details of the GUI, see the README.txt in the qpid-qmf2-tools folder, which is also included
+in the tar.gz release.
diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt
index b1226347ce..d6f46a895f 100644
--- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt
@@ -43,8 +43,8 @@ You can then configure the extracted broker as described below.
 
 *********************************************** Installing *************************************************
 
-To install a release of the plugin, extract the release assembly and copy all of the files from the lib/ dir
-into either the lib/ or lib/plugins/ directory of your extracted broker installation.
+To install a release of the plugin, extract the release assembly and copy all of the files from the contained
+lib/ directory into the corresponding lib/ directory of your extracted broker installation.
 
 You can then configure the broker as described below.
 
@@ -73,7 +73,7 @@ HTTP port to something other than 8080, or the brokers list of "ports" in $QPID_
 {
     "id" :   <UUID>,
     "name" : "HTTP",
-    "port" : "${qpid.jmx_port}"
+    "port" : "${qpid.http_port}"
     "protocols" : [ "HTTP" ]
   }
 
diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
index 298f73695b..c321c4d407 100644
--- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
@@ -28,6 +28,10 @@
   <name>Qpid QMF2 Management Broker Plug-in</name>
   <description>QMF2 Management broker plug-in</description>
 
+  <properties>
+    <dependency-change-verification>true</dependency-change-verification>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.qpid</groupId>
diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE
index d645695673..6b108e5ecb 100644
--- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/LICENSE
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE
@@ -200,3 +200,36 @@
    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.
+
+
+
+###############################################
+# Third Party Dependency Licensing Information:
+###############################################
+
+This product bundles the slf4j-api jar, which is under the MIT licence:
+
+Copyright (c) 2004-2013 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free  of charge, to any person obtaining
+ a  copy  of this  software  and  associated  documentation files  (the
+ "Software"), to  deal in  the Software without  restriction, including
+ without limitation  the rights to  use, copy, modify,  merge, publish,
+ distribute,  sublicense, and/or sell  copies of  the Software,  and to
+ permit persons to whom the Software  is furnished to do so, subject to
+ the following conditions:
+
+ The  above  copyright  notice  and  this permission  notice  shall  be
+ included in all copies or substantial portions of the Software.
+
+ THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+ EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+ MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+###############################################
+
diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/NOTICE b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE
index cb35331d07..e53b688a9c 100644
--- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/NOTICE
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE
@@ -3,3 +3,8 @@ Copyright 2012-2014 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
+
+###############################################
+
+Apache Geronimo JMS 1.1 Spec
+Copyright 2003-2008 The Apache Software Foundation
diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
new file mode 100644
index 0000000000..92a50821b9
--- /dev/null
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -0,0 +1,44 @@
+#
+# 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.
+#
+
+#// ------------------------------------------------------------------
+# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS
+#// ------------------------------------------------------------------
+
+
+
+From: 'Apache Software Foundation' (http://www.apache.org)
+  - JMS 1.1 (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1.1
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+From: 'QOS.ch' (http://www.qos.ch)
+  - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.6.4
+    License: MIT License  (http://www.opensource.org/licenses/mit-license.php)
+
+From: 'The Apache Software Foundation' (http://www.apache.org/)
+  - Qpid AMQP 0-x JMS Client (http://qpid.apache.org/qpid-java-build/qpid-client) org.apache.qpid:qpid-client:jar
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Qpid Common (http://qpid.apache.org/qpid-java-build/qpid-common) org.apache.qpid:qpid-common:jar
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Qpid QMF2 (http://qpid.apache.org/qpid-qmf2-parent/qpid-qmf2) org.apache.qpid:qpid-qmf2:jar
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+
+
+
diff --git a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml
index d6f4326127..29180fd248 100644
--- a/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+       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.
+-->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
@@ -10,9 +27,17 @@
     <fileSet>
       <outputDirectory>/</outputDirectory>
       <includes>
+        <include>README.txt</include>
+      </includes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/assembly/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
         <include>LICENSE</include>
         <include>NOTICE</include>
-        <include>README.txt</include>
       </includes>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/README.txt b/qpid/tools/src/java/qpid-qmf2-tools/README.txt
new file mode 100644
index 0000000000..cce2fcf00e
--- /dev/null
+++ b/qpid/tools/src/java/qpid-qmf2-tools/README.txt
@@ -0,0 +1,136 @@
+************************************************ The Tools ************************************************
+
+A number of Java based tools are provided, and additionally a web based GUI with underlying REST API which
+are described later, utilising the components from the core API.
+
+There are executable shell scripts included in the tools bundle that should allow the tools to be run fairly
+easily. To use them, open the bin/ directory.
+
+The available tools are:
+QpidConfig: Is a Java port of the standard Python based qpid-config tool. This exercises most of the QMF2 API
+            and is probably a good bet to see how things work if you want to use the API in your own projects.
+QpidCtrl: Is a Java port of the qpid-ctrl tool found in qpid/cpp/src/tests. This is a little known, but useful
+          little tool that lets one send low-level QMF constructs from the command line. The JavaDoc is the
+          best place to look for example usage (see earlier for build instructions).
+QpidPrintEvents: Is a Java port of the Python qpid-printevents and illustrates the asynchronous delivery
+                 of QMF2 notification events.
+QpidQueueStats: Is a Java port of the Python qpid-queue-stats. This was written mainly to illustrate the use
+                of the QMF2 "QuerySubscription" API that lets one specify how to be asynchronously notified
+                of changes to QMF Management Objects matching a specified set of criteria.
+ConnectionAudit: Is a tool that allows one to audit connections to one or more Qpid brokers. It uses QMF
+                 Events to identify when connections have been made to a broker and if so it logs information
+                 about the connection. A whitelist can be specified to flag connections that you don't
+                 want to have logged (e.g. ones that you like).
+ConnectionLogger: Is similar to ConnectionAudit but a bit simpler this tool just logs connections being made
+                  the tool is mainly there to illustrate how to dereference the associations between the
+                  various QMF Management Objects (Connection, Session, Subscription, Queue, Binding Exchange etc.)
+QueueFuse: Is a tool that monitors QMF Events looking for a QueueThresholdExceeded, which occurs when a queue
+           gets more than 80% full. When this Event occurs the tool sends a QMF method to "purge" 10% of the
+           messages off the offending queue, i.e. it acts rather like a fuse. It's mainly a bit of a toy, but
+           it's a pretty good illustration of how to trigger QMF method invocation from QMF Events. It would
+           be pretty easy to modify this to redirect messages to a different queue if a particular queue fills.
+QpidRestAPI: This is a Web Service that exposes QMF2 via a REST API, see "The GUI" section below for details.
+
+
+
+************************************************* The GUI *************************************************
+
+Included in the tools package, there is a fairly comprehensive Web based GUI available for Qpid that works
+with the C++ Broker and also the Java Broker if the QMF management plugin has been installed (see the
+related plugin README.txt for more details).
+
+The GUI is in the form of a pure client side "single page" Web App written in JavaScript that uses the
+QpidRestAPI to proxy the QMF API, and also serve up the GUI.
+
+There is comprehensive JavaDoc for the QpidRestAPI (see source release for build instructions), where
+the most useful classes to look at are:
+QpidRestAPI: This describes the various command line options available.
+QpidServer: This provides documentation for the actual REST API itself, in effect the REST mapping for QMF
+
+QpidRestAPI provides a fairly complete REST mapping for QMF, it was primarily written as the back-end to
+the GUI, but there's no reason why it couldn't be used in its own right.
+
+To get started, after you have extracted the tools release as described earlier, the simplest and probably
+most common use case can be kicked offby changing into the bin/ directory and firing up the REST API via:
+./QpidRestAPI
+
+This will bind the HTTP port to 8080 on the "wildcard" address (0.0.0.0). The QMF connection will default to
+the host that QpidRestAPI is running on and use the default AMQP port 5672.
+
+If you point a Browser to <host>:8080 the GUI should start up asking for a User Name and Password, the
+defaults for those are the rather "traditional" admin admin.
+
+
+If you have a non-trivial broker set-up you'll probably see "Failed to Connect", which is most likely due
+to having authentication enabled (you can check this by firing up the C++ broker using qpidd --auth no)
+
+
+There are a few ways to configure the Brokers that you can control via the GUI:
+The first way is to specify the -a (or --broker-addr) command line option e.g.
+./QpidRestAPI -a guest/guest@localhost
+
+This option accepts the Broker Address syntax used by the standard Python tools and it also accepts the
+Java ConnectionURL syntax specified here (though to be honest the syntax used by the Python tools is simpler)
+http://qpid.apache.org/releases/qpid-0.24/programming/book/QpidJNDI.html#section-jms-connection-url
+
+
+This way of specifying the AMQP address of the default broker that you want to manage is probably the best
+approach, but it is possible to add as many QMF Console Connections as you like by clicking
+"Add QMF Console Connection" on the GUI Settings page. The popup lets you specify the Address URL such as
+"guest/guest@host:5672" - again it also accepts the JMS Connection URLs, though I only use them if I'm
+doing a copy/paste of an existing Connection URL.
+The Name is simply a "friendly name" that you want to use to identify a particular Broker.
+
+
+Clearly if you want to be able to manage a number of brokers you'd probably prefer not to have to enter
+them every time you fire up the GUI - particularly because the list gets wiped if you hit refresh :-)
+
+The good news is that the initial set of Console Connections is configurable via the file:
+bin/qpid-web/web/ui/config.js
+
+
+This is a simple JSON file and it contains example Console Connection configuration including a fairly complex one
+
+If you use this mechanism to configure the GUI you can quickly switch between however many Brokers
+you'd like to be able to control.
+
+
+As mentioned above the default User Name and Password are admin and admin, these are set in the file
+bin/qpid-web/authentication/account.properties
+
+
+It's worth pointing out that at the moment authentication is limited to basic uthentication. This is mainly
+due to lack of time/energy/motivation to do anything fancier (I only tend to use it on a private network)
+I also had a need to minimise dependencies, so the Web Server is actually based on the Java 1.6
+com.sun.net.httpserver Web Server.
+
+
+In practice though basic authentication shouldn't be as much of a restriction as it might sound especially
+if you're only managing a single Broker.
+
+When one fires up QpidRestAPI with the -a option the Broker connection information does not pass between the
+GUI and the QpidRestAPI so it's ultimately no less secure than using say qpid-config in this case though
+note that if one configures multiple Brokers via config.js the contents of that file get served to the GUI
+when it gets loaded so you probably want to restrict use of the GUI to the same network you'd be happy to
+run qpid-config from.
+
+
+
+*********************************************** Important!! ***********************************************
+*  If your Qpid C++ broker is older than 0.10 the QMF2 API won't work unless your setup is as follows:    *
+*********************************************** Important!! ***********************************************
+
+Note that if you are talking to a broker < Qpid 0.10
+you need to set "--mgmt-qmf2 yes" when you start up qpidd if you want to get QMF2 Events and heartbeats pushed.
+This is particularly important to note if you are using the Qpid GUI, as in default mode its updates are
+triggered by the QMF2 heartbeats. If "--mgmt-qmf2 yes" isn't set on a 0.8 broker you'll see "Broker Disconnected"
+flash briefly every 30 seconds or so as timeouts occur. Creating a QMF Console Connecton in the GUI with
+"Disable Events" selected uses a timed poll rather than a heartbeat so it may be better to do that for cases
+where access to the broker configuration is not available.
+
+***********************************************************************************************************
+
+Note 1: This uses QMF2 so requires that the "--mgmt-qmf2 yes" option is applied to the broker (this is
+        the default from Qpid 0.10 onwards)
+
+Note 2: In order to use QMF2 the app-id field needs to be set. This requires the Qpid 0.12+ Java client
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
index 96d26093bb..4b0a111e1b 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
+++ b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
@@ -28,6 +28,10 @@
   <name>Qpid QMF2 Tools</name>
   <description>QMF2 Tools</description>
 
+  <properties>
+    <dependency-change-verification>true</dependency-change-verification>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.qpid</groupId>
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE
new file mode 100644
index 0000000000..ec8bdec6e5
--- /dev/null
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE
@@ -0,0 +1,292 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+###############################################
+# Third Party Dependency Licensing Information:
+###############################################
+
+bin/qpid-web/web/itablet/scripts/jquery.js
+
+The QMF2 tools GUI bundles jquery.js which is under the MIT licence:
+
+
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+###############################################
+
+bin/qpid-web/web/itablet/scripts/iscroll.js
+
+The QMF2 tools GUI bundles iscroll.js which is under the MIT licence:
+
+
+Copyright (c) 2012 Matteo Spinelli, http://cubiq.org/
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+###############################################
+
+This product bundles the slf4j-api and slf4j-log4j jars which are under
+the MIT licence:
+
+Copyright (c) 2004-2013 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free  of charge, to any person obtaining
+ a  copy  of this  software  and  associated  documentation files  (the
+ "Software"), to  deal in  the Software without  restriction, including
+ without limitation  the rights to  use, copy, modify,  merge, publish,
+ distribute,  sublicense, and/or sell  copies of  the Software,  and to
+ permit persons to whom the Software  is furnished to do so, subject to
+ the following conditions:
+
+ The  above  copyright  notice  and  this permission  notice  shall  be
+ included in all copies or substantial portions of the Software.
+
+ THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+ EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+ MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+###############################################
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE
new file mode 100644
index 0000000000..49bf4f36af
--- /dev/null
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE
@@ -0,0 +1,10 @@
+Apache Qpid QMF2 Tools
+Copyright 2012-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+###############################################
+
+Apache Geronimo JMS 1.1 Spec
+Copyright 2003-2008 The Apache Software Foundation
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
new file mode 100644
index 0000000000..424f175b33
--- /dev/null
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -0,0 +1,50 @@
+#
+# 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.
+#
+
+#// ------------------------------------------------------------------
+# TRIMMED 3RD PARTY DEPENDENCY INFORMATION FOR MODIFICATION CHECKS
+#// ------------------------------------------------------------------
+
+
+
+From: 'Apache Software Foundation' (http://www.apache.org)
+  - Apache Log4j (http://logging.apache.org/log4j/1.2/) log4j:log4j:bundle:1.2.16
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - JMS 1.1 (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1.1
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+From: 'QOS.ch' (http://www.qos.ch)
+  - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.6.4
+    License: MIT License  (http://www.opensource.org/licenses/mit-license.php)
+  - SLF4J LOG4J-12 Binding (http://www.slf4j.org) org.slf4j:slf4j-log4j12:jar:1.6.4
+    License: MIT License  (http://www.opensource.org/licenses/mit-license.php)
+
+From: 'The Apache Software Foundation' (http://www.apache.org/)
+  - Qpid AMQP 0-x JMS Client (http://qpid.apache.org/qpid-java-build/qpid-client) org.apache.qpid:qpid-client:jar
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Qpid Common (http://qpid.apache.org/qpid-java-build/qpid-common) org.apache.qpid:qpid-common:jar
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Qpid QMF2 (http://qpid.apache.org/qpid-qmf2-parent/qpid-qmf2) org.apache.qpid:qpid-qmf2:jar
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Qpid QMF2 REST (http://qpid.apache.org/qpid-qmf2-parent/qpid-qmf2-rest) org.apache.qpid:qpid-qmf2-rest:jar
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+
+
+
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml
index 418df4b8d5..cce56c0725 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+       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.
+-->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
@@ -5,14 +22,22 @@
   <formats>
     <format>tar.gz</format>
   </formats>
-  <baseDirectory>qpid-qmf-tools/${project.version}</baseDirectory>
+  <baseDirectory>qpid-qmf2-tools/${project.version}</baseDirectory>
   <fileSets>
     <fileSet>
       <outputDirectory>/</outputDirectory>
       <includes>
+        <include>README.txt</include>
+      </includes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/assembly/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
         <include>LICENSE</include>
         <include>NOTICE</include>
-        <include>README.txt</include>
       </includes>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>