Repository: incubator-brooklyn Updated Branches: refs/heads/master d9d13371c -> 38d3102b6
correct references used in license-readme-generation for new project structure Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9f9f8490 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9f9f8490 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9f9f8490 Branch: refs/heads/master Commit: 9f9f8490f4a0592773c645e5919cc75a70e694d4 Parents: 289eb5b Author: Alex Heneveld <[email protected]> Authored: Fri Jan 15 15:04:11 2016 +0000 Committer: Alex Heneveld <[email protected]> Committed: Fri Jan 15 15:05:34 2016 +0000 ---------------------------------------------------------------------- brooklyn-dist/dist/licensing/extras-files | 2 +- .../licensing/licenses/brooklyn-ui/BSD-2-Clause | 23 +++++++++++++++++ .../licensing/licenses/brooklyn-ui/BSD-3-Clause | 27 ++++++++++++++++++++ .../dist/licensing/licenses/brooklyn-ui/MIT | 20 +++++++++++++++ brooklyn-dist/dist/licensing/licenses/cli/MIT | 20 --------------- .../dist/licensing/licenses/jsgui/BSD-2-Clause | 23 ----------------- .../dist/licensing/licenses/jsgui/BSD-3-Clause | 27 -------------------- brooklyn-dist/dist/licensing/licenses/jsgui/MIT | 20 --------------- .../dist/licensing/licenses/server-cli/MIT | 20 +++++++++++++++ .../licensing/projects-with-custom-licenses | 4 +-- 10 files changed, 93 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9f9f8490/brooklyn-dist/dist/licensing/extras-files ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/extras-files b/brooklyn-dist/dist/licensing/extras-files index bb4a3b3..cbba9c5 100644 --- a/brooklyn-dist/dist/licensing/extras-files +++ b/brooklyn-dist/dist/licensing/extras-files @@ -1 +1 @@ -../jsgui/src/main/license/source-inclusions.yaml:../cli/src/main/license/source-inclusions.yaml +../../brooklyn-ui/src/main/license/source-inclusions.yaml:../../brooklyn-server/server-cli/src/main/license/source-inclusions.yaml http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9f9f8490/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-2-Clause ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-2-Clause b/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-2-Clause new file mode 100644 index 0000000..832c10e --- /dev/null +++ b/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-2-Clause @@ -0,0 +1,23 @@ +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/9f9f8490/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-3-Clause ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-3-Clause b/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-3-Clause new file mode 100644 index 0000000..be2692c --- /dev/null +++ b/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-3-Clause @@ -0,0 +1,27 @@ +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. + http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9f9f8490/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/MIT ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/MIT b/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/MIT new file mode 100644 index 0000000..71dfb45 --- /dev/null +++ b/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/MIT @@ -0,0 +1,20 @@ +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/9f9f8490/brooklyn-dist/dist/licensing/licenses/cli/MIT ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/licenses/cli/MIT b/brooklyn-dist/dist/licensing/licenses/cli/MIT deleted file mode 100644 index 71dfb45..0000000 --- a/brooklyn-dist/dist/licensing/licenses/cli/MIT +++ /dev/null @@ -1,20 +0,0 @@ -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/9f9f8490/brooklyn-dist/dist/licensing/licenses/jsgui/BSD-2-Clause ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/licenses/jsgui/BSD-2-Clause b/brooklyn-dist/dist/licensing/licenses/jsgui/BSD-2-Clause deleted file mode 100644 index 832c10e..0000000 --- a/brooklyn-dist/dist/licensing/licenses/jsgui/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/9f9f8490/brooklyn-dist/dist/licensing/licenses/jsgui/BSD-3-Clause ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/licenses/jsgui/BSD-3-Clause b/brooklyn-dist/dist/licensing/licenses/jsgui/BSD-3-Clause deleted file mode 100644 index be2692c..0000000 --- a/brooklyn-dist/dist/licensing/licenses/jsgui/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. - http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9f9f8490/brooklyn-dist/dist/licensing/licenses/jsgui/MIT ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/licenses/jsgui/MIT b/brooklyn-dist/dist/licensing/licenses/jsgui/MIT deleted file mode 100644 index 71dfb45..0000000 --- a/brooklyn-dist/dist/licensing/licenses/jsgui/MIT +++ /dev/null @@ -1,20 +0,0 @@ -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/9f9f8490/brooklyn-dist/dist/licensing/licenses/server-cli/MIT ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/licenses/server-cli/MIT b/brooklyn-dist/dist/licensing/licenses/server-cli/MIT new file mode 100644 index 0000000..71dfb45 --- /dev/null +++ b/brooklyn-dist/dist/licensing/licenses/server-cli/MIT @@ -0,0 +1,20 @@ +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/9f9f8490/brooklyn-dist/dist/licensing/projects-with-custom-licenses ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/licensing/projects-with-custom-licenses b/brooklyn-dist/dist/licensing/projects-with-custom-licenses index ebf210c..97839fc 100644 --- a/brooklyn-dist/dist/licensing/projects-with-custom-licenses +++ b/brooklyn-dist/dist/licensing/projects-with-custom-licenses @@ -1,2 +1,2 @@ -../jsgui -../cli +../../brooklyn-ui +../../brooklyn-server/server-cli
