6 files changed, 115 insertions, 4 deletions
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>