You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:35:25 UTC

[45/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!)

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/pom.xml b/brooklyn-dist/vagrant/pom.xml
deleted file mode 100644
index fbe6539..0000000
--- a/brooklyn-dist/vagrant/pom.xml
+++ /dev/null
@@ -1,83 +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>pom</packaging>
-
-    <artifactId>brooklyn-vagrant</artifactId>
-
-    <name>Brooklyn Vagrant Getting Started Environment</name>
-    <description>
-        Brooklyn Getting Started Vagrant environment archive, includes all required
-        files to start Brooklyn and sample BYON nodes for use.
-    </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>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <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>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.rat</groupId>
-                    <artifactId>apache-rat-plugin</artifactId>
-                    <configuration>
-                        <excludes combine.children="append">
-                            <exclude>src/main/vagrant/README.md</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/src/main/config/build-distribution.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/src/main/config/build-distribution.xml b/brooklyn-dist/vagrant/src/main/config/build-distribution.xml
deleted file mode 100644
index 823ad2a..0000000
--- a/brooklyn-dist/vagrant/src/main/config/build-distribution.xml
+++ /dev/null
@@ -1,33 +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}/src/main/vagrant</directory>
-            <outputDirectory></outputDirectory>
-            <fileMode>0644</fileMode>
-            <directoryMode>0755</directoryMode>
-        </fileSet>
-    </fileSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/src/main/vagrant/README.md
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/src/main/vagrant/README.md b/brooklyn-dist/vagrant/src/main/vagrant/README.md
deleted file mode 100644
index 2f5573c..0000000
--- a/brooklyn-dist/vagrant/src/main/vagrant/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-
-# [![**Brooklyn**](https://brooklyn.apache.org/style/img/apache-brooklyn-logo-244px-wide.png)](http://brooklyn.apache.org/)
-
-### Using Vagrant with Brooklyn -SNAPSHOT builds
-
-##### Install a community-managed version from Maven
-1. No action is required other than setting the  `BROOKLYN_VERSION:` environment variable in `servers.yaml` to a `-SNAPSHOT` version. For example:
-
-   ```
-   env:
-     BROOKLYN_VERSION: 0.9.0-SNAPSHOT
-   ```
-
-2. You may proceed to use the `Vagrantfile` as normal; `vagrant up`, `vagrant destroy` etc.
-
-##### Install a locally built `-dist.tar.gz`
-
-1. Set the `BROOKLYN_VERSION:` environment variable in `servers.yaml` to your current `-SNAPSHOT` version. For example:
-
-   ```
-   env:
-     BROOKLYN_VERSION: 0.9.0-SNAPSHOT
-   ```
-
-2. Set the `INSTALL_FROM_LOCAL_DIST:` environment variable in `servers.yaml` to `true`. For example:
-
-   ```
-   env:
-     INSTALL_FROM_LOCAL_DIST: true
-   ```
-
-
-3. Copy your locally built `-dist.tar.gz` archive to the same directory as the Vagrantfile (this directory is mounted in the Vagrant VM at `/vagrant/`).
-
-   For example to copy a locally built `0.9.0-SNAPSHOT` dist:
-
-   ```
-   cp ~/.m2/repository/org/apache/brooklyn/brooklyn-dist/0.9.0-SNAPSHOT/brooklyn-dist-0.9.0-SNAPSHOT-dist.tar.gz .
-   ```
-
-4. You may proceed to use the `Vagrantfile` as normal; `vagrant up`, `vagrant destroy` etc.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/src/main/vagrant/Vagrantfile
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/src/main/vagrant/Vagrantfile b/brooklyn-dist/vagrant/src/main/vagrant/Vagrantfile
deleted file mode 100644
index fb35a15..0000000
--- a/brooklyn-dist/vagrant/src/main/vagrant/Vagrantfile
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# 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.
-#
-
-# Specify minimum Vagrant version and Vagrant API version
-Vagrant.require_version ">= 1.8.1"
-VAGRANTFILE_API_VERSION = "2"
-
-# Update OS (Debian/RedHat based only)
-UPDATE_OS_CMD = "(sudo apt-get update && sudo apt-get -y upgrade) || (sudo yum -y update)"
-
-# Require YAML module
-require 'yaml'
-
-# Read YAML file with box details
-yaml_cfg = YAML.load_file(__dir__ + '/servers.yaml')
-
-# Create boxes
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  # Iterate through server entries in YAML file
-  yaml_cfg["servers"].each do |server|
-    config.vm.define server["name"] do |server_config|
-
-      server_config.vm.box = server["box"]
-
-      server_config.vm.box_check_update = yaml_cfg["default_config"]["check_newer_vagrant_box"]
-
-      if server.has_key?("ip")
-        server_config.vm.network "private_network", ip: server["ip"]
-      end
-
-      if server.has_key?("forwarded_ports")
-        server["forwarded_ports"].each do |ports|
-          server_config.vm.network "forwarded_port", guest: ports["guest"], host: ports["host"], guest_ip: ports["guest_ip"]
-        end
-      end
-
-      server_config.vm.hostname = server["name"]
-      server_config.vm.provider :virtualbox do |vb|
-        vb.name = server["name"]
-        vb.memory = server["ram"]
-        vb.cpus = server["cpus"]
-      end
-
-      if yaml_cfg["default_config"]["run_os_update"]
-        server_config.vm.provision "shell", privileged: false, inline: UPDATE_OS_CMD
-      end
-
-      if server["shell"] && server["shell"]["cmd"]
-        server["shell"]["cmd"].each do |cmd|
-          server_config.vm.provision "shell", privileged: false, inline: cmd, env: server["shell"]["env"]
-        end
-      end
-
-      server_config.vm.post_up_message = server["post_up_message"]
-    end
-  end
-end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/src/main/vagrant/files/brooklyn.properties
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/src/main/vagrant/files/brooklyn.properties b/brooklyn-dist/vagrant/src/main/vagrant/files/brooklyn.properties
deleted file mode 100644
index 0784ff3..0000000
--- a/brooklyn-dist/vagrant/src/main/vagrant/files/brooklyn.properties
+++ /dev/null
@@ -1,23 +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.
-#
-
-# Disabling security on the Vagrant Brooklyn instance for training purposes
-brooklyn.webconsole.security.provider = org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider
-
-# Note: BYON locations are loaded from the files/vagrant-catalog.bom on startup
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/src/main/vagrant/files/brooklyn.service
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/src/main/vagrant/files/brooklyn.service b/brooklyn-dist/vagrant/src/main/vagrant/files/brooklyn.service
deleted file mode 100644
index 28b0fea..0000000
--- a/brooklyn-dist/vagrant/src/main/vagrant/files/brooklyn.service
+++ /dev/null
@@ -1,32 +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.
-#
-
-[Unit]
-Description=Apache Brooklyn service
-Documentation=http://brooklyn.apache.org/documentation/index.html
-
-[Service]
-ExecStart=/home/vagrant/apache-brooklyn/bin/brooklyn launch --persist auto --persistenceDir /vagrant/brooklyn-persisted-state --catalogAdd /vagrant/files/vagrant-catalog.bom
-WorkingDirectory=/home/vagrant/apache-brooklyn
-Restart=on-abort
-User=vagrant
-Group=vagrant
-
-[Install]
-WantedBy=multi-user.target

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/src/main/vagrant/files/install_brooklyn.sh
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/src/main/vagrant/files/install_brooklyn.sh b/brooklyn-dist/vagrant/src/main/vagrant/files/install_brooklyn.sh
deleted file mode 100755
index 9c52017..0000000
--- a/brooklyn-dist/vagrant/src/main/vagrant/files/install_brooklyn.sh
+++ /dev/null
@@ -1,92 +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_VERSION=""
-INSTALL_FROM_LOCAL_DIST="false"
-TMP_ARCHIVE_NAME=apache-brooklyn.tar.gz
-
-do_help() {
-  echo "./install.sh -v <Brooklyn Version> [-l <install from local file: true|false>]"
-  exit 1
-}
-
-while getopts ":hv:l:" opt; do
-    case "$opt" in
-    v)  BROOKLYN_VERSION=$OPTARG ;;
-        # using a true/false argopt rather than just flag to allow easier integration with servers.yaml config
-    l)  INSTALL_FROM_LOCAL_DIST=$OPTARG ;;
-    h)  do_help;;
-    esac
-done
-
-# Exit if any step fails
-set -e
-
-if [ "x${BROOKLYN_VERSION}" == "x" ]; then
-  echo "Error: you must supply a Brooklyn version [-v]"
-  do_help
-fi
-
-if [ ! "${INSTALL_FROM_LOCAL_DIST}" == "true" ]; then
-  if [ ! -z "${BROOKLYN_VERSION##*-SNAPSHOT}" ] ; then
-    # url for official release versions
-    BROOKLYN_URL="https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-${BROOKLYN_VERSION}/apache-brooklyn-${BROOKLYN_VERSION}-bin.tar.gz"
-    BROOKLYN_DIR="apache-brooklyn-${BROOKLYN_VERSION}-bin"
-  else
-    # url for community-managed snapshots
-    BROOKLYN_URL="https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&a=brooklyn-dist&v=${BROOKLYN_VERSION}&c=dist&e=tar.gz"
-    BROOKLYN_DIR="brooklyn-dist-${BROOKLYN_VERSION}"
-  fi
-else
-  echo "Installing from a local -dist archive [ /vagrant/brooklyn-dist-${BROOKLYN_VERSION}-dist.tar.gz]"
-  # url to install from mounted /vagrant dir
-  BROOKLYN_URL="file:///vagrant/brooklyn-dist-${BROOKLYN_VERSION}-dist.tar.gz"
-  BROOKLYN_DIR="brooklyn-dist-${BROOKLYN_VERSION}"
-
-  # ensure local file exists
-  if [ ! -f /vagrant/brooklyn-dist-${BROOKLYN_VERSION}-dist.tar.gz ]; then
-    echo "Error: file not found /vagrant/brooklyn-dist-${BROOKLYN_VERSION}-dist.tar.gz"
-    exit 1
-  fi
-fi
-
-echo "Installing Apache Brooklyn version ${BROOKLYN_VERSION} from [${BROOKLYN_URL}]"
-
-echo "Downloading Brooklyn release archive"
-curl --fail --silent --show-error --location --output ${TMP_ARCHIVE_NAME} "${BROOKLYN_URL}"
-echo "Extracting Brooklyn release archive"
-tar zxf ${TMP_ARCHIVE_NAME}
-
-echo "Creating Brooklyn dirs and symlinks"
-ln -s ${BROOKLYN_DIR} apache-brooklyn
-sudo mkdir -p /var/log/brooklyn
-sudo chown -R vagrant:vagrant /var/log/brooklyn
-mkdir -p /home/vagrant/.brooklyn
-
-echo "Copying default vagrant Brooklyn properties file"
-cp /vagrant/files/brooklyn.properties /home/vagrant/.brooklyn/
-chmod 600 /home/vagrant/.brooklyn/brooklyn.properties
-
-echo "Installing JRE"
-sudo sh -c 'export DEBIAN_FRONTEND=noninteractive; apt-get install --yes openjdk-8-jre-headless'
-
-echo "Copying Brooklyn systemd service unit file"
-sudo cp /vagrant/files/brooklyn.service /etc/systemd/system/brooklyn.service
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/src/main/vagrant/files/logback.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/src/main/vagrant/files/logback.xml b/brooklyn-dist/vagrant/src/main/vagrant/files/logback.xml
deleted file mode 100644
index 1560d8b..0000000
--- a/brooklyn-dist/vagrant/src/main/vagrant/files/logback.xml
+++ /dev/null
@@ -1,32 +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.
--->
-
-<configuration scan="true">
-
-    <!-- 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="/var/log/brooklyn/" />
-
-    <include resource="logback-main.xml"/>
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/src/main/vagrant/files/vagrant-catalog.bom
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/src/main/vagrant/files/vagrant-catalog.bom b/brooklyn-dist/vagrant/src/main/vagrant/files/vagrant-catalog.bom
deleted file mode 100644
index d8b8450..0000000
--- a/brooklyn-dist/vagrant/src/main/vagrant/files/vagrant-catalog.bom
+++ /dev/null
@@ -1,82 +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.
-#
-brooklyn.catalog:
-  items:
-  - id: byon1
-    name: Vagrant BYON VM 1
-    version: 0.9.0-SNAPSHOT  # BROOKLYN_VERSION
-    itemType: location
-    item:
-      type: byon
-      brooklyn.config:
-        user: vagrant
-        password: vagrant
-        hosts:
-        - 10.10.10.101
-
-  - id: byon2
-    name: Vagrant BYON VM 2
-    version: 0.9.0-SNAPSHOT  # BROOKLYN_VERSION
-    itemType: location
-    item:
-      type: byon
-      brooklyn.config:
-        user: vagrant
-        password: vagrant
-        hosts:
-        - 10.10.10.102
-
-  - id: byon3
-    name: Vagrant BYON VM 3
-    version: 0.9.0-SNAPSHOT  # BROOKLYN_VERSION
-    itemType: location
-    item:
-      type: byon
-      brooklyn.config:
-        user: vagrant
-        password: vagrant
-        hosts:
-        - 10.10.10.103
-
-  - id: byon4
-    name: Vagrant BYON VM 4
-    version: 0.9.0-SNAPSHOT  # BROOKLYN_VERSION
-    itemType: location
-    item:
-      type: byon
-      brooklyn.config:
-        user: vagrant
-        password: vagrant
-        hosts:
-        - 10.10.10.104
-
-  - id: byon-all
-    name: Vagrant BYON VM 1-4
-    version: 0.9.0-SNAPSHOT  # BROOKLYN_VERSION
-    itemType: location
-    item:
-      type: byon
-      brooklyn.config:
-        user: vagrant
-        password: vagrant
-        hosts:
-        - 10.10.10.101
-        - 10.10.10.102
-        - 10.10.10.103
-        - 10.10.10.104

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/brooklyn-dist/vagrant/src/main/vagrant/servers.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/vagrant/src/main/vagrant/servers.yaml b/brooklyn-dist/vagrant/src/main/vagrant/servers.yaml
deleted file mode 100644
index 3959fff..0000000
--- a/brooklyn-dist/vagrant/src/main/vagrant/servers.yaml
+++ /dev/null
@@ -1,73 +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.
-#
-#
-# Default Config
-#   check_newer_vagrant_box
-#     enable/disable the vagrant check for an updated box
-#   run_os_update
-#     enable/disable running a yum/apt-get update on box start
-#
-# Brooklyn Server Config
-#   shell:env:BROOKLYN_VERSION
-#     specifies the version of Brooklyn to install, be aware that for SNAPSHOTS you
-#     may wish to download a local -dist.tar.gz for the latest version.
-#   shell:env:INSTALL_FROM_LOCAL_DIST
-#     if set to `true` Vagrant will install from a local -dist.tar.gz stored in /vagrant
-#     on the guest VM (which is mounted from the Vagrantfile directory). You must
-#     ensure that a -dist.tar.gz archive has been copied to this directory on your host.
-
----
-default_config:
-    check_newer_vagrant_box: true
-    run_os_update: true
-servers:
-  - name: brooklyn
-    box: ubuntu/vivid64
-    ram: 2048
-    cpus: 4
-    ip: 10.10.10.100
-    shell:
-      env:
-        BROOKLYN_VERSION: 0.9.0-SNAPSHOT
-        INSTALL_FROM_LOCAL_DIST: false
-      cmd:
-        - /vagrant/files/install_brooklyn.sh -v ${BROOKLYN_VERSION} -l ${INSTALL_FROM_LOCAL_DIST}
-        - sudo systemctl start brooklyn
-        - sudo systemctl enable brooklyn
-  - name: byon1
-    box: ubuntu/vivid64
-    ram: 512
-    cpus: 2
-    ip: 10.10.10.101
-  - name: byon2
-    box: ubuntu/vivid64
-    ram: 512
-    cpus: 2
-    ip: 10.10.10.102
-  - name: byon3
-    box: ubuntu/vivid64
-    ram: 512
-    cpus: 2
-    ip: 10.10.10.103
-  - name: byon4
-    box: ubuntu/vivid64
-    ram: 512
-    cpus: 2
-    ip: 10.10.10.104
-...

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/dist/licensing/.gitignore
----------------------------------------------------------------------
diff --git a/dist/licensing/.gitignore b/dist/licensing/.gitignore
new file mode 100644
index 0000000..2d17061
--- /dev/null
+++ b/dist/licensing/.gitignore
@@ -0,0 +1,2 @@
+LICENSE.autogenerated
+notices.autogenerated

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/26c4604c/dist/licensing/MAIN_LICENSE_ASL2
----------------------------------------------------------------------
diff --git a/dist/licensing/MAIN_LICENSE_ASL2 b/dist/licensing/MAIN_LICENSE_ASL2
new file mode 100644
index 0000000..68c771a
--- /dev/null
+++ b/dist/licensing/MAIN_LICENSE_ASL2
@@ -0,0 +1,176 @@
+
+                                 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/brooklyn-dist/blob/26c4604c/dist/licensing/README.md
----------------------------------------------------------------------
diff --git a/dist/licensing/README.md b/dist/licensing/README.md
new file mode 100644
index 0000000..94ae070
--- /dev/null
+++ b/dist/licensing/README.md
@@ -0,0 +1,78 @@
+
+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 \
+        -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
+
+This combines the relevant `source-inclusions.yaml` files to create `extrasFile` files
+for `license-audit-maven-plugin` then runs the `notices` target for the various dists we make.
+If you need to add a new project to those which require custom LICENSE files, see below.
+
+
+# CSV License Report
+
+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 \
+        -DlistDependencyIdOnly=true \
+        -DsuppressExcludedDependencies=true \
+        -DlicensesPreferred=ASL2,ASL,EPL1,BSD-2-Clause,BSD-3-Clause,CDDL1.1,CDDL1,CDDL \
+        -DoverridesFile=licensing/overrides.yaml \
+        -DextrasFiles=`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/brooklyn-dist/blob/26c4604c/dist/licensing/extras-files
----------------------------------------------------------------------
diff --git a/dist/licensing/extras-files b/dist/licensing/extras-files
new file mode 100644
index 0000000..cbba9c5
--- /dev/null
+++ b/dist/licensing/extras-files
@@ -0,0 +1 @@
+../../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/brooklyn-dist/blob/26c4604c/dist/licensing/licenses/binary/ASL2
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/binary/ASL2 b/dist/licensing/licenses/binary/ASL2
new file mode 100644
index 0000000..eccbc6a
--- /dev/null
+++ b/dist/licensing/licenses/binary/ASL2
@@ -0,0 +1,177 @@
+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/brooklyn-dist/blob/26c4604c/dist/licensing/licenses/binary/BSD-2-Clause
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/binary/BSD-2-Clause b/dist/licensing/licenses/binary/BSD-2-Clause
new file mode 100644
index 0000000..832c10e
--- /dev/null
+++ b/dist/licensing/licenses/binary/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/brooklyn-dist/blob/26c4604c/dist/licensing/licenses/binary/BSD-3-Clause
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/binary/BSD-3-Clause b/dist/licensing/licenses/binary/BSD-3-Clause
new file mode 100644
index 0000000..be2692c
--- /dev/null
+++ b/dist/licensing/licenses/binary/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/brooklyn-dist/blob/26c4604c/dist/licensing/licenses/binary/CDDL1
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/binary/CDDL1 b/dist/licensing/licenses/binary/CDDL1
new file mode 100644
index 0000000..611d916
--- /dev/null
+++ b/dist/licensing/licenses/binary/CDDL1
@@ -0,0 +1,381 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+  1. Definitions.
+  
+  1.1. "Contributor" means each individual or entity that
+  creates or contributes to the creation of Modifications.
+  
+  1.2. "Contributor Version" means the combination of the
+  Original Software, prior Modifications used by a
+  Contributor (if any), and the Modifications made by that
+  particular Contributor.
+  
+  1.3. "Covered Software" means (a) the Original Software, or
+  (b) Modifications, or (c) the combination of files
+  containing Original Software with files containing
+  Modifications, in each case including portions thereof.
+  
+  1.4. "Executable" means the Covered Software in any form
+  other than Source Code. 
+  
+  1.5. "Initial Developer" means the individual or entity
+  that first makes Original Software available under this
+  License. 
+  
+  1.6. "Larger Work" means a work which combines Covered
+  Software or portions thereof with code not governed by the
+  terms of this License.
+  
+  1.7. "License" means this document.
+  
+  1.8. "Licensable" means having the right to grant, to the
+  maximum extent possible, whether at the time of the initial
+  grant or subsequently acquired, any and all of the rights
+  conveyed herein.
+  
+  1.9. "Modifications" means the Source Code and Executable
+  form of any of the following: 
+  
+  A. Any file that results from an addition to,
+  deletion from or modification of the contents of a
+  file containing Original Software or previous
+  Modifications; 
+  
+  B. Any new file that contains any part of the
+  Original Software or previous Modification; or 
+  
+  C. Any new file that is contributed or otherwise made
+  available under the terms of this License.
+  
+  1.10. "Original Software" means the Source Code and
+  Executable form of computer software code that is
+  originally released under this License. 
+  
+  1.11. "Patent Claims" means any patent claim(s), now owned
+  or hereafter acquired, including without limitation,
+  method, process, and apparatus claims, in any patent
+  Licensable by grantor. 
+  
+  1.12. "Source Code" means (a) the common form of computer
+  software code in which modifications are made and (b)
+  associated documentation included in or with such code.
+  
+  1.13. "You" (or "Your") means an individual or a legal
+  entity exercising rights under, and complying with all of
+  the terms of, this License. For legal entities, "You"
+  includes any entity which controls, is controlled by, or is
+  under common control with You. For purposes of this
+  definition, "control" means (a) the power, direct or
+  indirect, to cause the direction or management of such
+  entity, whether by contract or otherwise, or (b) ownership
+  of more than fifty percent (50%) of the outstanding shares
+  or beneficial ownership of such entity.
+  
+  2. License Grants. 
+  
+  2.1. The Initial Developer Grant.
+  
+  Conditioned upon Your compliance with Section 3.1 below and
+  subject to third party intellectual property claims, the
+  Initial Developer hereby grants You a world-wide,
+  royalty-free, non-exclusive license: 
+  
+  (a) under intellectual property rights (other than
+  patent or trademark) Licensable by Initial Developer,
+  to use, reproduce, modify, display, perform,
+  sublicense and distribute the Original Software (or
+  portions thereof), with or without Modifications,
+  and/or as part of a Larger Work; and 
+  
+  (b) under Patent Claims infringed by the making,
+  using or selling of Original Software, to make, have
+  made, use, practice, sell, and offer for sale, and/or
+  otherwise dispose of the Original Software (or
+  portions thereof). 
+  
+  (c) The licenses granted in Sections 2.1(a) and (b)
+  are effective on the date Initial Developer first
+  distributes or otherwise makes the Original Software
+  available to a third party under the terms of this
+  License. 
+  
+  (d) Notwithstanding Section 2.1(b) above, no patent
+  license is granted: (1) for code that You delete from
+  the Original Software, or (2) for infringements
+  caused by: (i) the modification of the Original
+  Software, or (ii) the combination of the Original
+  Software with other software or devices. 
+  
+  2.2. Contributor Grant.
+  
+  Conditioned upon Your compliance with Section 3.1 below and
+  subject to third party intellectual property claims, each
+  Contributor hereby grants You a world-wide, royalty-free,
+  non-exclusive license:
+  
+  (a) under intellectual property rights (other than
+  patent or trademark) Licensable by Contributor to
+  use, reproduce, modify, display, perform, sublicense
+  and distribute the Modifications created by such
+  Contributor (or portions thereof), either on an
+  unmodified basis, with other Modifications, as
+  Covered Software and/or as part of a Larger Work; and
+  
+  (b) under Patent Claims infringed by the making,
+  using, or selling of Modifications made by that
+  Contributor either alone and/or in combination with
+  its Contributor Version (or portions of such
+  combination), to make, use, sell, offer for sale,
+  have made, and/or otherwise dispose of: (1)
+  Modifications made by that Contributor (or portions
+  thereof); and (2) the combination of Modifications
+  made by that Contributor with its Contributor Version
+  (or portions of such combination). 
+  
+  (c) The licenses granted in Sections 2.2(a) and
+  2.2(b) are effective on the date Contributor first
+  distributes or otherwise makes the Modifications
+  available to a third party. 
+  
+  (d) Notwithstanding Section 2.2(b) above, no patent
+  license is granted: (1) for any code that Contributor
+  has deleted from the Contributor Version; (2) for
+  infringements caused by: (i) third party
+  modifications of Contributor Version, or (ii) the
+  combination of Modifications made by that Contributor
+  with other software (except as part of the
+  Contributor Version) or other devices; or (3) under
+  Patent Claims infringed by Covered Software in the
+  absence of Modifications made by that Contributor. 
+  
+  3. Distribution Obligations.
+  
+  3.1. Availability of Source Code.
+  
+  Any Covered Software that You distribute or otherwise make
+  available in Executable form must also be made available in
+  Source Code form and that Source Code form must be
+  distributed only under the terms of this License. You must
+  include a copy of this License with every copy of the
+  Source Code form of the Covered Software You distribute or
+  otherwise make available. You must inform recipients of any
+  such Covered Software in Executable form as to how they can
+  obtain such Covered Software in Source Code form in a
+  reasonable manner on or through a medium customarily used
+  for software exchange.
+  
+  3.2. Modifications.
+  
+  The Modifications that You create or to which You
+  contribute are governed by the terms of this License. You
+  represent that You believe Your Modifications are Your
+  original creation(s) and/or You have sufficient rights to
+  grant the rights conveyed by this License.
+  
+  3.3. Required Notices.
+  
+  You must include a notice in each of Your Modifications
+  that identifies You as the Contributor of the Modification.
+  You may not remove or alter any copyright, patent or
+  trademark notices contained within the Covered Software, or
+  any notices of licensing or any descriptive text giving
+  attribution to any Contributor or the Initial Developer.
+  
+  3.4. Application of Additional Terms.
+  
+  You may not offer or impose any terms on any Covered
+  Software in Source Code form that alters or restricts the
+  applicable version of this License or the recipients"
+  rights hereunder. You may choose to offer, and to charge a
+  fee for, warranty, support, indemnity or liability
+  obligations to one or more recipients of Covered Software.
+  However, you may do so only on Your own behalf, and not on
+  behalf of the Initial Developer or any Contributor. You
+  must make it absolutely clear that any such warranty,
+  support, indemnity or liability obligation is offered by
+  You alone, and You hereby agree to indemnify the Initial
+  Developer and every Contributor for any liability incurred
+  by the Initial Developer or such Contributor as a result of
+  warranty, support, indemnity or liability terms You offer.
+      
+  3.5. Distribution of Executable Versions.
+  
+  You may distribute the Executable form of the Covered
+  Software under the terms of this License or under the terms
+  of a license of Your choice, which may contain terms
+  different from this License, provided that You are in
+  compliance with the terms of this License and that the
+  license for the Executable form does not attempt to limit
+  or alter the recipient"s rights in the Source Code form
+  from the rights set forth in this License. If You
+  distribute the Covered Software in Executable form under a
+  different license, You must make it absolutely clear that
+  any terms which differ from this License are offered by You
+  alone, not by the Initial Developer or Contributor. You
+  hereby agree to indemnify the Initial Developer and every
+  Contributor for any liability incurred by the Initial
+  Developer or such Contributor as a result of any such terms
+  You offer.
+  
+  3.6. Larger Works.
+  
+  You may create a Larger Work by combining Covered Software
+  with other code not governed by the terms of this License
+  and distribute the Larger Work as a single product. In such
+  a case, You must make sure the requirements of this License
+  are fulfilled for the Covered Software. 
+  
+  4. Versions of the License. 
+  
+  4.1. New Versions.
+  
+  Sun Microsystems, Inc. is the initial license steward and
+  may publish revised and/or new versions of this License
+  from time to time. Each version will be given a
+  distinguishing version number. Except as provided in
+  Section 4.3, no one other than the license steward has the
+  right to modify this License. 
+  
+  4.2. Effect of New Versions.
+  
+  You may always continue to use, distribute or otherwise
+  make the Covered Software available under the terms of the
+  version of the License under which You originally received
+  the Covered Software. If the Initial Developer includes a
+  notice in the Original Software prohibiting it from being
+  distributed or otherwise made available under any
+  subsequent version of the License, You must distribute and
+  make the Covered Software available under the terms of the
+  version of the License under which You originally received
+  the Covered Software. Otherwise, You may also choose to
+  use, distribute or otherwise make the Covered Software
+  available under the terms of any subsequent version of the
+  License published by the license steward. 
+  
+  4.3. Modified Versions.
+  
+  When You are an Initial Developer and You want to create a
+  new license for Your Original Software, You may create and
+  use a modified version of this License if You: (a) rename
+  the license and remove any references to the name of the
+  license steward (except to note that the license differs
+  from this License); and (b) otherwise make it clear that
+  the license contains terms which differ from this License.
+  
+  5. DISCLAIMER OF WARRANTY.
+  
+  COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+  BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+  INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+  SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+  PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+  PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+  COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+  INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+  ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+  WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+  ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+  DISCLAIMER. 
+  
+  6. TERMINATION. 
+  
+  6.1. This License and the rights granted hereunder will
+  terminate automatically if You fail to comply with terms
+  herein and fail to cure such breach within 30 days of
+  becoming aware of the breach. Provisions which, by their
+  nature, must remain in effect beyond the termination of
+  this License shall survive.
+  
+  6.2. If You assert a patent infringement claim (excluding
+  declaratory judgment actions) against Initial Developer or
+  a Contributor (the Initial Developer or Contributor against
+  whom You assert such claim is referred to as "Participant")
+  alleging that the Participant Software (meaning the
+  Contributor Version where the Participant is a Contributor
+  or the Original Software where the Participant is the
+  Initial Developer) directly or indirectly infringes any
+  patent, then any and all rights granted directly or
+  indirectly to You by such Participant, the Initial
+  Developer (if the Initial Developer is not the Participant)
+  and all Contributors under Sections 2.1 and/or 2.2 of this
+  License shall, upon 60 days notice from Participant
+  terminate prospectively and automatically at the expiration
+  of such 60 day notice period, unless if within such 60 day
+  period You withdraw Your claim with respect to the
+  Participant Software against such Participant either
+  unilaterally or pursuant to a written agreement with
+  Participant.
+  
+  6.3. In the event of termination under Sections 6.1 or 6.2
+  above, all end user licenses that have been validly granted
+  by You or any distributor hereunder prior to termination
+  (excluding licenses granted to You by any distributor)
+  shall survive termination.
+  
+  7. LIMITATION OF LIABILITY.
+  
+  UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+  (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+  INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+  COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+  LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+  CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+  LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+  STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+  COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+  INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+  LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+  INJURY RESULTING FROM SUCH PARTY"S NEGLIGENCE TO THE EXTENT
+  APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+  NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+  CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+  APPLY TO YOU.
+  
+  8. U.S. GOVERNMENT END USERS.
+  
+  The Covered Software is a "commercial item," as that term is
+  defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+  computer software" (as that term is defined at 48 C.F.R. "
+  252.227-7014(a)(1)) and "commercial computer software
+  documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+  1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+  through 227.7202-4 (June 1995), all U.S. Government End Users
+  acquire Covered Software with only those rights set forth herein.
+  This U.S. Government Rights clause is in lieu of, and supersedes,
+  any other FAR, DFAR, or other clause or provision that addresses
+  Government rights in computer software under this License.
+  
+  9. MISCELLANEOUS.
+  
+  This License represents the complete agreement concerning subject
+  matter hereof. If any provision of this License is held to be
+  unenforceable, such provision shall be reformed only to the
+  extent necessary to make it enforceable. This License shall be
+  governed by the law of the jurisdiction specified in a notice
+  contained within the Original Software (except to the extent
+  applicable law, if any, provides otherwise), excluding such
+  jurisdiction"s conflict-of-law provisions. Any litigation
+  relating to this License shall be subject to the jurisdiction of
+  the courts located in the jurisdiction and venue specified in a
+  notice contained within the Original Software, with the losing
+  party responsible for costs, including, without limitation, court
+  costs and reasonable attorneys" fees and expenses. The
+  application of the United Nations Convention on Contracts for the
+  International Sale of Goods is expressly excluded. Any law or
+  regulation which provides that the language of a contract shall
+  be construed against the drafter shall not apply to this License.
+  You agree that You alone are responsible for compliance with the
+  United States export administration regulations (and the export
+  control laws and regulation of any other countries) when You use,
+  distribute or otherwise make available any Covered Software.
+  
+  10. RESPONSIBILITY FOR CLAIMS.
+  
+  As between Initial Developer and the Contributors, each party is
+  responsible for claims and damages arising, directly or
+  indirectly, out of its utilization of rights under this License
+  and You agree to work with Initial Developer and Contributors to
+  distribute such responsibility on an equitable basis. Nothing
+  herein is intended or shall be deemed to constitute any admission
+  of liability.
+