QPID-5813, QPID-5913: various LICENCE and NOTICE file updates

    
- Ensure the main java directory has LICENSE and NOTICE files for use in new source archive.
- Update pointers within the files at the repo root.
- Ensure the main java directory has LICENSE entry for crypto-js for inclusion in source release.
- Ensure the management-http binary jar contains LICENSE file entry for crypto-js, clarify entry in brokers binary assembly tar.gz file.
- Update reference file for dep change verification.

merge from trunk r1617301


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

9 files changed, 84 insertions, 17 deletions

diff --git a/qpid/LICENSE b/qpid/LICENSE
index cd0c8d0a8b..2cbe987a10 100644
--- a/qpid/LICENSE
+++ b/qpid/LICENSE
@@ -1,5 +1,8 @@
-Please see the individual LICENSE files for each language
+Please see the individual LICENSE[.txt] files in each main directory, e.g:
+
 cpp/LICENSE
-gentools/lib/LICENSE
-java/resources/LICENSE
+java/LICENSE
 python/LICENSE.txt
+tools/LICENSE.txt
+tools/src/java/LICENSE
+wcf/LICENSE.txt
diff --git a/qpid/NOTICE b/qpid/NOTICE
index 5691e0e1ac..39a002e222 100644
--- a/qpid/NOTICE
+++ b/qpid/NOTICE
@@ -1,6 +1,8 @@
-Please see the individual NOTICE files for each language:
+Please see the individual NOTICE[.txt] files in each main directory, e.g:
 
 cpp/NOTICE
-gentools/lib/NOTICE
-java/resources/NOTICE
+java/NOTICE
 python/NOTICE.txt
+tools/NOTICE.txt
+tools/src/java/NOTICE
+wcf/NOTICE.txt
diff --git a/qpid/java/resources/LICENSE b/qpid/java/LICENSE
index d645695673..251cf46c23 100644
--- a/qpid/java/resources/LICENSE
+++ b/qpid/java/LICENSE
@@ -200,3 +200,35 @@
    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:
+###############################################
+
+broker-plugins/management-http/src/main/java/resources/js/crypto-js/
+
+This bundles portions of crypto-js jar which is under the MIT licence:
+
+
+Copyright (c) 2009-2013 Jeff Mott
+
+ 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/java/resources/NOTICE b/qpid/java/NOTICE
index 589b78325f..589b78325f 100644
--- a/qpid/java/resources/NOTICE
+++ b/qpid/java/NOTICE
diff --git a/qpid/java/README.txt b/qpid/java/README.txt
index 439f70c040..5213799662 100644
--- a/qpid/java/README.txt
+++ b/qpid/java/README.txt
@@ -1,3 +1,10 @@
+Documentation for the Qpid components can be accessed on our website at:
+
+http://qpid.apache.org/documentation.html
+
+Some initial helper info can be found below.
+
+
 ==== Building the code and running the tests ====
 
 Here are some example Maven build commands that you may find usefull.
@@ -23,6 +30,7 @@ Execute the unit tests and then produce the code coverage report
 For more details on how to build see:
 https://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Build+How+To
 
+
 ==== Running client examples =====
 
 Use maven to build the modules, and additionally copy the dependencies alongside their output:
diff --git a/qpid/java/broker-plugins/management-http/src/main/appended-resources/META-INF/LICENSE.vm b/qpid/java/broker-plugins/management-http/src/main/appended-resources/META-INF/LICENSE.vm
new file mode 100644
index 0000000000..7a7430e2e3
--- /dev/null
+++ b/qpid/java/broker-plugins/management-http/src/main/appended-resources/META-INF/LICENSE.vm
@@ -0,0 +1,33 @@
+
+
+#==============================================
+# Third Party Dependency Licensing Information:
+#==============================================
+
+resources/js/crypto-js/
+
+This bundles portions of crypto-js, which is under the MIT licence:
+
+
+Copyright (c) 2009-2013 Jeff Mott
+
+ 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/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index 866ff6c1ec..eb080385e5 100644
--- a/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/qpid/java/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -28,8 +28,6 @@ From: 'an unknown organization'
     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
   - bcel  org.apache.bcel:bcel:jar:5.2
 
-  - CryptoJS (http://webjars.org) org.webjars:cryptojs:jar:3.1.2
-    License: New BSD  (http://opensource.org/licenses/BSD-3-Clause)
 
 From: 'Apache Software Foundation' (http://db.apache.org/)
   - Apache Derby Database Engine and Embedded JDBC Driver (http://db.apache.org/derby/derby/) org.apache.derby:derby:jar:10.8.2.2
diff --git a/qpid/java/resources/README.txt b/qpid/java/resources/README.txt
deleted file mode 100644
index eec46a52f0..0000000000
--- a/qpid/java/resources/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Documentation for the Qpid components can be accessed on our website at:
-
-http://qpid.apache.org/documentation.html
diff --git a/qpid/tools/src/java/TODO b/qpid/tools/src/java/TODO
deleted file mode 100644
index b72b07f433..0000000000
--- a/qpid/tools/src/java/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-- The qpid-qmf2-tools package needs a README.txt for its release package
-  - Could just be a link to the main one in this dir, or vice versa.
-- The LICENCE and/or NOTICE files inluded in the binary assemblies need updated to account for any 3rd party dependencies
-
-
-- This file needs deleted. Deliberately not licenced.