brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [25/26] incubator-brooklyn git commit: scripts for auto-generating the various LICENSE files we need
Date Mon, 17 Aug 2015 16:40:07 GMT
scripts for auto-generating the various LICENSE files we need


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

Branch: refs/heads/master
Commit: 0c9ac7b0dd375d82a1507c89193dd961cbdf9a17
Parents: e3a3e43
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Mon Aug 17 15:33:15 2015 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Mon Aug 17 17:39:16 2015 +0100

----------------------------------------------------------------------
 usage/cli/pom.xml                               |    4 +-
 usage/cli/src/main/license/DISCLAIMER           |    8 -
 usage/cli/src/main/license/LICENSE              |  208 --
 usage/cli/src/main/license/NOTICE               |    5 -
 usage/cli/src/main/license/README.md            |    7 +
 usage/cli/src/main/license/files/DISCLAIMER     |    8 +
 usage/cli/src/main/license/files/LICENSE        |  208 ++
 usage/cli/src/main/license/files/NOTICE         |    5 +
 .../cli/src/main/license/source-inclusions.yaml |   24 +
 usage/cli/src/test/license/DISCLAIMER           |    8 -
 usage/cli/src/test/license/LICENSE              |  175 --
 usage/cli/src/test/license/NOTICE               |    5 -
 usage/cli/src/test/license/files/DISCLAIMER     |    8 +
 usage/cli/src/test/license/files/LICENSE        |  175 ++
 usage/cli/src/test/license/files/NOTICE         |    5 +
 usage/dist/licensing/README.md                  |   80 +-
 usage/dist/licensing/extras-files               |    1 +
 usage/dist/licensing/extras.yaml                |  179 --
 usage/dist/licensing/licenses/ASL2              |  177 --
 usage/dist/licensing/licenses/BSD-2-Clause      |   23 -
 usage/dist/licensing/licenses/BSD-3-Clause      |   27 -
 usage/dist/licensing/licenses/CDDL1             |  381 ----
 usage/dist/licensing/licenses/CDDL1.1           |  304 ---
 usage/dist/licensing/licenses/EPL1              |  212 --
 usage/dist/licensing/licenses/MIT               |   20 -
 usage/dist/licensing/licenses/WTFPL             |   15 -
 usage/dist/licensing/licenses/binary/ASL2       |  177 ++
 .../dist/licensing/licenses/binary/BSD-2-Clause |   23 +
 .../dist/licensing/licenses/binary/BSD-3-Clause |   27 +
 usage/dist/licensing/licenses/binary/CDDL1      |  381 ++++
 usage/dist/licensing/licenses/binary/CDDL1.1    |  304 +++
 usage/dist/licensing/licenses/binary/EPL1       |  212 ++
 usage/dist/licensing/licenses/binary/MIT        |   20 +
 usage/dist/licensing/licenses/binary/WTFPL      |   15 +
 .../dist/licensing/licenses/binary/bouncycastle |   23 +
 usage/dist/licensing/licenses/binary/jtidy      |   53 +
 usage/dist/licensing/licenses/binary/jython     |   27 +
 .../licenses/binary/xpp3_indiana_university     |   45 +
 usage/dist/licensing/licenses/bouncycastle      |   23 -
 usage/dist/licensing/licenses/cli/MIT           |   20 +
 .../dist/licensing/licenses/jsgui/BSD-3-Clause  |   27 +
 usage/dist/licensing/licenses/jsgui/MIT         |   20 +
 usage/dist/licensing/licenses/jtidy             |   53 -
 usage/dist/licensing/licenses/jython            |   27 -
 .../dist/licensing/licenses/source/BSD-3-Clause |   27 +
 usage/dist/licensing/licenses/source/MIT        |   20 +
 .../licensing/licenses/xpp3_indiana_university  |   45 -
 usage/dist/licensing/make-all-licenses.sh       |   61 +
 usage/dist/licensing/make-license.sh            |   69 -
 usage/dist/licensing/make-one-license.sh        |   77 +
 usage/dist/licensing/overrides.yaml             |  166 +-
 .../licensing/projects-with-custom-licenses     |    2 +
 usage/dist/pom.xml                              |    2 +
 .../dist/src/main/config/build-distribution.xml |    2 +-
 usage/dist/src/main/license/DISCLAIMER          |    8 -
 usage/dist/src/main/license/LICENSE             | 1934 ------------------
 usage/dist/src/main/license/NOTICE              |    5 -
 usage/dist/src/main/license/README.md           |    2 +
 usage/dist/src/main/license/files/DISCLAIMER    |    8 +
 usage/dist/src/main/license/files/LICENSE       | 1934 ++++++++++++++++++
 usage/dist/src/main/license/files/NOTICE        |    5 +
 usage/jsgui/pom.xml                             |    4 +-
 usage/jsgui/src/main/license/DISCLAIMER         |    8 -
 usage/jsgui/src/main/license/LICENSE            |  292 ---
 usage/jsgui/src/main/license/NOTICE             |    5 -
 usage/jsgui/src/main/license/README.md          |    7 +
 usage/jsgui/src/main/license/files/DISCLAIMER   |    8 +
 usage/jsgui/src/main/license/files/LICENSE      |  292 +++
 usage/jsgui/src/main/license/files/NOTICE       |    5 +
 .../src/main/license/source-inclusions.yaml     |   39 +
 70 files changed, 4518 insertions(+), 4258 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/pom.xml
----------------------------------------------------------------------
diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml
index 7bfecb9..48fd1ea 100644
--- a/usage/cli/pom.xml
+++ b/usage/cli/pom.xml
@@ -205,7 +205,7 @@
             </resource>
             <resource>
                 <targetPath>META-INF</targetPath>
-                <directory>${basedir}/src/main/license</directory>
+                <directory>${basedir}/src/main/license/files</directory>
             </resource>
         </resources>
         <testResources>
@@ -214,7 +214,7 @@
             </testResource>
             <testResource>
                 <targetPath>META-INF</targetPath>
-                <directory>${basedir}/src/test/license</directory>
+                <directory>${basedir}/src/test/license/files</directory>
             </testResource>
         </testResources>
     </build>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/main/license/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/DISCLAIMER b/usage/cli/src/main/license/DISCLAIMER
deleted file mode 100644
index 9e6119b..0000000
--- a/usage/cli/src/main/license/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
-sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
-a further review indicates that the infrastructure, communications, and decision making process 
-have stabilized in a manner consistent with other successful ASF projects. While incubation 
-status is not necessarily a reflection of the completeness or stability of the code, it does 
-indicate that the project has yet to be fully endorsed by the ASF.
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/LICENSE b/usage/cli/src/main/license/LICENSE
deleted file mode 100644
index eb16d03..0000000
--- a/usage/cli/src/main/license/LICENSE
+++ /dev/null
@@ -1,208 +0,0 @@
-
-                                 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.
-
-
-
----------------------------------------------------
-
-This distribution contains third party resources.
-
-This product includes software developed at Twitter, Inc (http://twitter.com):
-typeahead.js, bloodhound.js
-Copyright (c) Twitter, Inc (2013).
-Licensed under the MIT license (see below).
-
-
-
-The MIT License ("MIT")
-
-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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/main/license/NOTICE
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/NOTICE b/usage/cli/src/main/license/NOTICE
deleted file mode 100644
index f790f13..0000000
--- a/usage/cli/src/main/license/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/main/license/README.md
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/README.md b/usage/cli/src/main/license/README.md
new file mode 100644
index 0000000..2714c67
--- /dev/null
+++ b/usage/cli/src/main/license/README.md
@@ -0,0 +1,7 @@
+
+This directory contains files to generate the custom license for this project.
+The files/ subdir contains the artifacts which are included in the JAR, some
+autogenerated by the dist/licensing scripts.
+
+See usage/dist/licensing/README.md for more information.
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/main/license/files/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/files/DISCLAIMER b/usage/cli/src/main/license/files/DISCLAIMER
new file mode 100644
index 0000000..9e6119b
--- /dev/null
+++ b/usage/cli/src/main/license/files/DISCLAIMER
@@ -0,0 +1,8 @@
+
+Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
+a further review indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. While incubation 
+status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/files/LICENSE b/usage/cli/src/main/license/files/LICENSE
new file mode 100644
index 0000000..eb16d03
--- /dev/null
+++ b/usage/cli/src/main/license/files/LICENSE
@@ -0,0 +1,208 @@
+
+                                 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.
+
+
+
+---------------------------------------------------
+
+This distribution contains third party resources.
+
+This product includes software developed at Twitter, Inc (http://twitter.com):
+typeahead.js, bloodhound.js
+Copyright (c) Twitter, Inc (2013).
+Licensed under the MIT license (see below).
+
+
+
+The MIT License ("MIT")
+
+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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/main/license/files/NOTICE
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/files/NOTICE b/usage/cli/src/main/license/files/NOTICE
new file mode 100644
index 0000000..f790f13
--- /dev/null
+++ b/usage/cli/src/main/license/files/NOTICE
@@ -0,0 +1,5 @@
+Apache Brooklyn
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/main/license/source-inclusions.yaml
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/source-inclusions.yaml b/usage/cli/src/main/license/source-inclusions.yaml
new file mode 100644
index 0000000..93c9d25
--- /dev/null
+++ b/usage/cli/src/main/license/source-inclusions.yaml
@@ -0,0 +1,24 @@
+#
+# 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.
+#
+
+# extras file for org.heneveld.license-audit-maven-plugin
+# listing projects from which *source* files are included
+
+- id: underscore.js
+- id: typeahead.js

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/test/license/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/license/DISCLAIMER b/usage/cli/src/test/license/DISCLAIMER
deleted file mode 100644
index 9e6119b..0000000
--- a/usage/cli/src/test/license/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
-sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
-a further review indicates that the infrastructure, communications, and decision making process 
-have stabilized in a manner consistent with other successful ASF projects. While incubation 
-status is not necessarily a reflection of the completeness or stability of the code, it does 
-indicate that the project has yet to be fully endorsed by the ASF.
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/test/license/LICENSE
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/license/LICENSE b/usage/cli/src/test/license/LICENSE
deleted file mode 100644
index 67db858..0000000
--- a/usage/cli/src/test/license/LICENSE
+++ /dev/null
@@ -1,175 +0,0 @@
-
-                                 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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/test/license/NOTICE
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/license/NOTICE b/usage/cli/src/test/license/NOTICE
deleted file mode 100644
index f790f13..0000000
--- a/usage/cli/src/test/license/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/test/license/files/DISCLAIMER
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/license/files/DISCLAIMER b/usage/cli/src/test/license/files/DISCLAIMER
new file mode 100644
index 0000000..9e6119b
--- /dev/null
+++ b/usage/cli/src/test/license/files/DISCLAIMER
@@ -0,0 +1,8 @@
+
+Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), 
+sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until 
+a further review indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. While incubation 
+status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
+

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/test/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/license/files/LICENSE b/usage/cli/src/test/license/files/LICENSE
new file mode 100644
index 0000000..67db858
--- /dev/null
+++ b/usage/cli/src/test/license/files/LICENSE
@@ -0,0 +1,175 @@
+
+                                 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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/cli/src/test/license/files/NOTICE
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/license/files/NOTICE b/usage/cli/src/test/license/files/NOTICE
new file mode 100644
index 0000000..f790f13
--- /dev/null
+++ b/usage/cli/src/test/license/files/NOTICE
@@ -0,0 +1,5 @@
+Apache Brooklyn
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/dist/licensing/README.md
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/README.md b/usage/dist/licensing/README.md
index e67a02e..d6d295d 100644
--- a/usage/dist/licensing/README.md
+++ b/usage/dist/licensing/README.md
@@ -1,48 +1,37 @@
-#
-# 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.
-#
-
-This uses a special maven plugin to create license and notification information,
-based on metadata in overrides.yaml and extras.yaml.
+
+We use a special maven plugin and scripts to automatically create the LICENSE
+files, including all notices, based on metadata in overrides.yaml and **/source-inclusions.yaml.
 
 First install  https://github.com/ahgittin/license-audit-maven-plugin 
 and then, in the usage/dist/ project of Brooklyn...
 
 
+# Quick Usage
+
 To see a tree of license info:
 
     mvn org.heneveld.maven:license-audit-maven-plugin:report \
         -Dformat=summary \
         -DlicensesPreferred=ASL2,ASL,EPL1,BSD-2-Clause,BSD-3-Clause,CDDL1.1,CDDL1,CDDL \
         -DoverridesFile=licensing/overrides.yaml \
-        -DextrasFile=licensing/extras.yaml
+        -DextrasFiles=`cat licensing/extras-files`
+
+
+To create the LICENSE files needed for Apache Brooklyn
+(consisting of: one in the root for the source build, in the dist project for the binary build,
+and in `projects-with-custom-licenses` for those JARs which include other source code):
 
+    pushd licensing
+    ./make-all-licenses.sh || ( echo 'FAILED!!!' && rm LICENSE.autogenerated )
+    popd
 
-To create the LICENSE file in the root and in the dist:
+If you need to add a new project to those which require custom LICENSE files,
+see below.
 
-    pushd licensing > /dev/null
-    ./make-license.sh > LICENSE.autogenerated || ( echo 'FAILED!!!' && rm LICENSE.autogenerated )
-    cp LICENSE.autogenerated ../../../LICENSE
-    cp LICENSE.autogenerated ../src/main/license/LICENSE
-    popd > /dev/null
 
+# CSV License Report
 
-To generate a CSV:
+If you need to generate a CSV report of license usage, e.g. for use in a spreadsheet:
 
     mvn org.heneveld.maven:license-audit-maven-plugin:report \
         -Dformat=csv \
@@ -50,8 +39,39 @@ To generate a CSV:
         -DsuppressExcludedDependencies=true \
         -DlicensesPreferred=ASL2,ASL,EPL1,BSD-2-Clause,BSD-3-Clause,CDDL1.1,CDDL1,CDDL \
         -DoverridesFile=licensing/overrides.yaml \
-        -DextrasFile=licensing/extras.yaml \
+        -DextrasFile=`cat licensing/extras-files` \
         -DoutputFile=dependencies-licenses.csv
 
 
+# When Projects Need Custom Licenses
+
+If a JAR includes 3rd party source code (as opposed to binary dependencies), it will typically 
+require a custom LICENSE file.
+
+To support this: 
+
+1. Add the relative path to that project to `projects-with-custom-licenses`,
+
+2. Create the necessary file structure and maven instructions:
+
+* in `src/main/license/` put a `README.md` pointing here
+* in `src/main/license/` put a `source-inclusion.yaml` listing the included 3rd-party projects by an `id:`
+  (you may need to choose an ID; this should be a meaningful name, e.g. `typeahead.js` or `Swagger UI`)
+* in `src/main/license/files` put the relevant non-LICENSE license files you want included (e.g. NOTICE)
+* in `src/test/license/files` put the standard files *including* LICENSE to include in the test JAR
+  (NB: these scripts don't generate custom licenses for test JARs, as so far that has not been needed)
+* in `pom.xml` add instructions to include `src/{main,test}/license/files` in the main and test JARs
+
+You can follow the pattern done for `cli` and `jsgui`.
+
+3. In `licensing/overrides.yaml` in this directory, add the metadata for the included projects.
+
+4. In `licensing/licenses/<your_project>/` include the relevant licenses for any included 3rd-party projects;
+   look in `licensing/licenses/binary` for samples.
+
+5. Run `make-all-licenses.sh` to auto-generate required config files and license copies,
+   and to generate the LICENSE for your project.
+
+Confirm that a LICENSE file for your project was generated, and that it is present in the JAR,
+and then open a pull-request, and confirm the changes there are appropriate.
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/dist/licensing/extras-files
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/extras-files b/usage/dist/licensing/extras-files
new file mode 100644
index 0000000..bb4a3b3
--- /dev/null
+++ b/usage/dist/licensing/extras-files
@@ -0,0 +1 @@
+../jsgui/src/main/license/source-inclusions.yaml:../cli/src/main/license/source-inclusions.yaml

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/dist/licensing/extras.yaml
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/extras.yaml b/usage/dist/licensing/extras.yaml
deleted file mode 100644
index 77cf3e0..0000000
--- a/usage/dist/licensing/extras.yaml
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# 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.
-#
-
-# extras file for org.heneveld.license-audit-maven-plugin
-# supplying info for addl licenses included with brooklyn
-
-- id: jquery.js
-  url: http://jquery.com/
-  description: JS library for manipulating HTML and eventing
-  name: jQuery JavaScript Library
-  files: jquery.js
-  version: 1.7.2
-  organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
-  notice: Copyright (c) John Resig (2011)
-  license: MIT
-
-- id: sizzle.js
-  url: http://sizzlejs.com/
-  version: n/a
-  files: included in jquery
-  organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
-  notice: Copyright (c) jQuery Foundation and other contributors (2011)
-  license: MIT
-
-- id: Swagger JS
-  files: swagger.js
-  version: 1.0.1
-  url: https://github.com/wordnik/swagger-js
-  license: ASL2
-
-- id: Swagger UI
-  files: swagger-ui.js, swagger.js, jquery.{slideto,wiggle}*.js
-  version: 1.0.1
-  url: https://github.com/wordnik/swagger-ui
-  license: ASL2
-  notice: Copyright (c) SmartBear Software (2011-2015), portions WonderGroup and Jordan Thomas (2010)
-  # jquery.wiggle is from WonderGroup/JT, defunct URL http://labs.wondergroup.com/demos/mini-ui/index.html
-
-- id: require.js
-  name: RequireJS 
-  files: require.js, text.js
-  version: 2.0.6 
-  url: http://github.com/jrburke/requirejs for details
-  organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
-  notice: Copyright (c) The Dojo Foundation (2010-2012)
-  license: MIT
-
--
-  id: backbone.js
-  version: 1.0.0
-  url: http://backbonejs.org
-  organization: { name: "DocumentCloud Inc", url: "http://www.documentcloud.org/" }
-  notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013)
-  license: MIT
-
--
-  id: bootstrap.js
-  version: 2.0.4
-  url: http://twitter.github.com/bootstrap/javascript.html#transitions
-  notice: Copyright (c) Twitter, Inc (2012)
-  license: ASL2
-  
--
-  id: underscore.js
-  version: 1.4.4
-  files: underscore*.{js,map}
-  url: http://underscorejs.org
-  organization: { name: "DocumentCloud Inc", url: "http://www.documentcloud.org/" }
-  notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2013)
-  license: MIT
-
--
-  id: async.js
-  files: async.js
-  version: 0.1.1
-  url: https://github.com/p15martin/google-maps-hello-world/blob/master/js/libs/async.js
-  # ORIGINALLY https://github.com/millermedeiros/requirejs-plugins
-  organization: { name: "Miller Medeiros", url: "https://github.com/millermedeiros/" }
-  description: RequireJS plugin for async dependency load like JSONP and Google Maps
-  notice: Copyright (c) Miller Medeiros (2011)
-  license: MIT 
-
-# used for CLI to build catalog
-- id: typeahead.js
-  version: 0.10.5
-  url: https://github.com/twitter/typeahead.js
-  organization: { name: "Twitter, Inc", url: "http://twitter.com" }
-  notice: Copyright (c) Twitter, Inc. and other contributors (2013-2014)
-  license: MIT
-
--
-  id: handlebars.js
-  files: handlebars*.js
-  version: 1.0-rc1
-  url: https://github.com/wycats/handlebars.js 
-  organization: { name: "Yehuda Katz", url: "https://github.com/wycats/" }
-  notice: Copyright (c) Yehuda Katz (2012)
-  license: MIT
-
--
-  id: jquery.ba-bbq.js
-  name: "jQuery BBQ: Back Button & Query Library"
-  files: jquery.ba-bbq*.js
-  version: 1.2.1
-  url: http://benalman.com/projects/jquery-bbq-plugin/
-  organization: { name: "\"Cowboy\" Ben Alman", url: "http://benalman.com/" }
-  notice: Copyright (c) "\"Cowboy\" Ben Alman (2010)"
-  license: MIT
-
--
-  id: moment.js
-  version: 2.1.0
-  url: http://momentjs.com
-  organization: { name: "Tim Wood", url: "http://momentjs.com" }
-  notice: Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014)
-  license: MIT
-
--
-  id: ZeroClipboard
-  files: ZeroClipboard.*
-  version: 1.3.1
-  url: http://zeroclipboard.org/
-  organization: { name: "ZeroClipboard contributors", url: "https://github.com/zeroclipboard" }
-  notice: Copyright (c) Jon Rohan, James M. Greene (2014)
-  license: MIT
-
--
-  id: dataTables.js
-  files: jquery.dataTables.js, dataTables.extensions.js
-  version: 1.9.4
-  url: www.datatables.net
-  organization: { name: "SpryMedia Ltd", url: "http://sprymedia.co.uk/" }
-  notice: Copyright (c) Allan Jardine (2008-2012)
-  license: BSD-3-Clause
-
--
-  id: js-uri
-  files: URI.js
-  version: r29
-  url: http://code.google.com/p/js-uri/
-  organization: { name: "js-uri contributors", url: "https://code.google.com/js-uri" }
-  license: BSD-3-Clause
-  # inferred
-  notice: Copyright (c) js-uri contributors (2013)
-
--
-  id: js-yaml.js
-  version: 3.2.7
-  organization: { name: "Vitaly Puzrin", url: "https://github.com/nodeca/" }
-  url: https://github.com/nodeca/
-  notice: Copyright (c) Vitaly Puzrin (2011-2015)
-  license: MIT
-
--
-  id: jquery.form.js
-  name: jQuery Form Plugin
-  version: "3.09"
-  url: https://github.com/malsup/form
-  organization: { name: "Mike Alsup", url: "http://malsup.com/" }
-  notice: Copyright (c) M. Alsup (2006-2013)
-  # also http://malsup.com/jquery/form/
-  license: MIT
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/dist/licensing/licenses/ASL2
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/licenses/ASL2 b/usage/dist/licensing/licenses/ASL2
deleted file mode 100644
index eccbc6a..0000000
--- a/usage/dist/licensing/licenses/ASL2
+++ /dev/null
@@ -1,177 +0,0 @@
-Apache License, Version 2.0
-
-  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.
-  

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0c9ac7b0/usage/dist/licensing/licenses/BSD-2-Clause
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/licenses/BSD-2-Clause b/usage/dist/licensing/licenses/BSD-2-Clause
deleted file mode 100644
index 832c10e..0000000
--- a/usage/dist/licensing/licenses/BSD-2-Clause
+++ /dev/null
@@ -1,23 +0,0 @@
-The BSD 2-Clause License
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-  
-  1. Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-  
-  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.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS 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 THE COPYRIGHT HOLDER OR 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/0c9ac7b0/usage/dist/licensing/licenses/BSD-3-Clause
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/licenses/BSD-3-Clause b/usage/dist/licensing/licenses/BSD-3-Clause
deleted file mode 100644
index be2692c..0000000
--- a/usage/dist/licensing/licenses/BSD-3-Clause
+++ /dev/null
@@ -1,27 +0,0 @@
-The BSD 3-Clause License ("New BSD")
-
-  Redistribution and use in source and binary forms, with or without modification,
-  are permitted provided that the following conditions are met:
-  
-  1. Redistributions of source code must retain the above copyright notice, 
-  this list of conditions and the following disclaimer.
-  
-  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. Neither the name of the copyright holder nor the names of its contributors 
-  may be used to endorse or promote products derived from this software without 
-  specific prior written permission.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-  ANY EXPRESS 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 THE COPYRIGHT HOLDER OR 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.
-  


Mime
View raw message