include custom metastuff BSD license text

Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ff5ec442
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ff5ec442
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ff5ec442

Branch: refs/heads/master
Commit: ff5ec4425e3a5458cb954f2dc7bf14942bbc6c64
Parents: 1421e10
Author: Alex Heneveld <[email protected]>
Authored: Mon Aug 17 16:26:27 2015 +0100
Committer: Alex Heneveld <[email protected]>
Committed: Mon Aug 17 17:39:16 2015 +0100

----------------------------------------------------------------------
 .../licenses/binary/metastuff-bsd-style         | 43 ++++++++++++++++++
 usage/dist/licensing/overrides.yaml             |  2 +-
 usage/dist/src/main/license/files/LICENSE       | 47 +++++++++++++++++++-
 3 files changed, 90 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ff5ec442/usage/dist/licensing/licenses/binary/metastuff-bsd-style
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/licenses/binary/metastuff-bsd-style 
b/usage/dist/licensing/licenses/binary/metastuff-bsd-style
new file mode 100644
index 0000000..6bb4ef6
--- /dev/null
+++ b/usage/dist/licensing/licenses/binary/metastuff-bsd-style
@@ -0,0 +1,43 @@
+MetaStuff BSD Style License
+
+  Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+  
+  Redistribution and use of this software and associated documentation
+  ("Software"), with or without modification, are permitted provided
+  that the following conditions are met:
+  
+  1. Redistributions of source code must retain copyright
+     statements and notices.  Redistributions must also contain a
+     copy of this document.
+  
+  2. Redistributions in binary form must reproduce the
+     above copyright notice, this list of conditions and the
+     following disclaimer in the documentation and/or other
+     materials provided with the distribution.
+  
+  3. The name "DOM4J" must not be used to endorse or promote
+     products derived from this Software without prior written
+     permission of MetaStuff, Ltd.  For written permission,
+     please contact [email protected].
+  
+  4. Products derived from this Software may not be called "DOM4J"
+     nor may "DOM4J" appear in their names without prior written
+     permission of MetaStuff, Ltd. DOM4J is a registered
+     trademark of MetaStuff, Ltd.
+  
+  5. Due credit should be given to the DOM4J Project -
+     http://www.dom4j.org
+  
+  THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+  ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+  METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+  OF THE POSSIBILITY OF SUCH DAMAGE.
+  

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ff5ec442/usage/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/overrides.yaml 
b/usage/dist/licensing/overrides.yaml
index 77e2326..e1952ba 100644
--- a/usage/dist/licensing/overrides.yaml
+++ b/usage/dist/licensing/overrides.yaml
@@ -51,7 +51,7 @@
 - id: dom4j:dom4j:1.6.1
   url: "http://dom4j.sourceforge.net/";
   license:
-  - name: BSD style
+  - name: MetaStuff BSD style license (3-clause)
     url: http://dom4j.sourceforge.net/dom4j-1.6.1/license.html
 - id: org.python:jython-standalone:2.7-b3
   license:

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ff5ec442/usage/dist/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/license/files/LICENSE 
b/usage/dist/src/main/license/files/LICENSE
index 1476fcc..a00784b 100644
--- a/usage/dist/src/main/license/files/LICENSE
+++ b/usage/dist/src/main/license/files/LICENSE
@@ -355,7 +355,7 @@ This project includes the software: dataTables.js
 This project includes the software: dom4j
   Available at: http://dom4j.sourceforge.net/
   Developed by: MetaStuff Ltd. (http://sourceforge.net/projects/dom4j)
-  Used under the following license: BSD License 
(http://dom4j.sourceforge.net/dom4j-1.6.1/license.html)
+  Used under the following license: MetaStuff BSD style license (3-clause) 
(http://dom4j.sourceforge.net/dom4j-1.6.1/license.html)
 
 This project includes the software: handlebars.js
   Available at: https://github.com/wycats/handlebars.js
@@ -618,6 +618,7 @@ Contents:
   Bouncy Castle License
   JTidy License
   Jython License
+  MetaStuff BSD Style License
   Indiana University Extreme! Lab Software License, Version 1.1.1
 
 
@@ -1894,6 +1895,50 @@ Jython License
   
   
 
+MetaStuff BSD Style License
+
+  Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+  
+  Redistribution and use of this software and associated documentation
+  ("Software"), with or without modification, are permitted provided
+  that the following conditions are met:
+  
+  1. Redistributions of source code must retain copyright
+     statements and notices.  Redistributions must also contain a
+     copy of this document.
+  
+  2. Redistributions in binary form must reproduce the
+     above copyright notice, this list of conditions and the
+     following disclaimer in the documentation and/or other
+     materials provided with the distribution.
+  
+  3. The name "DOM4J" must not be used to endorse or promote
+     products derived from this Software without prior written
+     permission of MetaStuff, Ltd.  For written permission,
+     please contact [email protected].
+  
+  4. Products derived from this Software may not be called "DOM4J"
+     nor may "DOM4J" appear in their names without prior written
+     permission of MetaStuff, Ltd. DOM4J is a registered
+     trademark of MetaStuff, Ltd.
+  
+  5. Due credit should be given to the DOM4J Project -
+     http://www.dom4j.org
+  
+  THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+  ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+  METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+  OF THE POSSIBILITY OF SUCH DAMAGE.
+  
+
 Indiana University Extreme! Lab Software License, Version 1.1.1
 
   Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.

Reply via email to