brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [48/51] [abbrv] brooklyn-dist git commit: move subdir from incubator up a level as it is promoted to its own repo (first non-incubator commit!)
Date Mon, 01 Feb 2016 17:35:28 GMT
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/licensing/licenses/binary/jtidy
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/licenses/binary/jtidy b/brooklyn-dist/dist/licensing/licenses/binary/jtidy
deleted file mode 100644
index 0bcb614..0000000
--- a/brooklyn-dist/dist/licensing/licenses/binary/jtidy
+++ /dev/null
@@ -1,53 +0,0 @@
-JTidy License
-
-  Java HTML Tidy - JTidy
-  HTML parser and pretty printer
-  
-  Copyright (c) 1998-2000 World Wide Web Consortium (Massachusetts
-  Institute of Technology, Institut National de Recherche en
-  Informatique et en Automatique, Keio University). All Rights
-  Reserved.
-  
-  Contributing Author(s):
-  
-     Dave Raggett <dsr@w3.org>
-     Andy Quick <ac.quick@sympatico.ca> (translation to Java)
-     Gary L Peskin <garyp@firstech.com> (Java development)
-     Sami Lempinen <sami@lempinen.net> (release management)
-     Fabrizio Giustina <fgiust at users.sourceforge.net>
-  
-  The contributing author(s) would like to thank all those who
-  helped with testing, bug fixes, and patience.  This wouldn't
-  have been possible without all of you.
-  
-  COPYRIGHT NOTICE:
-   
-  This software and documentation is provided "as is," and
-  the copyright holders and contributing author(s) make no
-  representations or warranties, express or implied, including
-  but not limited to, warranties of merchantability or fitness
-  for any particular purpose or that the use of the software or
-  documentation will not infringe any third party patents,
-  copyrights, trademarks or other rights. 
-  
-  The copyright holders and contributing author(s) will not be
-  liable for any direct, indirect, special or consequential damages
-  arising out of any use of the software or documentation, even if
-  advised of the possibility of such damage.
-  
-  Permission is hereby granted to use, copy, modify, and distribute
-  this source code, or portions hereof, documentation and executables,
-  for any purpose, without fee, subject to the following restrictions:
-  
-  1. The origin of this source code must not be misrepresented.
-  2. Altered versions must be plainly marked as such and must
-     not be misrepresented as being the original source.
-  3. This Copyright notice may not be removed or altered from any
-     source or altered source distribution.
-   
-  The copyright holders and contributing author(s) specifically
-  permit, without fee, and encourage the use of this source code
-  as a component for supporting the Hypertext Markup Language in
-  commercial products. If you use this source code in a product,
-  acknowledgment is not required but would be appreciated.
-  

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

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/licensing/licenses/binary/xpp3_indiana_university
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/licenses/binary/xpp3_indiana_university b/brooklyn-dist/dist/licensing/licenses/binary/xpp3_indiana_university
deleted file mode 100644
index 7d69a29..0000000
--- a/brooklyn-dist/dist/licensing/licenses/binary/xpp3_indiana_university
+++ /dev/null
@@ -1,45 +0,0 @@
-Indiana University Extreme! Lab Software License, Version 1.1.1
-
-  Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-  
-  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. The end-user documentation included with the redistribution, if any,
-     must include the following acknowledgment:
-  
-    "This product includes software developed by the Indiana University
-    Extreme! Lab (http://www.extreme.indiana.edu/)."
-  
-  Alternately, this acknowledgment may appear in the software itself,
-  if and wherever such third-party acknowledgments normally appear.
-  
-  4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
-  must not be used to endorse or promote products derived from this
-  software without prior written permission. For written permission,
-  please contact http://www.extreme.indiana.edu/.
-  
-  5. Products derived from this software may not use "Indiana Univeristy"
-  name nor may "Indiana Univeristy" appear in their name, without prior
-  written permission of the Indiana University.
-  
-  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-  IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
-  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/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
deleted file mode 100644
index 832c10e..0000000
--- a/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/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/brooklyn-dist/blob/26c4604c/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
deleted file mode 100644
index be2692c..0000000
--- a/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/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/brooklyn-dist/blob/26c4604c/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
deleted file mode 100644
index 71dfb45..0000000
--- a/brooklyn-dist/dist/licensing/licenses/brooklyn-ui/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/brooklyn-dist/blob/26c4604c/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
deleted file mode 100644
index 71dfb45..0000000
--- a/brooklyn-dist/dist/licensing/licenses/server-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/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/licensing/licenses/source/BSD-2-Clause
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/licenses/source/BSD-2-Clause b/brooklyn-dist/dist/licensing/licenses/source/BSD-2-Clause
deleted file mode 100644
index 832c10e..0000000
--- a/brooklyn-dist/dist/licensing/licenses/source/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/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/licensing/licenses/source/BSD-3-Clause
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/licenses/source/BSD-3-Clause b/brooklyn-dist/dist/licensing/licenses/source/BSD-3-Clause
deleted file mode 100644
index be2692c..0000000
--- a/brooklyn-dist/dist/licensing/licenses/source/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/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/licensing/licenses/source/MIT
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/licenses/source/MIT b/brooklyn-dist/dist/licensing/licenses/source/MIT
deleted file mode 100644
index 71dfb45..0000000
--- a/brooklyn-dist/dist/licensing/licenses/source/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/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/licensing/make-all-licenses.sh
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/make-all-licenses.sh b/brooklyn-dist/dist/licensing/make-all-licenses.sh
deleted file mode 100755
index b08d17f..0000000
--- a/brooklyn-dist/dist/licensing/make-all-licenses.sh
+++ /dev/null
@@ -1,65 +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.
-#
-
-# generates LICENSE files for source and binary,
-# and for each of `projects-with-custom-licenses`
-
-set -e
-
-# update the extras-files file from projects-with-custom-licenses
-cat projects-with-custom-licenses | awk '{ printf("%s/src/main/license/source-inclusions.yaml:", $0); }' | sed 's/:$//' > extras-files
-
-unset BROOKLYN_LICENSE_SPECIALS
-unset BROOKLYN_LICENSE_EXTRAS_FILES
-unset BROOKLYN_LICENSE_MODE
-
-# source build, at root and each sub-project
-export BROOKLYN_LICENSE_MODE=source
-echo MAKING LICENSES FOR: ${BROOKLYN_LICENSE_MODE}
-export BROOKLYN_LICENSE_SPECIALS=-DonlyExtras=true 
-./make-one-license.sh > LICENSE.autogenerated
-cp LICENSE.autogenerated ../../../LICENSE
-# overwrite any existing licenses at root
-for x in ../../../brooklyn-*/LICENSE ; do cp LICENSE.autogenerated $x ; done
-unset BROOKLYN_LICENSE_SPECIALS
-unset BROOKLYN_LICENSE_MODE
-
-# binary build, in dist
-export BROOKLYN_LICENSE_MODE=binary
-echo MAKING LICENSES FOR: ${BROOKLYN_LICENSE_MODE}
-./make-one-license.sh > LICENSE.autogenerated
-cp LICENSE.autogenerated ../src/main/license/files/LICENSE
-unset BROOKLYN_LICENSE_MODE
-
-# individual projects
-for x in `cat projects-with-custom-licenses` ; do
-  export BROOKLYN_LICENSE_MODE=`basename $x`
-  echo MAKING LICENSES FOR: ${BROOKLYN_LICENSE_MODE}
-  export BROOKLYN_LICENSE_SPECIALS=-DonlyExtras=true
-  export BROOKLYN_LICENSE_EXTRAS_FILES=$x/src/main/license/source-inclusions.yaml
-  cp licenses/`basename $x`/* licenses/source
-  ./make-one-license.sh > LICENSE.autogenerated || ( echo FAILED. See details in tmp_stdout/err. && false )
-  cp LICENSE.autogenerated ../$x/src/main/license/files/LICENSE
-  # also copy to root of that project *if* there is already a LICENSE file there
-  [ -f ../$x/LICENSE ] && cp LICENSE.autogenerated ../$x/LICENSE || true
-  unset BROOKLYN_LICENSE_SPECIALS
-  unset BROOKLYN_LICENSE_EXTRAS_FILES
-  unset BROOKLYN_LICENSE_MODE
-done
-

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/licensing/make-one-license.sh
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/make-one-license.sh b/brooklyn-dist/dist/licensing/make-one-license.sh
deleted file mode 100755
index 5bcb35b..0000000
--- a/brooklyn-dist/dist/licensing/make-one-license.sh
+++ /dev/null
@@ -1,79 +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.
-#
-
-set -e
-
-# generates a LICENSE file, including notices and other licenses as needed
-# uses various env vars BROOKLYN_LICENSE_* to determine appropriate behaviour;
-# see make-licenses.sh for examples
-
-ls MAIN_LICENSE_ASL2 > /dev/null 2> /dev/null || ( echo "Must run in licensing directory (where this script lives)" > /dev/stderr && false )
-
-if [ -z "${BROOKLYN_LICENSE_MODE}" ] ; then echo BROOKLYN_LICENSE_MODE must be set > /dev/stderr ; false ; fi
-
-
-cat << EOF
-
-This software is distributed under the Apache License, version 2.0. See (1) below.
-This software is copyright (c) The Apache Software Foundation and contributors.
-
-Contents:
-
-  (1) This software license: Apache License, version 2.0
-  (2) Notices for bundled software
-  (3) Licenses for bundled software
-
-
-EOF
-
-echo "---------------------------------------------------"
-echo
-echo "(1) This software license: Apache License, version 2.0"
-echo
-cat MAIN_LICENSE_ASL2
-echo
-echo "---------------------------------------------------"
-echo
-echo "(2) Notices for bundled software"
-echo
-pushd .. > /dev/null
-# add -X on next line to get debug info
-mvn org.heneveld.maven:license-audit-maven-plugin:notices \
-        -DlicensesPreferred=ASL2,ASL,EPL1,BSD-2-Clause,BSD-3-Clause,CDDL1.1,CDDL1,CDDL \
-        -DoverridesFile=licensing/overrides.yaml \
-        -DextrasFiles=${BROOKLYN_LICENSE_EXTRAS_FILES:-`cat licensing/extras-files`} \
-        ${BROOKLYN_LICENSE_SPECIALS} \
-        -DoutputFile=licensing/notices.autogenerated \
-    > tmp_stdout 2> tmp_stderr
-rm tmp_std*
-popd > /dev/null
-cat notices.autogenerated
-
-echo
-echo "---------------------------------------------------"
-echo
-echo "(3) Licenses for bundled software"
-echo
-echo Contents:
-echo
-for x in licenses/${BROOKLYN_LICENSE_MODE}/* ; do head -1 $x | awk '{print "  "$0;}' ; done
-echo
-echo
-for x in licenses/${BROOKLYN_LICENSE_MODE}/* ; do cat $x ; echo ; done
-

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/overrides.yaml b/brooklyn-dist/dist/licensing/overrides.yaml
deleted file mode 100644
index 1285df4..0000000
--- a/brooklyn-dist/dist/licensing/overrides.yaml
+++ /dev/null
@@ -1,385 +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.
-#
-
-
-# overrides file for org.heneveld.license-audit-maven-plugin
-# expands/corrects detail needed for generating license notices
-
-
-# super-projects to suppress notices for sub-projects
-
-- id: org.apache.brooklyn
-  url: http://brooklyn.incubator.apache.org/
-  license: ASL2
-  internal: true
-
-# poms with missing and incorrect data
-
-- id: org.codehaus.jettison:jettison
-  url: https://github.com/codehaus/jettison
-  license: ASL2 
-- id: org.glassfish.external:opendmk_jmxremote_optional_jar
-  url: https://opendmk.java.net/
-  license: CDDL
-- id: javax.validation:validation-api
-  url: http://beanvalidation.org/
-- id: com.squareup.okhttp:okhttp
-  copyright_by: Square, Inc.
-- id: com.squareup.okio:okio
-  copyright_by: Square, Inc.
-- id: com.wordnik:swagger-core_2.9.1
-  copyright_by: SmartBear Software
-- id: com.wordnik:swagger-jaxrs_2.9.1
-  copyright_by: SmartBear Software
-- id: org.bouncycastle  
-  copyright_by: The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
-- id: org.javassist:javassist
-  copyright_by: Shigeru Chiba
-- id: org.mongodb:mongo-java-driver
-  copyright_by: MongoDB, Inc
-- id: org.apache.httpcomponents:httpclient:*
-  url: http://hc.apache.org/httpcomponents-client-ga
-- id: javax.annotation:jsr250-api:*
-  url: https://jcp.org/en/jsr/detail?id=250
-- id: javax.ws.rs:jsr311-api:*
-  url: https://jsr311.java.net/
-- id: com.thoughtworks.xstream:*:*
-  url: http://x-stream.github.io/
-- id: com.fasterxml.jackson:*:*
-  url: http://wiki.fasterxml.com/JacksonHome
-
-- id: org.hibernate:jtidy:r8-20060801
-  license:
-  - url: "http://sourceforge.net/p/jtidy/code/HEAD/tree/trunk/jtidy/LICENSE.txt?revision=95"
-    name: Java HTML Tidy License
-    comment: Original link http://svn.sourceforge.net/viewvc/*checkout*/jtidy/trunk/jtidy/LICENSE.txt?revision=95 is no longer valid
-
-- id: dom4j:dom4j:1.6.1
-  url: "http://dom4j.sourceforge.net/"
-  license:
-  - name: MetaStuff BSD style license (3-clause)
-    url: http://dom4j.sourceforge.net/dom4j-1.6.1/license.html
-
-- id: org.python:jython-standalone:2.7-b3
-  copyright_by: Jython Developers
-  license:
-  - url: http://www.jython.org/license.html
-    name: Jython Software License
-    comment: Original link http://www.jython.org/Project/license.html is no longer valid
-
-- id: xpp3:xpp3_min:*
-  copyright_by: Extreme! Lab, Indiana University
-  license:
-  - url: https://github.com/apache/openmeetings/blob/a95714ce3f7e587d13d3d0bb3b4f570be15c67a5/LICENSE#L1361
-    name: "Indiana University Extreme! Lab Software License, vesion 1.1.1"
-    comment: |
-      The license applies to the Xpp3 classes (all classes below the org.xmlpull package with exception of classes directly in package org.xmlpull.v1);
-      original link http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt is no longer valid
-  ## as we pull in xmlpull separately we do not use this, and having a single above simplifies the automation:
-  #  - url: http://creativecommons.org/licenses/publicdomain
-  #    name: Public Domain
-  #    comment: "The license applies to the XmlPull API (all classes directly in the org.xmlpull.v1 package)"
-
-
-# info on non-maven projects
-
-# used in UI
-- id: jquery-core:1.7.2
-  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/" }
-  license: MIT
-  notices: 
-  - Copyright (c) John Resig (2005-2011)
-  - "Includes code fragments from sizzle.js:"
-  - "  Copyright (c) The Dojo Foundation"
-  - "  Available at http://sizzlejs.com"
-  - "  Used under the MIT license"
-
-- id: jquery-core:1.8.0
-  url: http://jquery.com/
-  description: JS library for manipulating HTML and eventing
-  name: jQuery JavaScript Library
-  files: jquery.js
-  version: 1.8.0
-  organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
-  license: MIT
-  notices:
-  - Copyright (c) The jQuery Foundation, Inc. and other contributors (2005-2012)
-  - "Includes code fragments from sizzle.js:"
-  # NB: sizzle copyright changed from Dojo Foundation in 1.7.2
-  - "  Copyright (c) The jQuery Foundation, Inc. and other contributors (2012)"
-  - "  Available at http://sizzlejs.com"
-  - "  Used under the MIT license"
-# used in docs (not reported)
-- id: jquery-core:2.1.1
-  url: http://jquery.com/
-  description: JS library for manipulating HTML and eventing
-  name: jQuery JavaScript Library
-  files: jquery.js
-  version: 2.1.1
-  organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
-  license: MIT
-  notices: 
-  - Copyright (c) The jQuery Foundation, Inc. and other contributors (2005-2014)
-  - "Includes code fragments from sizzle.js:"
-  # NB: sizzle copyright changed from Dojo Foundation in 1.7.2
-  - "  Copyright (c) The jQuery Foundation, Inc. and other contributors (2013)"
-  - "  Available at http://sizzlejs.com"
-  - "  Used under the MIT license"
-
-# not used anymore? swagger-ui includes what it needs, it seems.
-- id: swagger:2.1.6
-  name: Swagger JS
-  files: swagger-client.js
-  version: 2.1.6
-  url: https://github.com/swagger-api/swagger-js
-  license: ASL2
-  notice: Copyright (c) SmartBear Software (2011-2015)
-
-- id: swagger-ui:2.1.4
-  files: swagger*.{js,css,html}
-  name: Swagger UI
-  version: 2.1.4
-  url: https://github.com/swagger-api/swagger-ui
-  license: ASL2
-  notice: Copyright (c) SmartBear Software (2011-2015)
-  
-- id: jquery.wiggle.min.js
-  name: jQuery Wiggle
-  version: swagger-ui:1.0.1
-  notices: 
-  - Copyright (c) WonderGroup and Jordan Thomas (2010)
-  - Previously online at http://labs.wondergroup.com/demos/mini-ui/index.html.
-  # that is link in copyright but it is no longer valid; url below is same person
-  - The version included here is from the Swagger UI distribution.
-  url: https://github.com/jordanthomas/jquery-wiggle
-  license: MIT
-
-- id: require.js
-  name: RequireJS 
-  files: require.js, text.js
-  version: 2.0.6 
-  url: http://requirejs.org/
-  organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
-  notice: Copyright (c) The Dojo Foundation (2010-2012)
-  license: MIT
-
-- id: require.js/r.js
-  # new ID because this is a different version to the above
-  name: RequireJS (r.js maven plugin)
-  files: r.js
-  version: 2.1.6 
-  url: http://github.com/jrburke/requirejs
-  organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
-  notices:
-  - Copyright (c) The Dojo Foundation (2009-2013)
-  - "Includes code fragments for source-map and other functionality:" 
-  - "  Copyright (c) The Mozilla Foundation and contributors (2011)"
-  - "  Used under the BSD 2-Clause license."
-  - "Includes code fragments for parse-js and other functionality:" 
-  - "  Copyright (c) Mihai Bazon (2010, 2012)"
-  - "  Used under the BSD 2-Clause license."
-  - "Includes code fragments for uglifyjs/consolidator:" 
-  - "  Copyright (c) Robert Gust-Bardon (2012)"
-  - "  Used under the BSD 2-Clause license."
-  - "Includes code fragments for the esprima parser:" 
-  - "  Copyright (c):"
-  - "    Ariya Hidayat (2011, 2012)"
-  - "    Mathias Bynens (2012)"
-  - "    Joost-Wim Boekesteijn (2012)"
-  - "    Kris Kowal (2012)"
-  - "    Yusuke Suzuki (2012)"
-  - "    Arpad Borsos (2012)"
-  - "  Used under the BSD 2-Clause license."
-  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: backbone.js:1.1.2
-  version: 1.1.2
-  url: http://backbonejs.org
-  organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
-  notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2014)
-  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
- 
-# used in docs (not needed for licensing) 
-- id: bootstrap.js:3.1.1
-  version: 3.1.1
-  url: http://getbootstrap.com/
-  notice: Copyright (c) Twitter, Inc. (2011-2014)
-  license: MIT
-  
-- 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
-
-# used in CLI (and in docs)
-- id: underscore.js:1.7.0
-  version: 1.7.0
-  files: underscore*.{js,map}
-  url: http://underscorejs.org
-  organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
-  notice: "Copyright (c) Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors (2009-2014)"
-  license: MIT
-
-- id: 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 
-
-- 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: handlebars.js:2.0.0
-  files: handlebars*.js
-  version: 2.0.0
-  url: https://github.com/wycats/handlebars.js
-  organization: { name: "Yehuda Katz", url: "https://github.com/wycats/" }
-  notice: Copyright (c) Yehuda Katz (2014)
-  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: jquery.dataTables
-  files: jquery.dataTables.{js,css}
-  name: DataTables Table plug-in for jQuery
-  version: 1.9.4
-  url: http://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: 0.1
-  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
-  # also http://malsup.com/jquery/form/
-  organization: { name: "Mike Alsup", url: "http://malsup.com/" }
-  notice: Copyright (c) M. Alsup (2006-2013)
-  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
-
-# used for CLI to build catalog
-- id: marked.js
-  version: 0.3.1
-  url: https://github.com/chjj/marked
-  organization: { name: "Christopher Jeffrey", url: "https://github.com/chjj" }
-  notice: Copyright (c) Christopher Jeffrey (2011-2014)
-  license: MIT
-
-# DOCS files
-#
-# we don't do a distributable docs build -- they are just online.
-# (docs are excluded from the source build, and not bundled with the binary build.)
-# so these are not used currently; but for completeness and in case we change our minds,
-# here they are:
-
-# * different versions of jquery, bootstrap, and underscore noted above,
-# * media items github octicons and font-awesome fonts, not listed
-# * plus the below:
-
-- id: jquery.superfish.js
-  files: superfish.js
-  name: Superfish jQuery Menu Widget
-  version: 1.4.8
-  url: http://users.tpg.com.au/j_birch/plugins/superfish/
-  notice: Copyright (c) Joel Birch (2008)
-  license: MIT
-
-- id: jquery.cookie.js
-  name: jQuery Cookie Plugin
-  version: 1.3.1
-  url: https://github.com/carhartl/jquery-cookie
-  notice: Copyright (c) 2013 Klaus Hartl
-  license: MIT
-
-

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/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
deleted file mode 100644
index 97839fc..0000000
--- a/brooklyn-dist/dist/licensing/projects-with-custom-licenses
+++ /dev/null
@@ -1,2 +0,0 @@
-../../brooklyn-ui
-../../brooklyn-server/server-cli

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/pom.xml b/brooklyn-dist/dist/pom.xml
deleted file mode 100644
index 0d01390..0000000
--- a/brooklyn-dist/dist/pom.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-
-    <artifactId>brooklyn-dist</artifactId>
-
-    <name>Brooklyn Distribution</name>
-    <description>
-        Brooklyn redistributable package archive, includes all required
-        Jar files and scripts
-    </description>
-
-    <parent>
-        <groupId>org.apache.brooklyn</groupId>
-        <artifactId>brooklyn-dist-root</artifactId>
-        <version>0.9.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.brooklyn</groupId>
-            <artifactId>brooklyn-all</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- TODO include examples -->
-        <!-- TODO include documentation -->
-
-        <dependency>
-            <groupId>org.apache.brooklyn</groupId>
-            <artifactId>brooklyn-test-support</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <!-- copy the config file from the CLI project (could instead use unpack goal with an includes filter) -->
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <!-- this can fail in eclipse trying to copy _from_ target/classes.
-                                         see http://jira.codehaus.org/browse/MDEP-259 -->
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>brooklyn-cli</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>bom</type>
-                                    <classifier>dist</classifier>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>target</outputDirectory>
-                                    <destFileName>default.catalog.bom</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <configuration>
-                    <excludes combine.children="append">
-                        <!-- Exclude sample config files because they are illustrative, intended for changing -->
-                        <exclude>src/main/dist/conf/**</exclude>
-                        <exclude>src/main/dist/README.md</exclude>
-                        <exclude>licensing/licenses/**</exclude>
-                        <exclude>licensing/README.md</exclude>
-                        <exclude>licensing/*LICENSE*</exclude>
-                        <exclude>licensing/*.autogenerated</exclude>
-                        <exclude>licensing/projects-with-custom-licenses</exclude>
-                        <exclude>licensing/extras-files</exclude>
-                    </excludes>
-                  </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>build-distribution-dir</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>true</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/main/config/build-distribution.xml</descriptor>
-                            </descriptors>
-                            <finalName>brooklyn</finalName>
-                            <includeBaseDirectory>false</includeBaseDirectory>
-                            <formats>
-                                <format>dir</format>
-                            </formats>
-                            <attach>false</attach>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>build-distribution-archive</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>true</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/main/config/build-distribution.xml</descriptor>
-                            </descriptors>
-                          <!-- finalName affects name in `target/` but we cannot influence name when it is attached/installed,
-                               so `apache-` prefix would be lost there. to keep it consistent this is commented out, 
-                               but would be nice to have if there is a way!
-                            <finalName>apache-brooklyn-${project.version}</finalName>
-                          -->
-                            <formats>
-                                <format>tar.gz</format>
-                                <format>zip</format>
-                            </formats>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/src/main/config/build-distribution.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/config/build-distribution.xml b/brooklyn-dist/dist/src/main/config/build-distribution.xml
deleted file mode 100644
index f543292..0000000
--- a/brooklyn-dist/dist/src/main/config/build-distribution.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-     http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>dist</id>
-    <formats><!-- empty, intended for caller to specify --></formats>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/../..</directory>
-            <outputDirectory></outputDirectory>
-            <fileMode>0644</fileMode>
-            <directoryMode>0755</directoryMode>
-            <includes>
-                <include>DISCLAIMER*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/license/files</directory>
-            <outputDirectory></outputDirectory>
-            <fileMode>0644</fileMode>
-            <directoryMode>0755</directoryMode>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/dist/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <fileMode>0755</fileMode>
-            <directoryMode>0755</directoryMode>
-        </fileSet>
-        <fileSet>
-            <!-- Add an empty dropins folder (so need to reference an existing dir, and exclude everything) -->
-            <directory>${project.basedir}/src/main/dist</directory>
-            <outputDirectory>lib/dropins</outputDirectory>
-            <directoryMode>0755</directoryMode>
-            <excludes>
-                <exclude>**/*</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/target</directory>
-            <outputDirectory>conf/brooklyn</outputDirectory>
-            <fileMode>0644</fileMode>
-            <directoryMode>0755</directoryMode>
-            <includes>
-                <include>default.catalog.bom</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <!-- Add an empty patch folder (so need to reference an existing dir, and exclude everything) -->
-            <directory>${project.basedir}/src/main/dist</directory>
-            <outputDirectory>lib/patch</outputDirectory>
-            <directoryMode>0755</directoryMode>
-            <excludes>
-                <exclude>**/*</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/dist</directory>
-            <outputDirectory></outputDirectory>
-            <fileMode>0644</fileMode>
-            <directoryMode>0755</directoryMode>
-            <excludes>
-                <exclude>bin/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-    <!-- TODO include documentation -->
-    <!-- TODO include examples -->
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>lib/brooklyn</outputDirectory>
-            <fileMode>0644</fileMode>
-            <directoryMode>0755</directoryMode>
-            <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-        </dependencySet>
-    </dependencySets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/src/main/dist/README.md
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/dist/README.md b/brooklyn-dist/dist/src/main/dist/README.md
deleted file mode 100644
index 406bccd..0000000
--- a/brooklyn-dist/dist/src/main/dist/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# [![**Brooklyn**](https://brooklyn.apache.org/style/img/apache-brooklyn-logo-244px-wide.png)](http://brooklyn.apache.org/)
-
-### Apache Brooklyn
-
-This is the distribution of Apache Brooklyn.
-
-As a quick start, run:
-
-    ./bin/brooklyn launch
-
-For server CLI info, use:
-
-    ./bin/brooklyn help
-
-And to learn more, including the full user's guide, visit [brooklyn.apache.org](http://brooklyn.apache.org/).
-

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/src/main/dist/bin/.gitattributes
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/dist/bin/.gitattributes b/brooklyn-dist/dist/src/main/dist/bin/.gitattributes
deleted file mode 100644
index 4e2b719..0000000
--- a/brooklyn-dist/dist/src/main/dist/bin/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-#Don't auto-convert line endings for shell scripts on Windows (breaks the scripts)
-brooklyn text eol=lf
-cloud-explorer text eol=lf

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/src/main/dist/bin/brooklyn
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/dist/bin/brooklyn b/brooklyn-dist/dist/src/main/dist/bin/brooklyn
deleted file mode 100755
index 370bc93..0000000
--- a/brooklyn-dist/dist/src/main/dist/bin/brooklyn
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-# Brooklyn
-#
-
-#set -x # debug
-
-# discover BROOKLYN_HOME if not set, by attempting to resolve absolute path of this command
-ROOT=$(cd "$(dirname "$0")/.." && pwd -P)
-if [ -z "$BROOKLYN_HOME" ] ; then
-    BROOKLYN_HOME=$(cd "$(dirname "$(readlink -f "$0" 2> /dev/null || readlink "$0" 2> /dev/null || echo "$0")")/.." && pwd)
-fi
-export ROOT BROOKLYN_HOME
-
-# use default memory settings, if not specified
-if [ -z "${JAVA_OPTS}" ] ; then
-    JAVA_OPTS="-Xms256m -Xmx1g -XX:MaxPermSize=256m"
-fi
-
-# set up the classpath
-INITIAL_CLASSPATH=${BROOKLYN_HOME}/conf:${BROOKLYN_HOME}/lib/patch/*:${BROOKLYN_HOME}/lib/brooklyn/*:${BROOKLYN_HOME}/lib/dropins/*
-# specify additional CP args in BROOKLYN_CLASSPATH
-if [ ! -z "${BROOKLYN_CLASSPATH}" ]; then
-    INITIAL_CLASSPATH=${BROOKLYN_CLASSPATH}:${INITIAL_CLASSPATH}
-fi
-export INITIAL_CLASSPATH
-
-# force resolution of localhost to be loopback, otherwise we hit problems
-# TODO should be changed in code
-JAVA_OPTS="-Dbrooklyn.location.localhost.address=127.0.0.1 ${JAVA_OPTS}"
-
-# start Brooklyn
-echo $$ > "$ROOT/pid_java"
-exec java ${JAVA_OPTS} -cp "${INITIAL_CLASSPATH}" org.apache.brooklyn.cli.Main "$@"

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/src/main/dist/bin/brooklyn.bat
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/dist/bin/brooklyn.bat b/brooklyn-dist/dist/src/main/dist/bin/brooklyn.bat
deleted file mode 100644
index 90e300e..0000000
--- a/brooklyn-dist/dist/src/main/dist/bin/brooklyn.bat
+++ /dev/null
@@ -1,111 +0,0 @@
-@echo off
-REM Licensed to the Apache Software Foundation (ASF) under one
-REM or more contributor license agreements.  See the NOTICE file
-REM distributed with this work for additional information
-REM regarding copyright ownership.  The ASF licenses this file
-REM to you under the Apache License, Version 2.0 (the
-REM "License"); you may not use this file except in compliance
-REM with the License.  You may obtain a copy of the License at
-REM 
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM 
-REM Unless required by applicable law or agreed to in writing,
-REM software distributed under the License is distributed on an
-REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM KIND, either express or implied.  See the License for the
-REM specific language governing permissions and limitations
-REM under the License.
-
-SETLOCAL EnableDelayedExpansion
-
-REM discover BROOKLYN_HOME if not set, by attempting to resolve absolute path of this command (brooklyn.bat)
-IF NOT DEFINED BROOKLYN_HOME (
-    SET "WORKING_FOLDER=%~dp0"
-    
-    REM stript trailing slash
-    SET "WORKING_FOLDER=!WORKING_FOLDER:~0,-1!"
-    
-    REM get parent folder (~dp works only for batch file params and loop indexes)
-    FOR %%i in ("!WORKING_FOLDER!") DO SET "BROOKLYN_HOME=%%~dpi"
-)
-
-REM Discover the location of Java.
-REM Use JAVA_HOME environment variable, if available;
-REM else, check the path;
-REM else, search registry for Java installations;
-REM else fail.
-
-IF DEFINED JAVA_HOME (
-    CALL :joinpath "%JAVA_HOME%" bin\java.exe JAVA_BIN
-)
-
-IF NOT DEFINED JAVA_BIN (
-    IF NOT DEFINED JAVA_HOME CALL :registry_home "HKLM\SOFTWARE\JavaSoft\Java Runtime Environment"
-    IF NOT DEFINED JAVA_HOME CALL :registry_home "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Runtime Environment"
-    IF NOT DEFINED JAVA_HOME CALL :registry_home "HKLM\SOFTWARE\JavaSoft\Java Development Kit"
-    IF NOT DEFINED JAVA_HOME CALL :registry_home "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Development Kit"
-    CALL :joinpath "!JAVA_HOME!" bin\java.exe JAVA_BIN
-)
-
-IF NOT DEFINED JAVA_BIN (
-    java.exe -version > NUL 2> NUL
-    echo !ERRORLEVEL!
-    IF NOT !ERRORLEVEL!==9009 SET JAVA_BIN=java.exe
-)
-
-IF NOT DEFINED JAVA_BIN (
-    echo "Unable to locate a Java installation. Please set JAVA_HOME or PATH environment variables."
-    exit /b 1
-) ELSE (
-    "%JAVA_BIN%" -version > NUL 2> NUL
-    IF !ERRORLEVEL!==9009 (
-        echo "java.exe does not exist where specified. Please check JAVA_HOME or PATH environment variables."
-        exit /b 1
-    )
-)
-
-REM use default memory settings, if not specified
-IF "%JAVA_OPTS%"=="" SET JAVA_OPTS=-Xms256m -Xmx500m -XX:MaxPermSize=256m
-
-REM set up the classpath
-SET INITIAL_CLASSPATH=%BROOKLYN_HOME%conf;%BROOKLYN_HOME%lib\patch\*;%BROOKLYN_HOME%lib\brooklyn\*;%BROOKLYN_HOME%lib\dropins\*
-REM specify additional CP args in BROOKLYN_CLASSPATH
-IF NOT "%BROOKLYN_CLASSPATH%"=="" SET "INITIAL_CLASSPATH=%BROOKLYN_CLASSPATH%;%INITIAL_CLASSPATH%"
-
-REM force resolution of localhost to be loopback, otherwise we hit problems
-REM TODO should be changed in code
-SET JAVA_OPTS=-Dbrooklyn.location.localhost.address=127.0.0.1 %JAVA_OPTS%
-
-REM workaround for http://bugs.sun.com/view_bug.do?bug_id=4787931
-SET JAVA_OPTS=-Duser.home="%USERPROFILE%" %JAVA_OPTS%
-
-REM start Brooklyn
-REM NO easy way to find process PID!!!
-pushd %BROOKLYN_HOME%
-
-"%JAVA_BIN%" %JAVA_OPTS% -cp "%INITIAL_CLASSPATH%" org.apache.brooklyn.cli.Main %*
-
-popd
-
-ENDLOCAL
-GOTO :EOF
-
-:joinpath
-    SET Path1=%~1
-    SET Path2=%~2
-    IF {%Path1:~-1,1%}=={\} (SET "%3=%Path1%%Path2%") ELSE (SET "%3=%Path1%\%Path2%")
-GOTO :EOF
-
-:whereis
-    REM Doesn't handle paths with quotes in the PATH variable
-    SET "%2=%~$PATH:1"
-GOTO :EOF
-
-:registry_value
-    FOR /F "skip=2 tokens=2*" %%A IN ('REG QUERY %1 /v %2 2^>nul') DO SET "%3=%%B"
-GOTO :EOF
-
-:registry_home
-    CALL :registry_value %1 CurrentVersion JAVA_VERSION
-    CALL :registry_value "%~1\%JAVA_VERSION%" JavaHome JAVA_HOME
-GOTO :EOF

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/src/main/dist/bin/brooklyn.ps1
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/dist/bin/brooklyn.ps1 b/brooklyn-dist/dist/src/main/dist/bin/brooklyn.ps1
deleted file mode 100644
index 6780ed2..0000000
--- a/brooklyn-dist/dist/src/main/dist/bin/brooklyn.ps1
+++ /dev/null
@@ -1,135 +0,0 @@
-#!ps1
-#
-# 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.
-#
-# Brooklyn
-#
-
-$ErrorActionPreference = "Stop";
-
-$ROOT = split-path -parent $MyInvocation.MyCommand.Definition
-
-# discover BROOKLYN_HOME if not set, by attempting to resolve absolute path of this command (brooklyn)
-if ( $env:BROOKLYN_HOME -eq $null ) {
-    $BROOKLYN_HOME = split-path -parent $ROOT
-} else {
-    $BROOKLYN_HOME = $env:BROOKLYN_HOME
-}
-
-# Discover the location of Java.
-# Use JAVA_HOME environment variable, if available;
-# else, search registry for Java installations;
-# else, check the path;
-# else fail.
-$bin = [System.IO.Path]::Combine("bin", "java.exe")
-if ( $env:JAVA_HOME -ne $null ) {
-    $javahome = $env:JAVA_HOME
-    $javabin = [System.IO.Path]::Combine($javahome, $bin)
-}
-if ( $javabin -eq $null ) {
-    $reglocations = ( 'HKLM:\SOFTWARE\JavaSoft\Java Runtime Environment',
-                      'HKLM:\SOFTWARE\Wow6432Node\JavaSoft\Java Runtime Environment' )
-    $jres = @{}
-    foreach ($loc in $reglocations) {
-        $item = Get-Item $loc -ErrorAction SilentlyContinue
-        if ($item -eq $null) { continue }
-        foreach ($key in Get-ChildItem $loc) {
-            $version = $key.PSChildName
-            $jrehome = $key.GetValue("JavaHome")
-            $jres.Add($version, $jrehome)
-        }
-    }
-    # TODO - this does a simple sort on the registry key name (the JRE version). This is not ideal - better would be
-    # to understand semantic versioning, filter out incompatible JREs (1.5 and earlier), prefer known good JREs (1.6
-    # or 1.7) and pick the highest patchlevel.
-    $last = ( $jres.Keys | Sort-Object | Select-Object -Last 1 )
-    if ( $last -ne $null ) {
-        $javahome = $jres.Get_Item($last)
-        $javabin = [System.IO.Path]::Combine($javahome, $bin)
-    }
-}
-if ( $javabin -eq $null ) {
-    $where = Get-Command "java.exe" -ErrorAction SilentlyContinue
-    if ( $where -ne $null ) {
-        $javabin = $where.Definition
-        $bindir = [System.IO.Path]::GetDirectoryName($javabin)
-        $javahome = [System.IO.Path]::GetDirectoryName($bindir)
-    }
-}
-
-if ( $javabin -eq $null ) {
-    throw "Unable to locate a Java installation. Please set JAVA_HOME or PATH environment variables."
-} elseif ( $( Get-Item $javabin -ErrorAction SilentlyContinue ) -eq $null ) {
-    throw "java.exe does not exist where specified. Please check JAVA_HOME or PATH environment variables."
-}
-
-# set up the classpath
-$cp = Get-ChildItem ${BROOKLYN_HOME}\conf | Select-Object -ExpandProperty FullName
-
-if ( Test-Path ${BROOKLYN_HOME}\lib\patch ) {
-    $cp += Get-ChildItem ${BROOKLYN_HOME}\lib\patch | Select-Object -ExpandProperty FullName
-}
-
-$cp += Get-ChildItem ${BROOKLYN_HOME}\lib\brooklyn | Select-Object -ExpandProperty FullName
-
-if ( Test-Path ${BROOKLYN_HOME}\lib\dropins ) {
-    $cp += Get-ChildItem ${BROOKLYN_HOME}\lib\dropins | Select-Object -ExpandProperty FullName
-}
-
-$INITIAL_CLASSPATH = $cp -join ';'
-
-# specify additional CP args in BROOKLYN_CLASSPATH
-if ( ! ( $env:BROOKLYN_CLASSPATH -eq $null )) {
-    $INITIAL_CLASSPATH = "$($INITIAL_CLASSPATH);$($env:BROOKLYN_CLASSPATH)"
-}
-
-# start to build up the arguments to the java invocation
-$javaargs = @()
-
-# add the user's java opts, or use default memory settings, if not specified
-if ( $env:JAVA_OPTS -eq $null ) {
-    $javaargs +="-Xms256m -Xmx1g -XX:MaxPermSize=256m"
-} else {
-    $javaargs +=$env:JAVA_OPTS
-}
-
-# force resolution of localhost to be loopback, otherwise we hit problems
-# TODO should be changed in code
-$javaargs += "-Dbrooklyn.localhost.address=127.0.0.1 $($JAVA_OPTS)"
-
-# workaround for http://bugs.sun.com/view_bug.do?bug_id=4787931
-$javaargs += "-Duser.home=`"$env:USERPROFILE`""
-
-# add the classpath
-$javaargs += "-cp"
-$javaargs += "`"$($INITIAL_CLASSPATH)`""
-
-# main class
-$javaargs += "org.apache.brooklyn.cli.Main"
-
-# copy in the arguments that were given to this script
-$javaargs += $args
-
-# start Brooklyn
-$process = Start-Process -FilePath $javabin -ArgumentList $javaargs -NoNewWindow -PassThru
-
-# save PID
-Set-Content -Path ${BROOKLYN_HOME}\pid_java -Value $($process.Id)
-
-# wait for it to finish
-$process.WaitForExit()

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/src/main/dist/conf/logback.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/dist/conf/logback.xml b/brooklyn-dist/dist/src/main/dist/conf/logback.xml
deleted file mode 100644
index e70862c..0000000
--- a/brooklyn-dist/dist/src/main/dist/conf/logback.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <!-- to supply custom logging, either change this file, supply your own logback-main.xml 
-         (overriding the default provided on the classpath) or any of the files it references; 
-         see the Logging section of the Brooklyn web site for more information -->
-
-    <property name="logging.basename" scope="context" value="brooklyn" />
-    <property name="logging.dir" scope="context" value="./" />
-
-    <include resource="logback-main.xml"/>
-    
-</configuration>
-

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/src/main/license/README.md
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/license/README.md b/brooklyn-dist/dist/src/main/license/README.md
deleted file mode 100644
index 0d3b52b..0000000
--- a/brooklyn-dist/dist/src/main/license/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-See /usage/dist/licensing/README.md for an explanation of this directory.
-

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/dist/src/main/license/files/DISCLAIMER
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/license/files/DISCLAIMER b/brooklyn-dist/dist/src/main/license/files/DISCLAIMER
deleted file mode 100644
index 9e6119b..0000000
--- a/brooklyn-dist/dist/src/main/license/files/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.
-


Mime
View raw message