[2/2] brooklyn-docs git commit: This closes #27

[aledsage]

This closes #27


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

Branch: refs/heads/master
Commit: 8f63114b4849995e56e307919caf4d00518a155b
Parents: 5676dda 1c2e836
Author: Aled Sage 
Authored: Thu Mar 10 21:09:55 2016 +
Committer: Aled Sage 
Committed: Thu Mar 10 21:09:55 2016 +

--
 guide/dev/env/maven-build.md | 2 ++
 1 file changed, 2 insertions(+)
--

[1/2] brooklyn-docs git commit: Update maven-build.md

[aledsage]

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master 5676dda50 -> 8f63114b4


Update maven-build.md

Add notes about building RPM packages.

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

Branch: refs/heads/master
Commit: 1c2e8360ea82943d4a04daf1aedf8dc731c0668d
Parents: 5676dda
Author: Aleksandr Vasilev 
Authored: Thu Mar 10 08:16:47 2016 -0800
Committer: Aleksandr Vasilev 
Committed: Thu Mar 10 08:16:47 2016 -0800

--
 guide/dev/env/maven-build.md | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/1c2e8360/guide/dev/env/maven-build.md
--
diff --git a/guide/dev/env/maven-build.md b/guide/dev/env/maven-build.md
index 2f01899..1635397 100644
--- a/guide/dev/env/maven-build.md
+++ b/guide/dev/env/maven-build.md
@@ -25,6 +25,8 @@ Key things to note if you're new to Maven:
 
 * Add ``-Dno-go-client`` to skip building the ``brooklyn-client`` project 
(useful if you don't have Go installed).
 
+* You may need to install ``rpm`` package to build RPM packages: ``brew 
install rpm`` for Mac OS, ``apt-get install rpm`` for Ubuntu, ``yum install 
rpm`` for Centos/RHEL.
+
 * Run ``-PIntegration`` to run integration tests, or ``-PLive`` to run live 
tests
   ([tests described here](../code/tests.html))
 

[1/3] brooklyn-docs git commit: Update/improve docs for java entities

[aledsage]

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master f858b171e -> 5676dda50


Update/improve docs for java entities

- In particular, updates the docs to follow the archetype changes
  made in https://github.com/apache/brooklyn-dist/pull/10

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

Branch: refs/heads/master
Commit: 44e812ba782f613f3df28220c82b6831b1ecc19a
Parents: a41e0d7
Author: Aled Sage 
Authored: Mon Mar 7 20:42:00 2016 +
Committer: Aled Sage 
Committed: Mon Mar 7 20:42:00 2016 +

--
 guide/java/archetype.md |  62 +++--
 guide/java/common-usage.md  | 235 ---
 guide/java/defining-and-deploying.md| 226 +++---
 guide/java/entity.md|  26 +-
 guide/java/feeds.md | 203 
 guide/java/gist_generator/GistGenerator.java|  29 +++
 .../java/gist_generator/GistGeneratorImpl.java  |  47 
 .../java/gist_generator/GistGeneratorTest.java  |  20 ++
 .../gist_generator/GistGeneratorYamlTest.java   |  39 +++
 guide/java/gist_generator/gist_create_token.png | Bin 0 -> 390046 bytes
 guide/java/gist_generator/gist_generator.bom|  15 ++
 guide/java/gist_generator/gist_grant_access.png | Bin 0 -> 411974 bytes
 guide/java/index.md |  19 +-
 guide/java/java_app/ExampleWebApp.java  |  30 +++
 guide/java/policies.md  |  10 +-
 ...topology-dependencies-management-policies.md |  69 --
 guide/java/topology-dependencies.md |  49 
 17 files changed, 804 insertions(+), 275 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/44e812ba/guide/java/archetype.md
--
diff --git a/guide/java/archetype.md b/guide/java/archetype.md
index ba3bc0e..3bd3426 100644
--- a/guide/java/archetype.md
+++ b/guide/java/archetype.md
@@ -7,9 +7,13 @@ categories: [use, guide, defining-applications]
 
 ### Maven Archetype
 
-Brooklyn includes a maven archetype, which can be used to create the project 
structure for a new application.
+Brooklyn includes a maven archetype, which can be used to create the project 
structure for 
+developing a new Java entity, and generating the OSGi bundle for it.
 
-This can be done interactively using:
+
+ Generating the Project
+
+The archetype can be used interactively, by running:
 {% highlight bash %}
 $ mvn archetype:generate
 {% endhighlight %}
@@ -33,32 +37,52 @@ $ mvn archetype:generate \
 {% endhighlight %}
 
 This will create a directory with the artifact name (e.g. "autobrick" in the 
example above).
-Note that if run from a directory containing a pom, it will also modify that 
pom to add this as a module!
+Note that if run from a directory containing a pom, it will also modify that 
pom to add this as 
+a module!
+
+The project will contain an example Java entity. You can test this using the 
supplied unit tests,
+and also replace it with your own code.
+
+The `README.md` file within the project gives further guidance.
 
-The project will contain an example app. You can run this, and also replace it 
with your own
-application code.
+
+ Building
 
 To build, run the commands:
 
 {% highlight bash %}
 $ cd autobrick
-$ mvn clean install assembly:assembly
+$ mvn clean install
 {% endhighlight %}
 
-The assembly command will build a complete standalone distribution archive in 
`target/autobrick-0.1.0-SNAPSHOT-dist.tar.gz`,
-suitable for redistribution and containing `./start.sh` in the root.
 
-An unpacked equivalent is placed in `target/autobrick-0.1.0-SNAPSHOT-dist`,
-thus you can run the single-node sample locally with:
+ Adding to the Catalog
 
-{% highlight bash %}
-$ cd target/autobrick-0.1.0-SNAPSHOT-dist/autobrick-0.1.0-SNAPSHOT/
-$ ./start.sh launch --single
-{% endhighlight %}
+The build will produce an OSGi bundle in 
`target/autobrick-0.1.0-SNAPSHOT.jar`, suitable for 
+use in the [Brooklyn catalog]({{ site.path.guide }}/ops/catalog/) (using 
`brooklyn.libraries`).
+
+The project comes with a `sample.bom` file, located in `src/test/resources`. 
You will first have 
+to copy the target jar to a suitable location, and update the URL in 
`sample.bom` to point at that 
+jar.
+
+The command below will use the REST api to add this to the catalog of a 
running Brooklyn instance:
+
+curl -u admin:pa55w0rd http://127.0.0.1:8081/v1/catalog --data-binary 
@src/test/resources/sample.bom
+
+The YAML blueprint below shows an example 

[3/3] brooklyn-docs git commit: This closes #24

[aledsage]

This closes #24


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

Branch: refs/heads/master
Commit: 5676dda502edafa72b10b8dbca01e9ef0656d9f1
Parents: f858b17 15898db
Author: Aled Sage 
Authored: Thu Mar 10 13:24:32 2016 +
Committer: Aled Sage 
Committed: Thu Mar 10 13:24:32 2016 +

--
 guide/java/archetype.md |  62 +++--
 guide/java/common-usage.md  | 237 ---
 guide/java/defining-and-deploying.md| 229 +++---
 guide/java/entity.md|  26 +-
 guide/java/feeds.md | 205 
 guide/java/gist_generator/GistGenerator.java|  29 +++
 .../java/gist_generator/GistGeneratorImpl.java  |  47 
 .../java/gist_generator/GistGeneratorTest.java  |  20 ++
 .../gist_generator/GistGeneratorYamlTest.java   |  39 +++
 guide/java/gist_generator/gist_create_token.png | Bin 0 -> 390046 bytes
 guide/java/gist_generator/gist_generator.bom|  15 ++
 guide/java/gist_generator/gist_grant_access.png | Bin 0 -> 411974 bytes
 guide/java/index.md |  19 +-
 guide/java/java_app/ExampleWebApp.java  |  62 +
 guide/java/policies.md  |  10 +-
 ...topology-dependencies-management-policies.md |  69 --
 guide/java/topology-dependencies.md |  53 +
 17 files changed, 847 insertions(+), 275 deletions(-)
--

[2/3] brooklyn-docs git commit: Java docs: incorporate review comments from #24

[aledsage]

Java docs: incorporate review comments from #24

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

Branch: refs/heads/master
Commit: 15898db2c7f0aa519dd3d0c24cf392e74c28366d
Parents: 44e812b
Author: Aled Sage 
Authored: Thu Mar 10 13:22:51 2016 +
Committer: Aled Sage 
Committed: Thu Mar 10 13:22:51 2016 +

--
 guide/java/common-usage.md |  8 +++---
 guide/java/defining-and-deploying.md   | 19 --
 guide/java/feeds.md|  4 ++-
 guide/java/java_app/ExampleWebApp.java | 40 ++---
 guide/java/topology-dependencies.md| 10 +---
 5 files changed, 62 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/15898db2/guide/java/common-usage.md
--
diff --git a/guide/java/common-usage.md b/guide/java/common-usage.md
index d0f7ec5..ccafd9b 100644
--- a/guide/java/common-usage.md
+++ b/guide/java/common-usage.md
@@ -39,9 +39,11 @@ public static final ConfigKey ROOT_WAR = new 
ConfigKeys.newStringConfigK
 "WAR file to deploy as the ROOT, as URL (supporting file: and 
classpath: prefixes)");
 {% endhighlight %}
 
-One can optional define a `@SetFromFlag("war")`. This defines a short-hand for 
configuring the
-entity. However, it should be used with caution - the long form defined in the 
constructor should
-be meaningful and sufficient. Its use may be deprecated in a future release.
+One can optionally define a `@SetFromFlag("war")`. This defines a short-hand 
for configuring the
+entity. However, it should be used with caution - when using configuration set 
on a parent entity
+(and thus inherited), the `@SetFromFlag` short-form names are not checked. The 
long form defined 
+in the constructor should be meaningful and sufficient. The usage of 
`@SetFromFlag` is therefore
+discouraged.
 
 The type `AttributeSensorAndConfigKey` can be used to indicate that a 
config key should be resolved,
 and its value set as a sensor on the entity (when 
`ConfigToAttributes.apply(entity)` is called).

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/15898db2/guide/java/defining-and-deploying.md
--
diff --git a/guide/java/defining-and-deploying.md 
b/guide/java/defining-and-deploying.md
index fda711b..d754c82 100644
--- a/guide/java/defining-and-deploying.md
+++ b/guide/java/defining-and-deploying.md
@@ -51,14 +51,15 @@ To describe each part of this:
   have extended one of the other sub-types of Entity.
 * The `OAUTH_KEY` is a configuration key - it is configuration that can be set 
on the entity when 
   it is being instantiated.
-* The `@Effector` annotation indicates the the given method is an effector, so 
should be presented
+* The `@Effector` annotation indicates that the given method is an effector, 
so should be presented
   and tracked as such. Execution of the effector is intercepted, to track it 
as a task and show its
   execution in the Activity view.
-* The `@EffectorParam` annotations give metadata about the effector's 
parameters. These will be  
-  presented in users of the entity, e.g. when invoking the effector via the 
web-console.
+* The `@EffectorParam` annotations give metadata about the effector's 
parameters. This metadata,
+  such as the parameter description, is available to those using the client 
CLI, rest API and 
+  web-console.
 
 Note there is an alternative way of defining effectors - adding them to the 
entity dynamically, 
-discussed in the section [Dynamic Effectors](dynamic_effectors.html).
+discussed in the section [Dynamically Added 
Effectors](common-usage.html#dynamically-added-effectors).
 
 Next lets add the implementation. Create a new Java class named 
`GistGeneratorImpl`.
 
@@ -128,9 +129,9 @@ for how to store these credentials more securely.
 
 ## Building the OSGi Bundle
 
-We will build this as an [OSGi 
Bundle](https://www.osgi.org/developer/architecture/) so that it
-can be added to the Apache Brooklyn server at runtime, and so multiple 
versions of the blueprint 
-can be managed.
+Next we will build this example as an [OSGi 
Bundle](https://www.osgi.org/developer/architecture/) 
+so that it can be added to the Apache Brooklyn server at runtime, and so 
multiple versions of the  
+blueprint can be managed.
 
 The `mvn clean install` will automatically do this, creating a jar inside the 
`target/` sub-directory
 of the project. This works by using the 
@@ -156,7 +157,9 @@ available for test purposes.*
 The 

brooklyn-ui git commit: regenerate license

[heneveld]

Repository: brooklyn-ui
Updated Branches:
  refs/heads/master 2668f86af -> c64754d59


regenerate license


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

Branch: refs/heads/master
Commit: c64754d594e6c9672c3fb8a41c19be694f57b746
Parents: 2668f86
Author: Alex Heneveld 
Authored: Thu Mar 10 12:49:16 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:49:16 2016 +

--
 LICENSE| 14 ++
 src/main/license/files/LICENSE | 14 ++
 2 files changed, 28 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/c64754d5/LICENSE
--
diff --git a/LICENSE b/LICENSE
index b294a5d..fc11334 100644
--- a/LICENSE
+++ b/LICENSE
@@ -221,6 +221,20 @@ This project includes the software: codemirror.js
   Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
   CodeMirror (c) Marijn Haverbeke and others
 
+This project includes the software: Font Awesome (code)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/{css,scss,less}/*
+  Version used: 4.5.0
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Font Awesome (fonts)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/fonts/*
+  Version used: 4.5.0
+  Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+  Copyright (c) Dave Gandy (2016)
+
 This project includes the software: handlebars.js
   Available at: https://github.com/wycats/handlebars.js
   Developed by: Yehuda Katz (https://github.com/wycats/)

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/c64754d5/src/main/license/files/LICENSE
--
diff --git a/src/main/license/files/LICENSE b/src/main/license/files/LICENSE
index b294a5d..fc11334 100644
--- a/src/main/license/files/LICENSE
+++ b/src/main/license/files/LICENSE
@@ -221,6 +221,20 @@ This project includes the software: codemirror.js
   Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
   CodeMirror (c) Marijn Haverbeke and others
 
+This project includes the software: Font Awesome (code)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/{css,scss,less}/*
+  Version used: 4.5.0
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Font Awesome (fonts)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/fonts/*
+  Version used: 4.5.0
+  Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+  Copyright (c) Dave Gandy (2016)
+
 This project includes the software: handlebars.js
   Available at: https://github.com/wycats/handlebars.js
   Developed by: Yehuda Katz (https://github.com/wycats/)

[8/9] brooklyn-docs git commit: update link to CLI, following PR comment

[heneveld]

update link to CLI, following PR comment


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

Branch: refs/heads/master
Commit: 31c5969d4035cced26cef988324d7fa086bce5c2
Parents: ad657f3
Author: Alex Heneveld 
Authored: Thu Mar 10 12:44:27 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:44:27 2016 +

--
 guide/start/running.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31c5969d/guide/start/running.md
--
diff --git a/guide/start/running.md b/guide/start/running.md
index 3b80720..380fe96 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -135,7 +135,7 @@ INFO  Started Brooklyn console at http://127.0.0.1:8081/, 
running classpath://br
 By default it can be accessed by opening 
[127.0.0.1:8081](http://127.0.0.1:8081){:target="_blank"} in your web browser. 
 
 The rest of this getting started guide uses the Apache Brooklyn command line 
interface (CLI) tool, `br`. 
-This tool is distributed along with Apache Brooklyn. See details on the 
[Client CLI Reference](../../ops/cli/) page. 
+This tool is distributed along with Apache Brooklyn. See details on the 
[Client CLI Reference](../ops/cli/) page. 
 
 
 ## Next

[07/13] brooklyn-dist git commit: This closes #14

[heneveld]

This closes #14


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

Branch: refs/heads/master
Commit: d534b9563ad0d0e5052841c47835fb53a4de0eec
Parents: 8820548 98389cd
Author: Alex Heneveld 
Authored: Thu Mar 10 09:37:33 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 09:37:33 2016 +

--
 LICENSE  | 203 ++
 all/pom.xml  |   1 +
 dist/licensing/extras-files  |   2 +-
 dist/licensing/licenses/brooklyn-client/ASL2 | 177 +++
 dist/licensing/licenses/rest-server/ASL2 | 177 +++
 dist/licensing/licenses/source/ASL2  | 177 +++
 dist/licensing/make-all-licenses.sh  |   2 +-
 dist/licensing/overrides.yaml|  18 ++
 dist/licensing/projects-with-custom-licenses |   2 +
 dist/pom.xml |  41 +
 dist/src/main/config/build-distribution.xml  |   4 +
 dist/src/main/license/files/LICENSE  | 132 +-
 12 files changed, 893 insertions(+), 43 deletions(-)
--

[12/13] brooklyn-dist git commit: This closes #15

[heneveld]

This closes #15


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

Branch: refs/heads/master
Commit: 7b1d8a00bf3364094a4b5f70c54c5b0c53bcfa94
Parents: 8820548 8ff36d3
Author: Alex Heneveld 
Authored: Thu Mar 10 12:48:10 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:48:10 2016 +

--
 LICENSE | 203 +++
 all/pom.xml |   1 +
 dist/licensing/extras-files |   2 +-
 dist/licensing/licenses/brooklyn-client/ASL2| 177 
 .../licenses/brooklyn-client/BSD-3-Clause   |  27 +++
 dist/licensing/licenses/brooklyn-client/MIT |  20 ++
 dist/licensing/licenses/rest-server/ASL2| 177 
 dist/licensing/licenses/source/ASL2 | 177 
 dist/licensing/make-all-licenses.sh |  11 +-
 dist/licensing/overrides.yaml   |  18 ++
 dist/licensing/projects-with-custom-licenses|   9 +
 dist/pom.xml|  40 
 dist/src/main/config/build-distribution.xml |   5 +
 dist/src/main/license/files/LICENSE | 132 
 14 files changed, 953 insertions(+), 46 deletions(-)
--

[5/5] brooklyn git commit: regenerate license

[heneveld]

regenerate license


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

Branch: refs/heads/master
Commit: 1fa9a8b5ea3baa1f614dfb4f65712f3c4588acce
Parents: d828ea3
Author: Alex Heneveld 
Authored: Thu Mar 10 12:45:55 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:45:55 2016 +

--
 LICENSE | 203 +++
 1 file changed, 203 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/1fa9a8b5/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 739a8a4..13e9bcc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -221,6 +221,30 @@ This project includes the software: codemirror.js
   Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
   CodeMirror (c) Marijn Haverbeke and others
 
+This project includes the software: Font Awesome (code)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/{css,scss,less}/*
+  Version used: 4.5.0
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Font Awesome (fonts)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/fonts/*
+  Version used: 4.5.0
+  Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: github.com/codegangsta/cli
+  Available at: https://github.com/codegangsta/cli
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (C) 2013 Jeremy Saenz
+
+This project includes the software: golang.org/x/crypto/ssh
+  Available at: https://godoc.org/golang.org/x/crypto/ssh
+  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
+  Copyright (c) 2009 The Go Authors. All rights reserved.
+
 This project includes the software: handlebars.js
   Available at: https://github.com/wycats/handlebars.js
   Developed by: Yehuda Katz (https://github.com/wycats/)
@@ -382,11 +406,190 @@ This project includes the software: ZeroClipboard
 
 Contents:
 
+  Apache License, Version 2.0
   The BSD 2-Clause License
   The BSD 3-Clause License ("New BSD")
   The MIT License ("MIT")
 
 
+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 

[09/13] brooklyn-dist git commit: switch go-client profile to be activated based on property

[heneveld]

switch go-client profile to be activated based on property


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

Branch: refs/heads/master
Commit: b213524c3f94bea472da698990bc55a84be37d7c
Parents: 3d801c6
Author: Alex Heneveld 
Authored: Thu Mar 10 10:38:01 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 10:38:01 2016 +

--
 dist/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/b213524c/dist/pom.xml
--
diff --git a/dist/pom.xml b/dist/pom.xml
index c7610f6..bd07214 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -161,7 +161,9 @@
 
 go-client
 
-true
+
+!no-go-client
+
 
 
 

[5/7] brooklyn-client git commit: simplify the README bundled with the binaries

[heneveld]

simplify the README bundled with the binaries


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

Branch: refs/heads/master
Commit: 553ad8b301e9213713d255c43c90558374c41f2d
Parents: 284627a
Author: Alex Heneveld 
Authored: Thu Mar 10 10:55:56 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 10:55:56 2016 +

--
 README | 118 +---
 1 file changed, 16 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/553ad8b3/README
--
diff --git a/README b/README
index 6041f91..da1f0a0 100644
--- a/README
+++ b/README
@@ -1,55 +1,34 @@
 
- Apache Brooklyn Command Line Client
+Apache Brooklyn Command Line Client
+===
 
 What is it?
 ---
 
-A command line client, "br", for Apache Brooklyn (https://brooklyn.apache.org).
+A command line client, "br", for **[Apache 
Brooklyn](https://brooklyn.apache.org)**.
 
 With this tool you can deploy and manage applications on a running Brooklyn 
server.
 
-Documentation
--
+This file gives a brief summary of how to use the Brooklyn CLI client tool.
+More complete documentation is available **[on the Apache Brooklyn 
website](https://brooklyn.apache.org/v/latest/ops/cli/cli-ref-guide.html).
 
-There follows below a brief summary of how to use the tool, however, the full 
documentation for the tool is included
-along with the [Brooklyn 
Documentation](https://brooklyn.apache.org/v/latest/ops/cli/cli-ref-guide.html).
 
-Licensing
--
-
-Please see the file called LICENSE.
-
-Getting the right binary
-
-
-The release for the tool includes binaries built for a number of platforms and 
architectures. These binaries are
-provided in subdirectories alongside this README, named for the platform and 
architecture:
+License
+---
 
-darwin.386/br
-darwin.amd64/br
-freebsd.386/br
-freebsd.amd64/br
-linux.386/br
-linux.amd64/br
-netbsd.386/br
-netbsd.amd64/br
-openbsd.386/br
-openbsd.amd64/br
-windows.386/br
-windows.amd64/br
+Please see the file [LICENSE](LICENSE).
 
-To use the tool, add the appropriate subdirectory to your PATH, for example, 
when br is obtained by extracting the
-main Apache Brooklyn release into your home directory under "apache-brooklyn", 
then the command would be like
 
-$ PATH=$PATH:$HOME/apache-brooklyn/bin/brooklyn-client-cli-0.9.0/linux.amd64
+Getting Started
+---
 
+Find the binary which is right for your platform. 
+You'll typically find it in a sub-directory here.
+(Note that "Darwin" is a technical name for "Mac OS X".)
 
-Running

+Add it to your path or alias it with `br`.
 
-Ensure your path contains $GOPATH/bin.
-
-First, log in to your Brooklyn instance with:
+Then log in to your Brooklyn instance with:
 
 $ br login URL [USER PASSWORD]
 
@@ -57,72 +36,7 @@ See the help command for info on all commands:
 
 $ br help
 
-And for help on individual commands:
+For help on individual commands:
 
 $ br help COMMAND
 
-
-Scopes
---
-
-Many commands require a "scope" expression to indicate the target on which 
they operate. The scope expressions are
-as follows (values in brackets are aliases for the scope):
-
-- application APP-ID   (app, a)  
- Selects an application, e.g. "br app myapp"
-
-- entity  ENT-ID   (ent, e)
- Selects an entity within an application scope, e.g. "br app myapp ent 
myserver"
-
-- effectorEFF-ID   (eff, f)
- Selects an effector of an entity or application, e.g. "br a myapp e myserver 
eff xyz"
-
-- config  CONF-KEY (conf, con, c)
- Selects a configuration key of an entity e.g. "br a myapp e myserver config 
jmx.agent.mode"
-
-- activityACT-ID   (act, v)
- Selects an activity of an entity e.g. "br a myapp e myserver act iHG7sq1"
-
-
-Commands
-
-
-Commands whose description begins with a "*" character are particularly 
experimental and likely to change in upcoming
-releases.  If not otherwise specified, "SCOPE" below means application or 
entity scope.  If an entity scope is not
-specified, the application entity is used as a default.
-
-- access  Show access control
-- activityShow the activity for an application / entity
-- add-catalog * Add a new catalog item from the supplied YAML
-- add-children* Add a child or children to this entity from the supplied 
YAML
-- application Show the status and location of running applications
-- 

[03/13] brooklyn-dist git commit: Add brooklyn-client-cli as a dependency.

[heneveld]

Add brooklyn-client-cli as a dependency.

This will mean that the build includes the archive for the client CLI
in lib/brooklyn, e.g.

lib/brooklyn/org.apache.brooklyn-brooklyn-client-cli-0.9.0-SNAPSHOT-bin.zip


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

Branch: refs/heads/master
Commit: 5bc7080a42536d2ce6a109729aaacfe2952796dc
Parents: 8820548
Author: Geoff Macartney 
Authored: Fri Feb 19 16:22:10 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:21:13 2016 +

--
 all/pom.xml | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5bc7080a/all/pom.xml
--
diff --git a/all/pom.xml b/all/pom.xml
index 9564880..4884bcf 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -112,6 +112,14 @@
 ${project.version}
 
 
+
+org.apache.brooklyn
+brooklyn-client-cli
+bin
+zip
+${project.version}
+
+
 
 
 ${jclouds.groupId}

[1/9] brooklyn-docs git commit: Documentation updates to instruct how to find the br client.

[heneveld]

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master a9ca11309 -> f858b171e


Documentation updates to instruct how to find the br client.


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

Branch: refs/heads/master
Commit: d015cda061bee0aab3a66dba36702cd136e7b3c8
Parents: ffbdfa5
Author: Geoff Macartney 
Authored: Fri Feb 26 16:05:45 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:20:15 2016 +

--
 guide/ops/cli/cli-ref-guide.md   |  6 --
 guide/ops/cli/cli-usage-guide.md |  2 +-
 guide/ops/cli/index.md   | 22 --
 guide/start/running.md   |  9 +
 4 files changed, 30 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d015cda0/guide/ops/cli/cli-ref-guide.md
--
diff --git a/guide/ops/cli/cli-ref-guide.md b/guide/ops/cli/cli-ref-guide.md
index 9a7ebfd..772aa5e 100644
--- a/guide/ops/cli/cli-ref-guide.md
+++ b/guide/ops/cli/cli-ref-guide.md
@@ -110,7 +110,8 @@ policy   pol
 ### Login
 
 - `br login  [username [password]]`  
-  Login to Brooklyn.  The CLI will prompt for a password if it is not 
provided.  If the Brooklyn server is running on localhost with no security 
enabled, the username and password may be omitted.  
+  Login to Brooklyn.  The CLI will prompt for a password if it is not 
provided.  If the Brooklyn server is running on 
+  localhost with no security enabled, the username and password may be 
omitted.  
   On successful login, the version of the connected Brooklyn server is shown.
 
 - `br version`
@@ -150,7 +151,8 @@ policy   pol
 
 - `br  delete`  
   Delete an application from Brooklyn.  
-  **NOTE:** Use this command with care.  Even if the application / entities 
are still running, Brooklyn will drop all knowledge of them and they will be 
left running in an 'orphaned' state.
+  **NOTE:** Use this command with care.  Even if the application / entities 
are still running, Brooklyn will drop all 
+  knowledge of them and they will be left running in an 'orphaned' state.
 
 ### Entities
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d015cda0/guide/ops/cli/cli-usage-guide.md
--
diff --git a/guide/ops/cli/cli-usage-guide.md b/guide/ops/cli/cli-usage-guide.md
index 593bb6b..16590cf 100644
--- a/guide/ops/cli/cli-usage-guide.md
+++ b/guide/ops/cli/cli-usage-guide.md
@@ -212,7 +212,7 @@ parameter to the `sensor` command:
 
 {% highlight text %}
 $ br app WebCluster entity CZ8QUVgX sensor service.state.expected
-"running @ 1449314377781 / Sat Dec 05 11:19:37 GMT 2015"
+running @ 1449314377781 / Sat Dec 05 11:19:37 GMT 2015
 {% endhighlight %}
 
 ## Effectors

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d015cda0/guide/ops/cli/index.md
--
diff --git a/guide/ops/cli/index.md b/guide/ops/cli/index.md
index d01cc47..d6e3eda 100644
--- a/guide/ops/cli/index.md
+++ b/guide/ops/cli/index.md
@@ -6,7 +6,25 @@ children:
 - cli-usage-guide.md
 ---
 
-{% include list-children.html %}
 
-**NOTE:** These documents are for using the Brooklyn Client CLI to access a 
running Brooklyn Server.  For 
+**NOTE:** These documents are for using the Brooklyn Client CLI tool to access 
a running Brooklyn Server.  For
 information on starting on a Brooklyn Server, refer to [Server CLI 
Reference](../server-cli-reference.html).
+
+## Obtaining the CLI tool
+
+The CLI tool, `br`,  is included in the Apache Brooklyn distribution, in 
bin/brooklyn-client-cli-0.9.0-SNAPSHOT.
+The tool is an executable binary (written in Go), and is distributed in a 
number of builds for a variety of platforms
+and architectures, each build in its own subdirectory:
+
+darwin.386freebsd.386linux.386netbsd.386 openbsd.386
windows.386
+darwin.amd64  freebsd.amd64  linux.amd64  netbsd.amd64   openbsd.amd64  
windows.amd64
+
+You can add the appropriate directory to your path, alias the command, or copy 
it somewhere on your path, whatever is
+convenient. For example:
+
+
PATH=$PATH:$HOME/apache-brooklyn/bin/brooklyn-client-cli-0.9.0-SNAPSHOT/linux/amd64
+
+## Documentation
+
+
+{% include list-children.html %}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d015cda0/guide/start/running.md
--
diff --git 

[05/13] brooklyn-dist git commit: Fix paths in projects-with-custom-licenses

[heneveld]

Fix paths in projects-with-custom-licenses


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

Branch: refs/heads/master
Commit: f7e8eddc24835f197782ecddfbc1c13f21820851
Parents: fb30a9c
Author: Geoff Macartney 
Authored: Wed Feb 24 21:06:42 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:21:13 2016 +

--
 dist/licensing/projects-with-custom-licenses | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/f7e8eddc/dist/licensing/projects-with-custom-licenses
--
diff --git a/dist/licensing/projects-with-custom-licenses 
b/dist/licensing/projects-with-custom-licenses
index 97839fc..834dcf0 100644
--- a/dist/licensing/projects-with-custom-licenses
+++ b/dist/licensing/projects-with-custom-licenses
@@ -1,2 +1,2 @@
-../../brooklyn-ui
-../../brooklyn-server/server-cli
+../../../brooklyn-ui
+../../../brooklyn-server/server-cli

[5/9] brooklyn-docs git commit: Merge remote-tracking branch 'upstream/master'

[heneveld]

Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: dd77e93b6902a0b9fb0f375a8c4ae864890679ed
Parents: 7ec32e4 a9ca113
Author: Alex Heneveld 
Authored: Thu Mar 10 11:49:36 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 11:49:36 2016 +

--
 README.md   |   8 +-
 _build/build-pdf.sh |  29 ++
 _build/build.sh |   6 +-
 _build/buildPDF.sh  |  28 --
 _plugins/page_structure.rb  | 220 ++
 _plugins/site_structure.rb  |  29 ++
 contributing/index.md   |  15 +
 contributing/inline-children.md |  54 +++
 contributing/ordering.md|  48 ++
 contributing/pdf-manual.md  |  58 +++
 contributing/site-structure.md  |  29 ++
 guide/ops/locations/byon.md |  74 
 guide/ops/locations/clouds.md   | 248 +++
 guide/ops/locations/index.md| 439 +--
 .../inheritance-and-named-locations.md  |  80 
 guide/ops/locations/localhost.md|  33 ++
 guide/ops/locations/more-clouds.md  |   8 +-
 guide/ops/locations/more-locations.md   |  55 ---
 guide/ops/locations/special-locations.md|  54 +++
 guide/ops/locations/ssh-keys.md |  13 +-
 guide/ops/locations/vpc-issues.md   |  32 --
 guide/start/policies.md |  95 +++-
 style/css/printable.css |   9 +
 style/css/singlePage.css|  12 +
 24 files changed, 1099 insertions(+), 577 deletions(-)
--

[2/5] brooklyn git commit: This closes #5

[heneveld]

This closes #5


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

Branch: refs/heads/master
Commit: 9537f2310ea59bb31b6f112bb56f3cb548e2cd13
Parents: 2ad8bfe c102bbc
Author: Alex Heneveld 
Authored: Thu Mar 10 10:20:45 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 10:20:45 2016 +

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--

brooklyn-server git commit: regenerate license

[heneveld]

Repository: brooklyn-server
Updated Branches:
  refs/heads/master c837f4315 -> f20bf0e77


regenerate license


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

Branch: refs/heads/master
Commit: f20bf0e77dcb2c3662897828a6ba01d2ae71b1ef
Parents: c837f43
Author: Alex Heneveld 
Authored: Thu Mar 10 12:49:16 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:49:16 2016 +

--
 LICENSE | 203 +++
 1 file changed, 203 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f20bf0e7/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 739a8a4..13e9bcc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -221,6 +221,30 @@ This project includes the software: codemirror.js
   Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
   CodeMirror (c) Marijn Haverbeke and others
 
+This project includes the software: Font Awesome (code)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/{css,scss,less}/*
+  Version used: 4.5.0
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Font Awesome (fonts)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/fonts/*
+  Version used: 4.5.0
+  Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: github.com/codegangsta/cli
+  Available at: https://github.com/codegangsta/cli
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (C) 2013 Jeremy Saenz
+
+This project includes the software: golang.org/x/crypto/ssh
+  Available at: https://godoc.org/golang.org/x/crypto/ssh
+  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
+  Copyright (c) 2009 The Go Authors. All rights reserved.
+
 This project includes the software: handlebars.js
   Available at: https://github.com/wycats/handlebars.js
   Developed by: Yehuda Katz (https://github.com/wycats/)
@@ -382,11 +406,190 @@ This project includes the software: ZeroClipboard
 
 Contents:
 
+  Apache License, Version 2.0
   The BSD 2-Clause License
   The BSD 3-Clause License ("New BSD")
   The MIT License ("MIT")
 
 
+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 

[6/9] brooklyn-docs git commit: update for Go dependency and skipping Go

[heneveld]

update for Go dependency and skipping Go


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

Branch: refs/heads/master
Commit: ad9dc2b48eac029f7dad2e0b94c1842b7a8f98f9
Parents: dd77e93
Author: Alex Heneveld 
Authored: Thu Mar 10 12:00:44 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:00:44 2016 +

--
 guide/dev/env/ide/index.md   | 4 ++--
 guide/dev/env/maven-build.md | 6 --
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ad9dc2b4/guide/dev/env/ide/index.md
--
diff --git a/guide/dev/env/ide/index.md b/guide/dev/env/ide/index.md
index 60ad11d..94bbfba 100644
--- a/guide/dev/env/ide/index.md
+++ b/guide/dev/env/ide/index.md
@@ -12,7 +12,7 @@ But with a bit of a dance the IDE can still be your friend,
 making it much easier to run tests and debug.
 
 As a general tip, don't always trust the IDE to build correctly; if you hit a 
snag,
-do a command-line ``mvn clean install`` (optionally with ``-DskipTests``)
+do a command-line ``mvn clean install`` (optionally with ``-DskipTests`` 
and/or ``-Dno-go-client``)
 then refresh the project.
 
 See instructions below for specific IDEs.
@@ -41,7 +41,7 @@ If you encounter issues, the following hints may be helpful:
   You can manually mark as permanently ignored certain errors;
   this updates the pom.xml (and should be current).
 
-* A quick command-line build (`mvn clean install -DskipTests`) followed by a 
workspace refresh
+* A quick command-line build (`mvn clean install -DskipTests -Dno-go-client`) 
followed by a workspace refresh
   can be useful to re-populate files which need to be copied to `target/`
 
 * m2e likes to put `excluding="**"` on `resources` directories; if you're 
seeing funny missing files

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ad9dc2b4/guide/dev/env/maven-build.md
--
diff --git a/guide/dev/env/maven-build.md b/guide/dev/env/maven-build.md
index 8489658..2f01899 100644
--- a/guide/dev/env/maven-build.md
+++ b/guide/dev/env/maven-build.md
@@ -6,7 +6,7 @@ toc: /guide/toc.json
 
 ## The Basics
 
-To build the code, you need Maven (v3) installed and Java (v1.7+).
+To build the code, you need Maven (v3.1+) and Java (v1.7+, 1.8 recommended) 
and Go (v1.6+).
 With that in place, you should be able to build everything with a:
 
 {% highlight bash %}
@@ -23,10 +23,12 @@ Key things to note if you're new to Maven:
 
 * Add ``-DskipTests`` to skip tests. 
 
+* Add ``-Dno-go-client`` to skip building the ``brooklyn-client`` project 
(useful if you don't have Go installed).
+
 * Run ``-PIntegration`` to run integration tests, or ``-PLive`` to run live 
tests
   ([tests described here](../code/tests.html))
 
-* Nearly all the gory details are in the root ``pom.xml``, which is referenced 
by child project poms.
+* Note that many of the gory details are in 
``brooklyn-server/parent/pom.xml``, which is referenced by most other poms.
 
 * You can also open and use the code in your favourite IDE,
   although you may hit a few **[snags](ide/)**

[11/13] brooklyn-dist git commit: remove no longer needed profile

[heneveld]

remove no longer needed profile


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

Branch: refs/heads/master
Commit: 8ff36d34b0475b0c67f362b5da99fafd44dcb606
Parents: c056640
Author: Alex Heneveld 
Authored: Thu Mar 10 12:29:22 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:29:22 2016 +

--
 dist/pom.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8ff36d34/dist/pom.xml
--
diff --git a/dist/pom.xml b/dist/pom.xml
index bd07214..9d1dea5 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -194,9 +194,6 @@
 
 
 
-
-no-go-client
-
-
 
+
 

[3/7] brooklyn-client git commit: project now excluded in maven build by a property, in the uber pom rather than here

[heneveld]

project now excluded in maven build by a property, in the uber pom rather than 
here


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

Branch: refs/heads/master
Commit: e9259bf171401e56adb5585efd3e65310d85a8de
Parents: d9b2079
Author: Alex Heneveld 
Authored: Thu Mar 10 10:42:28 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 10:42:28 2016 +

--
 pom.xml  | 121 ++
 release/build.sh |   4 +-
 2 files changed, 55 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/e9259bf1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index cdf21ad..8bcb9c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,75 +50,60 @@
 all
 
 
-
-
-
-
-no-go-client
-
-
-
-go-client
-
-true
-
-
-
-
-
-maven-antrun-plugin
-1.8
-
-
-process-build-all
-compile
-
-
-
-
-
-
-run
-
-
-
-
-
-
-
-maven-assembly-plugin
-${maven.assembly.plugin.version}
-
-
-
src/main/assembly/bin.xml
-
-
-
-
-make-assembly
-package
-
-single
-
-
-
-
-
-
-org.apache.rat
-apache-rat-plugin
-0.11
+
+
+
+maven-antrun-plugin
+1.8
+
+
+process-build-all
+compile
 
-
-**/br/Godeps/**/*
-
+
+
+
 
-
-
-
-
-
+
+run
+
+
+
+
+
+
+
+maven-assembly-plugin
+${maven.assembly.plugin.version}
+
+
+src/main/assembly/bin.xml
+
+
+
+
+make-assembly
+package
+
+single
+
+
+
+
+
+
+org.apache.rat
+apache-rat-plugin
+0.11
+
+
+**/br/Godeps/**/*
+
+
+
+
+
+
+
 
-
-
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/e9259bf1/release/build.sh
--
diff --git a/release/build.sh b/release/build.sh
index 7b3d62a..b82dfbd 100755
--- a/release/build.sh
+++ b/release/build.sh
@@ -141,7 +141,7 @@ if ! command -v $GOBIN >/dev/null 2>&1 ; then
 ERROR: Go language binaries not found (running "$GOBIN")
 
 The binaries for go v1.6 must be installed to build the brooklyn-client CLI.
-See golang.org for more information, or run maven with '-Pno-go-client' to 
skip.
+See golang.org for more information, or run maven with '-Dno-go-client' to 
skip.
 
 --MARKER--
   exit 1
@@ -157,7 +157,7 @@ if ! (( "$GO_V" >= 6 )) ; then
 ERROR: 

[1/7] brooklyn-client git commit: Add -Pno-go-client profile to permit skipping of build for users without Go.

[heneveld]

Repository: brooklyn-client
Updated Branches:
  refs/heads/master d64428c52 -> 02b1fc6ad


Add -Pno-go-client profile to permit skipping of build for users without Go.


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

Branch: refs/heads/master
Commit: 6e868db0e9de64c8fe389db38df798d1586b919c
Parents: 0623158
Author: Geoff Macartney 
Authored: Wed Mar 9 20:47:18 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:47:18 2016 +

--
 pom.xml | 121 ++-
 1 file changed, 69 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/6e868db0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ec34675..cdf21ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,58 +50,75 @@
 all
 
 
-
-
-
-maven-antrun-plugin
-1.8
-
-
-process-build-all
-compile
+
+
+
+
+no-go-client
+
+
+
+go-client
+
+true
+
+
+
+
+
+maven-antrun-plugin
+1.8
+
+
+process-build-all
+compile
+
+
+
+
+
+
+run
+
+
+
+
+
+
+
+maven-assembly-plugin
+${maven.assembly.plugin.version}
+
+
+
src/main/assembly/bin.xml
+
+
+
+
+make-assembly
+package
+
+single
+
+
+
+
+
+
+org.apache.rat
+apache-rat-plugin
+0.11
 
-
-
-
+
+**/br/Godeps/**/*
+
 
-
-run
-
-
-
-
-
-
-
-maven-assembly-plugin
-${maven.assembly.plugin.version}
-
-
-src/main/assembly/bin.xml
-
-
-
-make-assembly
-package
-
-single
-
-
-
-
-
-
-org.apache.rat
-apache-rat-plugin
-0.11
-
-
-**/br/Godeps/**/*
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
 

[6/7] brooklyn-client git commit: update how go client cli licenses generated

[heneveld]

update how go client cli licenses generated

use new location of license files, embedded notices like other projects, and 
add text of referenced licenses


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

Branch: refs/heads/master
Commit: 6fc8a1ee098fa5a4cd7d8fe726dcc7354abaf15a
Parents: 553ad8b
Author: Alex Heneveld 
Authored: Thu Mar 10 11:46:09 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 11:55:42 2016 +

--
 LICENSE   | 318 --
 NOTICE|   5 +
 NOTICE-codegangsta|   5 -
 NOTICE-x-crypto-ssh   |   5 -
 README|  42 ---
 release/assembly.xml  |  10 +-
 release/files/README  |  42 +++
 release/license/files/LICENSE | 445 +
 release/license/files/NOTICE-codegangsta  |   5 -
 release/license/files/NOTICE-x-crypto-ssh |   5 -
 10 files changed, 788 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/6fc8a1ee/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 236947c..13abdda 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,19 +1,237 @@
+
+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
+
+
+---
+
+(1) This software license: 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 

[2/7] brooklyn-client git commit: This closes #4

[heneveld]

This closes #4


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

Branch: refs/heads/master
Commit: d9b2079087bedaf755810172664e7455c81924e7
Parents: d64428c 6e868db
Author: Alex Heneveld 
Authored: Thu Mar 10 10:23:02 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 10:23:02 2016 +

--
 pom.xml | 121 ++-
 1 file changed, 69 insertions(+), 52 deletions(-)
--

[4/9] brooklyn-docs git commit: write cli binaries to a directory without the version name, and list fewer platforms

[heneveld]

write cli binaries to a directory without the version name, and list fewer 
platforms


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

Branch: refs/heads/master
Commit: 7ec32e4d26dd4f54ca5f62f2206f7ce830126d98
Parents: 2802128
Author: Alex Heneveld 
Authored: Thu Mar 10 10:11:39 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 10:11:39 2016 +

--
 guide/ops/cli/index.md | 22 --
 1 file changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/7ec32e4d/guide/ops/cli/index.md
--
diff --git a/guide/ops/cli/index.md b/guide/ops/cli/index.md
index d6e3eda..15ea905 100644
--- a/guide/ops/cli/index.md
+++ b/guide/ops/cli/index.md
@@ -12,19 +12,21 @@ information on starting on a Brooklyn Server, refer to 
[Server CLI Reference](..
 
 ## Obtaining the CLI tool
 
-The CLI tool, `br`,  is included in the Apache Brooklyn distribution, in 
bin/brooklyn-client-cli-0.9.0-SNAPSHOT.
-The tool is an executable binary (written in Go), and is distributed in a 
number of builds for a variety of platforms
-and architectures, each build in its own subdirectory:
+The CLI tool, `br`,  is included in the Apache Brooklyn distribution, under 
`bin/brooklyn-client-cli/`.
+The tool is an executable binary available for many platforms, with each build 
in its own subdirectory:
 
-darwin.386freebsd.386linux.386netbsd.386 openbsd.386
windows.386
-darwin.amd64  freebsd.amd64  linux.amd64  netbsd.amd64   openbsd.amd64  
windows.amd64
+* Mac: `darwin.amd64/`
+* Windows 32-bit: `windows.386/`
+* Windows 64-bit: `windows.amd64/`
+* Linux 32-bit: `linux.386/`
+* Linux 64-bit: `linux.amd64/`
 
-You can add the appropriate directory to your path, alias the command, or copy 
it somewhere on your path, whatever is
-convenient. For example:
+The binary is completely self-contained so you can either copy it to your 
`bin/` directory
+or add the appropriate directory above to your path:
 
-
PATH=$PATH:$HOME/apache-brooklyn/bin/brooklyn-client-cli-0.9.0-SNAPSHOT/linux/amd64
+PATH=$PATH:$HOME/apache-brooklyn/bin/brooklyn-client-cli/linux.amd64/
 
-## Documentation
 
+## Documentation
 
-{% include list-children.html %}
\ No newline at end of file
+{% include list-children.html %}

[7/9] brooklyn-docs git commit: This closes #26

[heneveld]

This closes #26


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

Branch: refs/heads/master
Commit: ad657f31588b140c35da633d95c97dd6a3feadbc
Parents: a9ca113 ad9dc2b
Author: Alex Heneveld 
Authored: Thu Mar 10 12:40:22 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:40:22 2016 +

--
 guide/dev/env/ide/index.md   |  4 ++--
 guide/dev/env/maven-build.md |  6 --
 guide/ops/cli/cli-ref-guide.md   |  6 --
 guide/ops/cli/cli-usage-guide.md |  2 +-
 guide/ops/cli/index.md   | 24 ++--
 guide/start/running.md   |  9 +
 6 files changed, 38 insertions(+), 13 deletions(-)
--

[04/13] brooklyn-dist git commit: Start of work to add license files for CLI, NOT WORKING YET.

[heneveld]

Start of work to add license files for CLI, NOT WORKING YET.


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

Branch: refs/heads/master
Commit: 7d55d53318bd97357b57a4132ebc2a5b7e3602ac
Parents: f7e8edd
Author: Geoff Macartney 
Authored: Thu Feb 25 16:20:58 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:21:13 2016 +

--
 dist/licensing/extras-files  |   2 +-
 dist/licensing/licenses/rest-server/ASL2 | 177 ++
 dist/licensing/make-all-licenses.sh  |   2 +-
 dist/licensing/make-one-license.sh   |   2 +-
 dist/licensing/overrides.yaml|  32 
 dist/licensing/projects-with-custom-licenses |   6 +-
 6 files changed, 216 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/7d55d533/dist/licensing/extras-files
--
diff --git a/dist/licensing/extras-files b/dist/licensing/extras-files
index cbba9c5..3aab21e 100644
--- a/dist/licensing/extras-files
+++ b/dist/licensing/extras-files
@@ -1 +1 @@
-../../brooklyn-ui/src/main/license/source-inclusions.yaml:../../brooklyn-server/server-cli/src/main/license/source-inclusions.yaml
+../../brooklyn-ui/src/main/license/source-inclusions.yaml:../../brooklyn-server/server-cli/src/main/license/source-inclusions.yaml:../../brooklyn-server/rest/rest-server/src/main/license/source-inclusions.yaml

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/7d55d533/dist/licensing/licenses/rest-server/ASL2
--
diff --git a/dist/licensing/licenses/rest-server/ASL2 
b/dist/licensing/licenses/rest-server/ASL2
new file mode 100644
index 000..eccbc6a
--- /dev/null
+++ b/dist/licensing/licenses/rest-server/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 

[06/13] brooklyn-dist git commit: Add no-go-client profile to avoid including brooklyn-client artifacts.

[heneveld]

Add no-go-client profile to avoid including brooklyn-client artifacts.


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

Branch: refs/heads/master
Commit: 98389cda4c25099f17b3eb7b9f8b232131996907
Parents: 1bf00c1
Author: Geoff Macartney 
Authored: Wed Mar 9 21:17:10 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 21:17:10 2016 +

--
 dist/pom.xml | 60 +--
 1 file changed, 41 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/98389cda/dist/pom.xml
--
diff --git a/dist/pom.xml b/dist/pom.xml
index a8ab469..6cc4515 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -89,25 +89,6 @@
 
 
 
-
-unpack-client-cli
-prepare-package
-
-unpack
-
-
-
-
-${project.groupId}
-
brooklyn-client-cli
-bin
-zip
-${project.version}
-
${project.build.directory}/brooklyn-client-cli
-
-
-
-
 
 
 
@@ -175,4 +156,45 @@
 
 
 
+
+
+
+go-client
+
+true
+
+
+
+
+maven-dependency-plugin
+
+
+unpack-client-cli
+prepare-package
+
+unpack
+
+
+
+
+
${project.groupId}
+
brooklyn-client-cli
+bin
+zip
+
${project.version}
+
${project.build.directory}/brooklyn-client-cli
+
+
+
+
+
+
+
+
+
+
+no-go-client
+
+
+
 

[08/13] brooklyn-dist git commit: write cli binaries to a directory without the version name

[heneveld]

write cli binaries to a directory without the version name


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

Branch: refs/heads/master
Commit: 3d801c6b2fc474f994d411d97b6074f9dd47a801
Parents: d534b95
Author: Alex Heneveld 
Authored: Thu Mar 10 10:07:39 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 10:07:39 2016 +

--
 dist/pom.xml| 2 +-
 dist/src/main/config/build-distribution.xml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/3d801c6b/dist/pom.xml
--
diff --git a/dist/pom.xml b/dist/pom.xml
index 6cc4515..c7610f6 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -182,7 +182,7 @@
 bin
 zip
 
${project.version}
-
${project.build.directory}/brooklyn-client-cli
+
${project.build.directory}/brooklyn-client-cli-unpacked
 
 
 

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/3d801c6b/dist/src/main/config/build-distribution.xml
--
diff --git a/dist/src/main/config/build-distribution.xml 
b/dist/src/main/config/build-distribution.xml
index 9e3dfd0..af0ff4b 100644
--- a/dist/src/main/config/build-distribution.xml
+++ b/dist/src/main/config/build-distribution.xml
@@ -81,8 +81,9 @@
 
 
 
-
${project.build.directory}/brooklyn-client-cli
-bin
+
+
${project.build.directory}/brooklyn-client-cli-unpacked/brooklyn-client-cli-${project.version}
+bin/brooklyn-client-cli
 
 
 

[02/13] brooklyn-dist git commit: Include brooklyn-client-cli artifacts

[heneveld]

Include brooklyn-client-cli artifacts


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

Branch: refs/heads/master
Commit: fb30a9cbbbdaa7dc27378f27352ba96f58b3f1fa
Parents: 5bc7080
Author: Geoff Macartney 
Authored: Tue Feb 23 14:57:42 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:21:13 2016 +

--
 all/pom.xml |  7 ---
 dist/pom.xml| 19 +++
 dist/src/main/config/build-distribution.xml |  4 
 3 files changed, 23 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fb30a9cb/all/pom.xml
--
diff --git a/all/pom.xml b/all/pom.xml
index 4884bcf..e7e837d 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -112,13 +112,6 @@
 ${project.version}
 
 
-
-org.apache.brooklyn
-brooklyn-client-cli
-bin
-zip
-${project.version}
-
 
 
 

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fb30a9cb/dist/pom.xml
--
diff --git a/dist/pom.xml b/dist/pom.xml
index 0d01390..a8ab469 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -89,6 +89,25 @@
 
 
 
+
+unpack-client-cli
+prepare-package
+
+unpack
+
+
+
+
+${project.groupId}
+
brooklyn-client-cli
+bin
+zip
+${project.version}
+
${project.build.directory}/brooklyn-client-cli
+
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fb30a9cb/dist/src/main/config/build-distribution.xml
--
diff --git a/dist/src/main/config/build-distribution.xml 
b/dist/src/main/config/build-distribution.xml
index f543292..9e3dfd0 100644
--- a/dist/src/main/config/build-distribution.xml
+++ b/dist/src/main/config/build-distribution.xml
@@ -80,6 +80,10 @@
 bin/*
 
 
+
+
${project.build.directory}/brooklyn-client-cli
+bin
+
 
 
 

[3/5] brooklyn git commit: exclude the client (go) project based on whether a property is set

[heneveld]

exclude the client (go) project based on whether a property is set


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

Branch: refs/heads/master
Commit: 0e9da8a768e847a0e819de30b332a977c9bf7611
Parents: 9537f23
Author: Alex Heneveld 
Authored: Thu Mar 10 12:27:51 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:27:51 2016 +

--
 README.md |  2 +-
 pom.xml   | 30 --
 2 files changed, 29 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/0e9da8a7/README.md
--
diff --git a/README.md b/README.md
index 90d13f0..a0ad219 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ get this project and its sub-modules:
 git submodule init
 git submodule update --remote --merge --recursive
 
-And then:
+And then, with jdk 1.8+, maven 3.1+, and go 1.6+ installed (or skip go with 
`-Dno-go-client`):
 
 mvn clean install
 

http://git-wip-us.apache.org/repos/asf/brooklyn/blob/0e9da8a7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b782dee..d9713e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,8 +76,34 @@
 brooklyn-ui
 brooklyn-server
 brooklyn-library
-brooklyn-client
-brooklyn-dist
 
 
+
+
+
+go-client
+
+
+!no-go-client
+
+
+
+brooklyn-client
+
+
+
+
+dist
+
+
+!no-dist
+
+
+
+brooklyn-dist
+
+
+
+
 

[13/13] brooklyn-dist git commit: regenerate license

[heneveld]

regenerate license


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

Branch: refs/heads/master
Commit: 7177e20709bfa8ffb46681c4e9d242cb29fe0dec
Parents: 7b1d8a0
Author: Alex Heneveld 
Authored: Thu Mar 10 12:52:05 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:52:05 2016 +

--
 dist/src/main/license/files/LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/7177e207/dist/src/main/license/files/LICENSE
--
diff --git a/dist/src/main/license/files/LICENSE 
b/dist/src/main/license/files/LICENSE
index b08cf44..d83fe1f 100644
--- a/dist/src/main/license/files/LICENSE
+++ b/dist/src/main/license/files/LICENSE
@@ -438,7 +438,7 @@ This project includes the software: io.airlift
 
 This project includes the software: io.cloudsoft.windows
   Available at: http://github.com/cloudsoft/winrm4j
-  Version used: 0.3.1
+  Version used: 0.3.2
   Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 This project includes the software: io.swagger

[4/7] brooklyn-client git commit: move license and assembly files to "release" folder, removing src/

[heneveld]

move license and assembly files to "release" folder, removing src/

having a dir called `src` when the source code mostly lives in a different dir 
felt wrong


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

Branch: refs/heads/master
Commit: 284627aee5ef55a9ebcb0dd0f31b26081330f6d3
Parents: e9259bf
Author: Alex Heneveld 
Authored: Thu Mar 10 10:45:35 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 10:46:44 2016 +

--
 pom.xml|  2 +-
 release/assembly.xml   | 47 +
 release/license/files/NOTICE-codegangsta   |  5 +++
 release/license/files/NOTICE-x-crypto-ssh  |  5 +++
 release/license/source-inclusions.yaml | 24 +
 src/main/assembly/bin.xml  | 47 -
 src/main/license/files/NOTICE-codegangsta  |  5 ---
 src/main/license/files/NOTICE-x-crypto-ssh |  5 ---
 src/main/license/source-inclusions.yaml| 24 -
 9 files changed, 82 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8bcb9c2..f7391c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
 ${maven.assembly.plugin.version}
 
 
-src/main/assembly/bin.xml
+release/assembly.xml
 
 
 

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/release/assembly.xml
--
diff --git a/release/assembly.xml b/release/assembly.xml
new file mode 100644
index 000..84cc771
--- /dev/null
+++ b/release/assembly.xml
@@ -0,0 +1,47 @@
+
+http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
 http://maven.apache.org/xsd/assembly-1.1.3.xsd;>
+bin
+
+zip
+
+
+
+release/license/files
+
+
+
+${project.basedir}
+
+README
+LICENSE*
+NOTICE*
+
+
+
+${project.build.directory}/bin
+
+
+**/br
+
+
+
+

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/release/license/files/NOTICE-codegangsta
--
diff --git a/release/license/files/NOTICE-codegangsta 
b/release/license/files/NOTICE-codegangsta
new file mode 100644
index 000..4a54456
--- /dev/null
+++ b/release/license/files/NOTICE-codegangsta
@@ -0,0 +1,5 @@
+
+This project includes the software: github.com/codegangsta/cli
+  Available at: https://github.com/codegangsta/cli
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (C) 2013 Jeremy Saenz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/release/license/files/NOTICE-x-crypto-ssh
--
diff --git a/release/license/files/NOTICE-x-crypto-ssh 
b/release/license/files/NOTICE-x-crypto-ssh
new file mode 100644
index 000..447198b
--- /dev/null
+++ b/release/license/files/NOTICE-x-crypto-ssh
@@ -0,0 +1,5 @@
+
+This project includes the software: golang.org/x/crypto/ssh
+  Available at: https://godoc.org/golang.org/x/crypto/ssh
+  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
+  Copyright (c) 2009 The Go Authors. All rights reserved.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/284627ae/release/license/source-inclusions.yaml
--
diff --git a/release/license/source-inclusions.yaml 
b/release/license/source-inclusions.yaml
new file mode 100644
index 000..c985c5b
--- /dev/null
+++ b/release/license/source-inclusions.yaml
@@ -0,0 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding 

[1/5] brooklyn git commit: Add brooklyn-client (the client CLI) to the build.

[heneveld]

Repository: brooklyn
Updated Branches:
  refs/heads/master 2ad8bfed9 -> 1fa9a8b5e


Add brooklyn-client (the client CLI) to the build.


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

Branch: refs/heads/master
Commit: c102bbc8f48bee1ab3ba667deed32ae609f87aa9
Parents: 2ad8bfe
Author: Geoff Macartney 
Authored: Wed Feb 24 09:15:18 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:30:18 2016 +

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/c102bbc8/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c09001c..b782dee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@
 brooklyn-ui
 brooklyn-server
 brooklyn-library
+brooklyn-client
 brooklyn-dist
 
 

[2/9] brooklyn-docs git commit: Link update for CLI.

[heneveld]

Link update for CLI.


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

Branch: refs/heads/master
Commit: ffbdfa586ae0c3c0c3739e1ea3c9b3e7782486c8
Parents: bf43bd0
Author: Geoff Macartney 
Authored: Tue Feb 23 15:22:49 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:20:15 2016 +

--
 guide/start/running.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ffbdfa58/guide/start/running.md
--
diff --git a/guide/start/running.md b/guide/start/running.md
index ca1936c..b851079 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -133,7 +133,7 @@ INFO  Started Brooklyn console at http://127.0.0.1:8081/, 
running classpath://br
 
 By default it can be accessed by opening 
[127.0.0.1:8081](http://127.0.0.1:8081){:target="_blank"} in your web browser. 
 
-The rest of this getting started guide uses the Apache Brooklyn command line 
interface (CLI). To use this, download and install the tool as described on the 
[CLI GitHub 
page](https://github.com/brooklyncentral/brooklyn-cli){:target="_blank"}.
+The rest of this getting started guide uses the Apache Brooklyn command line 
interface (CLI). To use this, download and install the tool as described on the 
[CLI GitHub page](https://github.com/apache/brooklyn-client){:target="_blank"}.
 
 The CLI provides the command `br`, it's full usage is described in the user 
manual which can be found [here](../ops/cli/){:target="_blank"}
 

[4/5] brooklyn git commit: This closes #6

[heneveld]

This closes #6


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

Branch: refs/heads/master
Commit: d828ea37c429babdfb7b7adf4380c805da422000
Parents: 2ad8bfe 0e9da8a
Author: Alex Heneveld 
Authored: Thu Mar 10 12:41:41 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:41:41 2016 +

--
 README.md |  2 +-
 pom.xml   | 29 -
 2 files changed, 29 insertions(+), 2 deletions(-)
--

[7/7] brooklyn-client git commit: This closes #5

[heneveld]

This closes #5


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

Branch: refs/heads/master
Commit: 02b1fc6ad0556c301f4ce2736a2c8b481d26e319
Parents: d64428c 6fc8a1e
Author: Alex Heneveld 
Authored: Thu Mar 10 12:39:43 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:39:43 2016 +

--
 LICENSE| 318 +++--
 NOTICE |   5 +
 NOTICE-codegangsta |   5 -
 NOTICE-x-crypto-ssh|   5 -
 README | 128 ---
 pom.xml|  22 +-
 release/assembly.xml   |  43 +++
 release/build.sh   |   4 +-
 release/files/README   |  42 +++
 release/license/files/LICENSE  | 445 
 release/license/source-inclusions.yaml |  24 ++
 src/main/assembly/bin.xml  |  47 ---
 src/main/license/files/NOTICE-codegangsta  |   5 -
 src/main/license/files/NOTICE-x-crypto-ssh |   5 -
 src/main/license/source-inclusions.yaml|  24 --
 15 files changed, 866 insertions(+), 256 deletions(-)
--

[01/13] brooklyn-dist git commit: Updates for license for brooklyn-client, now working.

[heneveld]

Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 88205485d -> 7177e2070


Updates for license for brooklyn-client, now working.


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

Branch: refs/heads/master
Commit: 1bf00c1e9405747ffe5b1543d8e62ca8b3fa6774
Parents: 7d55d53
Author: Geoff Macartney 
Authored: Fri Feb 26 12:17:16 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:21:13 2016 +

--
 LICENSE  | 203 ++
 dist/licensing/extras-files  |   2 +-
 dist/licensing/licenses/brooklyn-client/ASL2 | 177 +++
 dist/licensing/licenses/source/ASL2  | 177 +++
 dist/licensing/make-one-license.sh   |   2 +-
 dist/licensing/overrides.yaml|  14 --
 dist/licensing/projects-with-custom-licenses |   2 +-
 dist/src/main/license/files/LICENSE  | 132 +-
 8 files changed, 651 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/1bf00c1e/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 739a8a4..13e9bcc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -221,6 +221,30 @@ This project includes the software: codemirror.js
   Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
   CodeMirror (c) Marijn Haverbeke and others
 
+This project includes the software: Font Awesome (code)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/{css,scss,less}/*
+  Version used: 4.5.0
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Font Awesome (fonts)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/fonts/*
+  Version used: 4.5.0
+  Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: github.com/codegangsta/cli
+  Available at: https://github.com/codegangsta/cli
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (C) 2013 Jeremy Saenz
+
+This project includes the software: golang.org/x/crypto/ssh
+  Available at: https://godoc.org/golang.org/x/crypto/ssh
+  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
+  Copyright (c) 2009 The Go Authors. All rights reserved.
+
 This project includes the software: handlebars.js
   Available at: https://github.com/wycats/handlebars.js
   Developed by: Yehuda Katz (https://github.com/wycats/)
@@ -382,11 +406,190 @@ This project includes the software: ZeroClipboard
 
 Contents:
 
+  Apache License, Version 2.0
   The BSD 2-Clause License
   The BSD 3-Clause License ("New BSD")
   The MIT License ("MIT")
 
 
+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 

[3/3] brooklyn-library git commit: This closes #14

[heneveld]

This closes #14


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

Branch: refs/heads/master
Commit: 7911d295bbfe7903deec0ea775cd3b8974798e72
Parents: a0e352d 3352bfa
Author: Alex Heneveld 
Authored: Thu Mar 10 12:34:13 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 12:34:13 2016 +

--
 .../entity/database/crate/CrateNode.java|   3 +
 .../database/crate/CrateNodeSshDriver.java  |  16 +--
 .../database/mariadb/MariaDbSshDriver.java  |   2 +-
 .../entity/database/mysql/MySqlSshDriver.java   |  11 +-
 .../entity/database/rubyrep/RubyRepNode.java|   3 +
 .../database/rubyrep/RubyRepSshDriver.java  |  16 +--
 .../messaging/activemq/ActiveMQBroker.java  |   3 +
 .../messaging/activemq/ActiveMQSshDriver.java   |  11 +-
 .../kafka/AbstractfKafkaSshDriver.java  |  12 +--
 .../brooklyn/entity/messaging/kafka/Kafka.java  |   3 +
 .../entity/messaging/qpid/QpidBroker.java   |  43 
 .../entity/messaging/qpid/QpidSshDriver.java|  12 +--
 .../entity/messaging/rabbit/RabbitBroker.java   |  35 +++
 .../messaging/rabbit/RabbitSshDriver.java   |   6 --
 .../brooklyn/entity/messaging/storm/Storm.java  |  21 ++--
 .../entity/messaging/storm/StormSshDriver.java  |   6 --
 .../entity/zookeeper/ZooKeeperNode.java |  33 +++---
 .../entity/zookeeper/ZooKeeperSshDriver.java|   8 +-
 .../entity/monitoring/monit/MonitNode.java  |  26 ++---
 .../entity/monitoring/monit/MonitSshDriver.java |  14 +--
 .../entity/nosql/cassandra/CassandraNode.java   |  43 
 .../nosql/cassandra/CassandraNodeSshDriver.java |  10 --
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |  37 ---
 .../nosql/elasticsearch/ElasticSearchNode.java  |  14 ++-
 .../ElasticSearchNodeSshDriver.java |  13 +--
 .../nosql/hazelcast/HazelcastNodeSshDriver.java |   5 -
 .../nosql/mongodb/AbstractMongoDBSshDriver.java |  25 ++---
 .../brooklyn/entity/nosql/redis/RedisStore.java |  11 +-
 .../entity/nosql/redis/RedisStoreSshDriver.java |   6 --
 .../brooklyn/entity/nosql/riak/RiakNode.java|   3 +
 .../entity/nosql/riak/RiakNodeSshDriver.java|   5 +-
 .../brooklyn/entity/nosql/solr/SolrServer.java  |  17 ++--
 .../entity/nosql/solr/SolrServerSshDriver.java  |   6 --
 .../entity/osgi/karaf/KarafContainer.java   | 100 +--
 .../entity/osgi/karaf/KarafSshDriver.java   |   6 --
 .../entity/proxy/nginx/NginxController.java |  36 ---
 .../entity/proxy/nginx/NginxSshDriver.java  |   6 --
 .../entity/webapp/jboss/JBoss6Server.java   |  22 ++--
 .../entity/webapp/jboss/JBoss6SshDriver.java|   7 --
 .../entity/webapp/jboss/JBoss7Server.java   |  33 +++---
 .../entity/webapp/jboss/JBoss7SshDriver.java|   2 +-
 .../entity/webapp/jetty/Jetty6Server.java   |   9 +-
 .../entity/webapp/jetty/Jetty6SshDriver.java|   7 --
 .../webapp/nodejs/NodeJsWebAppService.java  |  10 +-
 .../webapp/nodejs/NodeJsWebAppSshDriver.java|  22 ++--
 .../entity/webapp/tomcat/Tomcat8Server.java |   9 +-
 .../entity/webapp/tomcat/TomcatServer.java  |  13 ++-
 .../entity/webapp/tomcat/TomcatSshDriver.java   |  11 +-
 48 files changed, 337 insertions(+), 435 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/7911d295/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
--

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/7911d295/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
--

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/7911d295/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java
--
diff --cc 
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java
index 884f082,e703b56..bcf8162
--- 
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java
+++ 
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServer.java
@@@ -18,18 -18,18 +18,21 @@@
   */
  package org.apache.brooklyn.entity.nosql.solr;
  
 +import java.net.URI;
  import java.util.Map;
  
+ import com.google.common.collect.Maps;
+ import com.google.common.reflect.TypeToken;
+ 
  import org.apache.brooklyn.api.catalog.Catalog;
  import 

[1/3] brooklyn-library git commit: Adds prepare method and ARCHIVE_DIRECTORY_NAME_FORMAT and tidies up interfaces

[heneveld]

Repository: brooklyn-library
Updated Branches:
  refs/heads/master a0e352de1 -> 7911d295b


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3352bfab/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java
--
diff --git 
a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java
 
b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java
index e605c08..0d2d522 100644
--- 
a/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java
+++ 
b/software/osgi/src/main/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainer.java
@@ -23,15 +23,17 @@ import java.util.Map;
 
 import org.apache.brooklyn.api.catalog.Catalog;
 import org.apache.brooklyn.api.entity.ImplementedBy;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
 import org.apache.brooklyn.config.ConfigKey;
 import org.apache.brooklyn.core.annotation.Effector;
 import org.apache.brooklyn.core.annotation.EffectorParam;
 import org.apache.brooklyn.core.config.ConfigKeys;
 import org.apache.brooklyn.core.config.MapConfigKey;
 import org.apache.brooklyn.core.effector.MethodEffector;
-import org.apache.brooklyn.core.sensor.BasicAttributeSensor;
+import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey;
 import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey;
 import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey;
+import org.apache.brooklyn.core.sensor.Sensors;
 import org.apache.brooklyn.entity.java.UsesJava;
 import org.apache.brooklyn.entity.java.UsesJmx;
 import org.apache.brooklyn.entity.software.base.SoftwareProcess;
@@ -43,95 +45,89 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag;
 @Catalog(name="Karaf", description="Apache Karaf is a small OSGi based runtime 
which provides a lightweight container onto which various components and 
applications can be deployed.", iconUrl="classpath:///karaf-logo.png")
 @ImplementedBy(KarafContainerImpl.class)
 public interface KarafContainer extends SoftwareProcess, UsesJava, UsesJmx {
-
+
 // TODO Better way of setting/overriding defaults for config keys that are 
defined in super class SoftwareProcess
 
-public static final String WRAP_SCHEME = "wrap";
-public static final String FILE_SCHEME = "file";
-public static final String MVN_SCHEME = "mvn";
-public static final String HTTP_SCHEME = "http";
+String WRAP_SCHEME = "wrap";
+String FILE_SCHEME = "file";
+String MVN_SCHEME = "mvn";
+String HTTP_SCHEME = "http";
 
-public static final MethodEffector>> LIST_BUNDLES = 
new MethodEffector(KarafContainer.class, "listBundles");
-public static final MethodEffector INSTALL_BUNDLE = new 
MethodEffector(KarafContainer.class, "installBundle");
-public static final MethodEffector UNINSTALL_BUNDLE = new 
MethodEffector(KarafContainer.class, "uninstallBundle");
-public static final MethodEffector INSTALL_FEATURE = new 
MethodEffector(KarafContainer.class, "installFeature");
-public static final MethodEffector UPDATE_SERVICE_PROPERTIES = new 
MethodEffector(KarafContainer.class, "updateServiceProperties");
+MethodEffector>> LIST_BUNDLES = new 
MethodEffector(KarafContainer.class, "listBundles");
+MethodEffector INSTALL_BUNDLE = new 
MethodEffector(KarafContainer.class, "installBundle");
+MethodEffector UNINSTALL_BUNDLE = new 
MethodEffector(KarafContainer.class, "uninstallBundle");
+MethodEffector INSTALL_FEATURE = new 
MethodEffector(KarafContainer.class, "installFeature");
+MethodEffector UPDATE_SERVICE_PROPERTIES = new 
MethodEffector(KarafContainer.class, "updateServiceProperties");
 
 @SetFromFlag("version")
-public static final ConfigKey SUGGESTED_VERSION = 
ConfigKeys.newConfigKeyWithDefault(
+ConfigKey SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(
 SoftwareProcess.SUGGESTED_VERSION, "2.3.0");
 
+@SetFromFlag("archiveNameFormat")
+ConfigKey ARCHIVE_DIRECTORY_NAME_FORMAT = 
ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.ARCHIVE_DIRECTORY_NAME_FORMAT,
 "apache-karaf-%s");
+
 @SetFromFlag("downloadUrl")
-public static final BasicAttributeSensorAndConfigKey DOWNLOAD_URL 
= new BasicAttributeSensorAndConfigKey(
-SoftwareProcess.DOWNLOAD_URL, 
"http://apache.mirror.anlx.net/karaf/${version}/apache-karaf-${version}.tar.gz;);
+AttributeSensorAndConfigKey DOWNLOAD_URL = 
ConfigKeys.newSensorAndConfigKeyWithDefault(SoftwareProcess.DOWNLOAD_URL,
+
"http://apache.mirror.anlx.net/karaf/${version}/apache-karaf-${version}.tar.gz;);
 
 @SetFromFlag("karafName")
-public static final BasicAttributeSensorAndConfigKey KARAF_NAME = 
new BasicAttributeSensorAndConfigKey(
-String.class, "karaf.name", "Karaf instance name", "root");
+

[2/3] brooklyn-library git commit: Adds prepare method and ARCHIVE_DIRECTORY_NAME_FORMAT and tidies up interfaces

[heneveld]

Adds prepare method and ARCHIVE_DIRECTORY_NAME_FORMAT and tidies up interfaces


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

Branch: refs/heads/master
Commit: 3352bfab0787e4ec4f6fcb27a2f4f4cc124df768
Parents: cbb58b9
Author: Andrew Donald Kennedy 
Authored: Thu Mar 3 16:35:17 2016 +
Committer: Andrew Donald Kennedy 
Committed: Tue Mar 8 10:37:30 2016 -0500

--
 .../entity/database/crate/CrateNode.java|   3 +
 .../database/crate/CrateNodeSshDriver.java  |  16 +--
 .../database/mariadb/MariaDbSshDriver.java  |   2 +-
 .../entity/database/mysql/MySqlSshDriver.java   |  11 +-
 .../entity/database/rubyrep/RubyRepNode.java|   3 +
 .../database/rubyrep/RubyRepSshDriver.java  |  16 +--
 .../messaging/activemq/ActiveMQBroker.java  |   3 +
 .../messaging/activemq/ActiveMQSshDriver.java   |  11 +-
 .../kafka/AbstractfKafkaSshDriver.java  |  12 +--
 .../brooklyn/entity/messaging/kafka/Kafka.java  |   3 +
 .../entity/messaging/qpid/QpidBroker.java   |  43 
 .../entity/messaging/qpid/QpidSshDriver.java|  12 +--
 .../entity/messaging/rabbit/RabbitBroker.java   |  35 +++
 .../messaging/rabbit/RabbitSshDriver.java   |   6 --
 .../brooklyn/entity/messaging/storm/Storm.java  |  21 ++--
 .../entity/messaging/storm/StormSshDriver.java  |   6 --
 .../entity/zookeeper/ZooKeeperNode.java |  33 +++---
 .../entity/zookeeper/ZooKeeperSshDriver.java|   8 +-
 .../entity/monitoring/monit/MonitNode.java  |  26 ++---
 .../entity/monitoring/monit/MonitSshDriver.java |  14 +--
 .../entity/nosql/cassandra/CassandraNode.java   |  43 
 .../nosql/cassandra/CassandraNodeSshDriver.java |  10 --
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |  37 ---
 .../nosql/elasticsearch/ElasticSearchNode.java  |  14 ++-
 .../ElasticSearchNodeSshDriver.java |  13 +--
 .../nosql/hazelcast/HazelcastNodeSshDriver.java |   5 -
 .../nosql/mongodb/AbstractMongoDBSshDriver.java |  25 ++---
 .../brooklyn/entity/nosql/redis/RedisStore.java |  11 +-
 .../entity/nosql/redis/RedisStoreSshDriver.java |   6 --
 .../brooklyn/entity/nosql/riak/RiakNode.java|   3 +
 .../entity/nosql/riak/RiakNodeSshDriver.java|   5 +-
 .../brooklyn/entity/nosql/solr/SolrServer.java  |  17 ++--
 .../entity/nosql/solr/SolrServerSshDriver.java  |   6 --
 .../entity/osgi/karaf/KarafContainer.java   | 100 +--
 .../entity/osgi/karaf/KarafSshDriver.java   |   6 --
 .../entity/proxy/nginx/NginxController.java |  36 ---
 .../entity/proxy/nginx/NginxSshDriver.java  |   6 --
 .../entity/webapp/jboss/JBoss6Server.java   |  22 ++--
 .../entity/webapp/jboss/JBoss6SshDriver.java|   7 --
 .../entity/webapp/jboss/JBoss7Server.java   |  33 +++---
 .../entity/webapp/jboss/JBoss7SshDriver.java|   2 +-
 .../entity/webapp/jetty/Jetty6Server.java   |   9 +-
 .../entity/webapp/jetty/Jetty6SshDriver.java|   7 --
 .../webapp/nodejs/NodeJsWebAppService.java  |  10 +-
 .../webapp/nodejs/NodeJsWebAppSshDriver.java|  22 ++--
 .../entity/webapp/tomcat/Tomcat8Server.java |   9 +-
 .../entity/webapp/tomcat/TomcatServer.java  |  13 ++-
 .../entity/webapp/tomcat/TomcatSshDriver.java   |  11 +-
 48 files changed, 337 insertions(+), 435 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3352bfab/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java
--
diff --git 
a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java
 
b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java
index f22381a..5c38035 100644
--- 
a/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java
+++ 
b/software/database/src/main/java/org/apache/brooklyn/entity/database/crate/CrateNode.java
@@ -42,6 +42,9 @@ public interface CrateNode extends SoftwareProcess, 
UsesJava,UsesJmx, UsesJavaMX
 ConfigKey SUGGESTED_VERSION = 
ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION,
 "0.45.7");
 
+@SetFromFlag("archiveNameFormat")
+ConfigKey ARCHIVE_DIRECTORY_NAME_FORMAT = 
ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.ARCHIVE_DIRECTORY_NAME_FORMAT,
 "crate-%s");
+
 @SetFromFlag("downloadUrl")
 AttributeSensorAndConfigKey DOWNLOAD_URL = new 
BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey(
 

[3/3] brooklyn-docs git commit: This closes #23

[aledsage]

This closes #23


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

Branch: refs/heads/master
Commit: a9ca113093fed3c25a5227d21fff7a6f29f52e0a
Parents: ae8b0ab 5921673
Author: Aled Sage 
Authored: Thu Mar 10 10:44:30 2016 +
Committer: Aled Sage 
Committed: Thu Mar 10 10:44:30 2016 +

--
 _build/build-pdf.sh | 29 +
 _build/build.sh |  6 --
 _build/buildPDF.sh  | 28 
 style/css/printable.css |  9 +
 4 files changed, 42 insertions(+), 30 deletions(-)
--

[2/3] brooklyn-docs git commit: Renamed script & optimised

[aledsage]

Renamed script & optimised


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

Branch: refs/heads/master
Commit: 59216734945a6667fc440c108b175350a4f3ff7c
Parents: 2a70855
Author: Duncan Godwin 
Authored: Mon Mar 7 15:28:55 2016 +
Committer: Duncan Godwin 
Committed: Mon Mar 7 15:28:55 2016 +

--
 _build/build-pdf.sh | 29 +
 _build/build.sh |  8 
 _build/buildPDF.sh  | 32 
 3 files changed, 33 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/59216734/_build/build-pdf.sh
--
diff --git a/_build/build-pdf.sh b/_build/build-pdf.sh
new file mode 100755
index 000..175458e
--- /dev/null
+++ b/_build/build-pdf.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#
+# this generates A PDF from a HTML file
+
+if [ ! -x _build/build.sh ] ; then
+  echo "ERROR: script must be run in root of docs dir"
+  exit 1
+fi
+
+if [ "$#" -lt 2 ] ; then
+   echo "Usage: build-pdf.sh   [user-style-sheet]"
+   exit 1
+fi
+
+if ! command -v wkhtmltopdf >/dev/null 2>&1; then
+   echo "ERROR: script requires wkhtmltopdf but it's not installed."
+   exit 1
+fi
+   
+# run the PDF build with wkhtmltopdf
+wkhtmltopdf ${3:+--user-style-sheet $3} --page-size Letter --margin-top 0.75in 
--margin-right 0.75in --margin-bottom 0.75in --margin-left 0.75in --encoding 
UTF-8 $1 $2
+
+if [ $? -eq 1 ] ; then
+   echo "Note that ContentNotFoundError is usually because of the invalid 
relational path of a local resource such as an image"
+elif [ $? -eq 0 ] ; then
+   echo "PDF Built successfully."
+else 
+   exit $?
+fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/59216734/_build/build.sh
--
diff --git a/_build/build.sh b/_build/build.sh
index 6bc7d45..f7a9848 100755
--- a/_build/build.sh
+++ b/_build/build.sh
@@ -191,12 +191,12 @@ function build_pdf() {
   PDF_STARTED_LOG="_pdf/pdf_gen_started.log"
   
   if [ "$SKIP_PDF_MANUAL" != "true" ]; then
-_build/buildPDF.sh "_site/zoneMergeManual.html" "_pdf/UserManual.pdf" 2>&1 
| tee $PDF_MANUAL_LOG
-_build/buildPDF.sh "_site/zoneMergeManual.html" 
"_pdf/UserManual_printable.pdf" "./style/css/printable.css" 2>&1 | tee 
$PDF_MANUAL_LOG
+_build/build-pdf.sh "_site/zoneMergeManual.html" "_pdf/UserManual.pdf" 
2>&1 | tee $PDF_MANUAL_LOG
+_build/build-pdf.sh "_site/zoneMergeManual.html" 
"_pdf/UserManual_printable.pdf" "./style/css/printable.css" 2>&1 | tee 
$PDF_MANUAL_LOG
   fi
   if [ "$SKIP_PDF_STARTED" != "true" ]; then
-_build/buildPDF.sh "_site/zoneMergeStarted.html" "_pdf/GettingStarted.pdf" 
2>&1 | tee $PDF_STARTED_LOG
-_build/buildPDF.sh "_site/zoneMergeStarted.html" 
"_pdf/GettingStarted_printable.pdf" "./style/css/printable.css" 2>&1 | tee 
$PDF_STARTED_LOG
+_build/build-pdf.sh "_site/zoneMergeStarted.html" 
"_pdf/GettingStarted.pdf" 2>&1 | tee $PDF_STARTED_LOG
+_build/build-pdf.sh "_site/zoneMergeStarted.html" 
"_pdf/GettingStarted_printable.pdf" "./style/css/printable.css" 2>&1 | tee 
$PDF_STARTED_LOG
   fi
 }
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/59216734/_build/buildPDF.sh
--
diff --git a/_build/buildPDF.sh b/_build/buildPDF.sh
deleted file mode 100755
index ad9d95a..000
--- a/_build/buildPDF.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-#
-# this generates A PDF from a HTML file
-
-if [ ! -x _build/build.sh ] ; then
-  echo "ERROR: script must be run in root of docs dir"
-  exit 1
-fi
-
-if [ "$#" -lt 2 ] ; then
-   echo "Usage: buildPDF.sh   [user-style-sheet]"
-   exit 1
-fi
-
-if ! command -v wkhtmltopdf >/dev/null 2>&1; then
-   echo "ERROR: script requires wkhtmltopdf but it's not installed."
-   exit 1
-fi
-   
-# run the PDF build with wkhtmltopdf
-if [ -z "$3" ] ; then
-   wkhtmltopdf --page-size Letter --margin-top 0.75in --margin-right 
0.75in --margin-bottom 0.75in --margin-left 0.75in --encoding UTF-8 $1 $2
-else
-   wkhtmltopdf --user-style-sheet $3 --page-size Letter --margin-top 
0.75in --margin-right 0.75in --margin-bottom 0.75in --margin-left 0.75in 
--encoding UTF-8 $1 $2
-fi
-if [ $? -eq 1 ] ; then
-   echo "Note that ContentNotFoundError is usually because of the invalid 
relational path of a local resource such as an image"
-elif [ $? -eq 0 ] ; then
- 

[03/10] brooklyn-docs git commit: Fixed typo

[aledsage]

Fixed typo


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

Branch: refs/heads/master
Commit: 5d6d84527241ee845f70083ae91da3e1e8060b2c
Parents: a594c06
Author: Duncan Godwin 
Authored: Fri Mar 4 14:34:02 2016 +
Committer: Duncan Godwin 
Committed: Mon Mar 7 16:54:43 2016 +

--
 _plugins/page_structure.rb | 1 +
 guide/index.md | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5d6d8452/_plugins/page_structure.rb
--
diff --git a/_plugins/page_structure.rb b/_plugins/page_structure.rb
index 4e01559..fbfd5a2 100644
--- a/_plugins/page_structure.rb
+++ b/_plugins/page_structure.rb
@@ -52,6 +52,7 @@ module PageStructureUtils
 end
 ##
 # Sorts a list of yaml children, if there's no numbering, use the YAML 
order to create a numbering
+# NOTE: doesn't alter the returned object as that seemed to break things 
downstream
 #
 def self.sortYAMLSectionPositions(yaml)
   position = Hash.new

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5d6d8452/guide/index.md
--
diff --git a/guide/index.md b/guide/index.md
index 5c7ced3..cdb3b46 100644
--- a/guide/index.md
+++ b/guide/index.md
@@ -5,12 +5,12 @@ breadcrumbs:
 - /website/documentation/index.md
 - index.md
 children:
-- { path: /guide/start/index.md, section_position: 3.1.2 }
+- { path: /guide/start/index.md }
 - { path: /guide/misc/download.md }
 - { path: /guide/concepts/index.md }
 - { path: /guide/yaml/index.md }
 - { path: /guide/java/index.md }
-- { path: /guide/ops/index.md, section_position: 2 }
+- { path: /guide/ops/index.md }
 - { path: /guide/misc/index.md }
 ---
 

[05/10] brooklyn-docs git commit: Updated page structure & locations

[aledsage]

Updated page structure & locations


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

Branch: refs/heads/master
Commit: 95eb8a4749de2993a5bc63cd9431d8df05a8f506
Parents: bf43bd0
Author: Duncan Godwin 
Authored: Mon Feb 29 11:32:04 2016 +
Committer: Duncan Godwin 
Committed: Mon Mar 7 16:54:43 2016 +

--
 _plugins/page_structure.rb  | 103 +
 _plugins/site_structure.rb  |  20 +
 guide/ops/locations/1.1_cloud-setup.md  |  86 
 guide/ops/locations/1_clouds.md | 239 ++
 .../2_inheritance-and-named-locations.md|  78 
 guide/ops/locations/3.1_ssh-keys.md |  86 
 guide/ops/locations/3_localhost.md  |  31 ++
 guide/ops/locations/4_byon.md   |  72 +++
 guide/ops/locations/6_more-locations.md |  52 +++
 guide/ops/locations/index.md| 439 +--
 10 files changed, 769 insertions(+), 437 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/95eb8a47/_plugins/page_structure.rb
--
diff --git a/_plugins/page_structure.rb b/_plugins/page_structure.rb
new file mode 100644
index 000..9579397
--- /dev/null
+++ b/_plugins/page_structure.rb
@@ -0,0 +1,103 @@
+#
+# Adds a liquid tag to build a page on the contents of the folder it's in
+# 
+# Pulls in files in the format _.md in the order of version 
number. Ignores files not in this format.
+#
+
+require 'rubygems'
+require 'yaml'
+require "kramdown"
+
+module PageStructureUtils
+  
+  class ChildPage
+def initialize(yaml, content)
+  @page_yaml=yaml
+  @page_content=content
+end
+def content()
+  @page_content
+end
+def yaml()
+  @page_yaml
+end
+def to_s # called with print / puts
+  "YAML : #{@page_yaml}, Content : #{@page_content}"
+end
+  
+def self.parseChildPagesFromParent(page)
+  # get the base directory of the current file
+  $baseFile = Dir.pwd+page['dir']
+  # list all of the files in that directory
+  $listings = Dir[$baseFile+"/*"]
+  # filter by the key pattern
+  $listings = $listings.select{ |i| i[/[\d\.]\_.*\.md/] }
+  # Sort the files based on the Gem::Version of the prefix
+  $listings = $listings.sort{ |x,y| Gem::Version.new((File.basename 
x).partition('_').first) <=> Gem::Version.new((File.basename 
y).partition('_').first)  }
+  # loop through them and merge the content
+  $allPages = []
+
+  for $listing in $listings
+$textContent = ""
+yamlContent = nil
+
+# read the file
+$fileContent = IO.read($listing)
+# try and split of any YAML
+$partitionedFileContent = $fileContent.split('---');
+# if there's potentially partitioned YAML try and parse it
+if $partitionedFileContent.size > 2
+  # try and parse the YAML
+  yamlContent = YAML.load($partitionedFileContent[1])
+  # if we can, use it
+  if yamlContent != nil && yamlContent != false
+$textContent = $partitionedFileContent[2]
+  end
+end
+
+# if there's no text content set yet, just use the whole file
+if $textContent == ""
+  # use the whole file content
+  $textContent = $fileContent
+end
+# append the current file to the content
+($allPages ||= []) << ChildPage.new(yamlContent, $textContent)
+
+  end
+  # return the combined content
+  $allPages
+end
+  end
+  
+  class IncludePageContentTag < Liquid::Tag
+  def initialize(tag_name, text, tokens)
+super
+@text = text.strip
+  end
+  def render(context)
+$childPages = ChildPage.parseChildPagesFromParent(context['page'])
+$content = ""
+for $childPage in $childPages
+  #append the content
+  $content = $content+$childPage.content()
+end
+site = context.registers[:site]
+pageHash = context.registers[:page]
+  
+# not sure how to get the page object so look through site.pages for 
the current URL
+page = nil;
+for currPage in site.pages
+  if currPage['url'] == pageHash['url']
+page = currPage
+break
+  end
+end
+
+# render the included content with the current page renderer
+info = { :filters => [Jekyll::Filters], :registers 

[01/10] brooklyn-docs git commit: Fixed YAML in content bug

[aledsage]

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master bf43bd004 -> ae8b0abb3


Fixed YAML in content bug


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

Branch: refs/heads/master
Commit: f000a31a50abd4b8ac1c8a373ba6411df36b59bc
Parents: b5b2161
Author: Duncan Godwin 
Authored: Mon Mar 7 15:48:49 2016 +
Committer: Duncan Godwin 
Committed: Mon Mar 7 16:54:43 2016 +

--
 _plugins/page_structure.rb  | 4 ++--
 contributing/inline-children.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/f000a31a/_plugins/page_structure.rb
--
diff --git a/_plugins/page_structure.rb b/_plugins/page_structure.rb
index 07caf17..6b3a2a1 100644
--- a/_plugins/page_structure.rb
+++ b/_plugins/page_structure.rb
@@ -115,7 +115,7 @@ module PageStructureUtils
   yamlContent['section_position'] = Integer::MAX
 end
 # if there's YAML, check it has the section_position tag and put 
it into child pages
-($allPages ||= []) << ChildPage.new(yamlContent, 
$partitionedFileContent[2])
+($allPages ||= []) << ChildPage.new(yamlContent, 
$partitionedFileContent[2..-1].join('---'))
   end
 end 
   end
@@ -154,7 +154,7 @@ module PageStructureUtils
   yamlContent = YAML.load($partitionedFileContent[1])
   # if we can, use it
   if yamlContent != nil && yamlContent != false
-$textContent = $partitionedFileContent[2]
+$textContent = $partitionedFileContent[2..-1].join('---')
   end
 end
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/f000a31a/contributing/inline-children.md
--
diff --git a/contributing/inline-children.md b/contributing/inline-children.md
index d6270bb..08eaa38 100644
--- a/contributing/inline-children.md
+++ b/contributing/inline-children.md
@@ -29,11 +29,11 @@ The content from these inline sections can then be included 
in the page content
 in an example from 
[/guide/ops/locations/index.md](https://github.com/apache/brooklyn-docs/blob/master/guide/ops/locations/index.md){:target="_blank"}:
 
 
-
+---
 title: Locations
 layout: website-normal
 check_directory_for_children: true
-
+---
 
 Locations are the environments to which Brooklyn deploys applications, 
including:
 

[09/10] brooklyn-docs git commit: Clarified Numbering

[aledsage]

Clarified Numbering


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

Branch: refs/heads/master
Commit: 898433458a47c4a93240ec4c18e6ec94d1d3a71a
Parents: e04b38e
Author: Duncan Godwin 
Authored: Wed Mar 9 15:38:01 2016 +
Committer: Duncan Godwin 
Committed: Wed Mar 9 15:38:01 2016 +

--
 _plugins/page_structure.rb | 1 +
 contributing/ordering.md   | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/89843345/_plugins/page_structure.rb
--
diff --git a/_plugins/page_structure.rb b/_plugins/page_structure.rb
index d2e419b..b1697bd 100644
--- a/_plugins/page_structure.rb
+++ b/_plugins/page_structure.rb
@@ -64,6 +64,7 @@ module PageStructureUtils
   yaml.each do |i|
 if i.instance_of? String
   position[i] = $major+"."+$minor.to_s
+  $minor += 1
 else
   # get the key for this type of child
   defining_param = getDefiningParameterFromHash(i)

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/89843345/contributing/ordering.md
--
diff --git a/contributing/ordering.md b/contributing/ordering.md
index ff2a0f9..428360c 100644
--- a/contributing/ordering.md
+++ b/contributing/ordering.md
@@ -14,8 +14,10 @@ For inline children, sourced using 
`check_directory_for_children: true`, this `s
 The format for `section_position` is that of software versioning, i.e `A.B... 
Z` where A, B etc are numbers of decreasing value. Position `1.1.0` would appear
 before version `1.0.4` for example. This allows an infinite number of sub 
pages between each `section_position`.
 
-Any un-versioned pages are automatically numbered to follow on from the last 
numbered page, or `1.1` if no pages are yet numbered. For
-example, if a numbered page, `1.4` is followed by a non-numbered page, the 
non-numbered page would be auto-numbered as `1.4.1`.
+Any un-versioned pages are automatically numbered to add a new minor version 
from the last page if that was numbered or increment the minor
+if it was not. If no pages are yet numbered, the numbering is started at 
`1.1`. For example, if a numbered page, `1.4` is followed by a 
+non-numbered page, the non-numbered page would be auto-numbered as `1.4.1`. If 
this page is followed by another non-numbered page it would
+be auto-numbered as `1.4.2`.
 
 For example, a set of children pages numbered like this:
 

[06/10] brooklyn-docs git commit: Added global support for section position

[aledsage]

Added global support for section position


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

Branch: refs/heads/master
Commit: cfa914ded11bb466e8bf57793d4fb811f767a049
Parents: 95eb8a4
Author: Duncan Godwin 
Authored: Thu Mar 3 13:46:09 2016 +
Committer: Duncan Godwin 
Committed: Mon Mar 7 16:54:43 2016 +

--
 _plugins/page_structure.rb  | 114 -
 _plugins/site_structure.rb  |  13 +-
 guide/ops/locations/1.1_cloud-setup.md  |  86 ---
 guide/ops/locations/1_clouds.md | 239 --
 .../2_inheritance-and-named-locations.md|  78 --
 guide/ops/locations/3.1_ssh-keys.md |  86 ---
 guide/ops/locations/3_localhost.md  |  31 ---
 guide/ops/locations/4_byon.md   |  72 --
 guide/ops/locations/6_more-locations.md |  52 
 guide/ops/locations/byon.md |  74 ++
 guide/ops/locations/cloud-specific-setup.md |  88 +++
 guide/ops/locations/clouds.md   | 241 +++
 guide/ops/locations/index.md|   2 +-
 .../inheritance-and-named-locations.md  |  80 ++
 guide/ops/locations/localhost.md|  33 +++
 guide/ops/locations/more-locations.md   |  17 +-
 guide/ops/locations/ssh-keys.md |  13 +-
 17 files changed, 648 insertions(+), 671 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/cfa914de/_plugins/page_structure.rb
--
diff --git a/_plugins/page_structure.rb b/_plugins/page_structure.rb
index 9579397..2833be3 100644
--- a/_plugins/page_structure.rb
+++ b/_plugins/page_structure.rb
@@ -12,19 +12,112 @@ module PageStructureUtils
   
   class ChildPage
 def initialize(yaml, content)
-  @page_yaml=yaml
-  @page_content=content
-end
-def content()
-  @page_content
-end
-def yaml()
-  @page_yaml
+  @yaml=yaml
+  @content=content
 end
+attr_accessor :yaml
+attr_accessor :content
 def to_s # called with print / puts
-  "YAML : #{@page_yaml}, Content : #{@page_content}"
+  "YAML : #{@yaml}" #, Content : #{@content}"
 end
+
+##
+# Sort a list of children by their YAML containing section positions. Do 
this with Gem:Version
+#
+#
+def self.sortBySectionPositions(yaml)
   
+  $major = "1"
+  $minor = 1
+  # first check all the child pages are numbered, if not, number them in 
the order they are
+  yaml.each do |i|
+if i.yaml['section_position'] == nil
+  i.yaml['section_position'] = $major+"."+$minor.to_s
+  $minor += 1
+else
+  # Store any major, start incrementing minor
+  $major = i.yaml['section_position'].to_s
+  $minor = 1
+end
+  end
+  
+  # return the comparison between the versions
+  yaml.sort{ |x,y| Gem::Version.new(x.yaml['section_position'].to_s) <=> 
Gem::Version.new(y.yaml['section_position'].to_s) }
+end
+##
+# Sorts a list of yaml children, if there's no numbering, use the YAML 
order to create a numbering
+#
+def self.sortYAMLSectionPositions(yaml)
+#  puts "a > "+yaml.to_s
+  hashArray = []
+  $major = "1"
+  $minor = 1
+  # first check all the child pages are numbered, if not, number them in 
the order they are
+  yaml.each do |i|
+hash = {}
+# if it's a string, convert it to a hash
+if i.instance_of? String
+  hash = { "path" => i }
+else
+  hash = i
+end
+if i['section_position'] == nil
+  hash['section_position'] = $major+"."+$minor.to_s
+  $minor += 1
+else
+  # Store any major, start incrementing minor
+  $major = i['section_position'].to_s
+  $minor = 1
+end
+hashArray << hash
+  end
+  # return the comparison between the versions (NB: sort! for in-place 
sorting)
+  hashArray.sort!{ |x,y| Gem::Version.new(x['section_position'].to_s) <=> 
Gem::Version.new(y['section_position'].to_s) }
+#  puts "2 > "+hashArray.to_s
+end
+
+##
+# This function looks at all the *.md files at the YAML in the headers and 
produces a list of children ordered by section_position
+#
+#
+def self.parseChildYAMLFromParent(page)
+  # get the base directory of the current file
+  $baseFile = Dir.pwd+page['dir']
+

[04/10] brooklyn-docs git commit: Fixed single page bugs

[aledsage]

Fixed single page bugs


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

Branch: refs/heads/master
Commit: a594c062b6986492c1f3bf853b3e1cc49e776cd5
Parents: cfa914d
Author: Duncan Godwin 
Authored: Fri Mar 4 14:25:11 2016 +
Committer: Duncan Godwin 
Committed: Mon Mar 7 16:54:43 2016 +

--
 _plugins/page_structure.rb | 65 +---
 guide/index.md |  4 +-
 guide/start/policies.md| 95 ++---
 style/css/singlePage.css   | 12 ++
 4 files changed, 134 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/a594c062/_plugins/page_structure.rb
--
diff --git a/_plugins/page_structure.rb b/_plugins/page_structure.rb
index 2833be3..4e01559 100644
--- a/_plugins/page_structure.rb
+++ b/_plugins/page_structure.rb
@@ -10,6 +10,12 @@ require "kramdown"
 
 module PageStructureUtils
   
+  class MyHash < Hash
+def to_s
+  "cheese"
+end
+  end
+  
   class ChildPage
 def initialize(yaml, content)
   @yaml=yaml
@@ -48,33 +54,42 @@ module PageStructureUtils
 # Sorts a list of yaml children, if there's no numbering, use the YAML 
order to create a numbering
 #
 def self.sortYAMLSectionPositions(yaml)
-#  puts "a > "+yaml.to_s
-  hashArray = []
-  $major = "1"
-  $minor = 1
-  # first check all the child pages are numbered, if not, number them in 
the order they are
-  yaml.each do |i|
-hash = {}
-# if it's a string, convert it to a hash
-if i.instance_of? String
-  hash = { "path" => i }
-else
-  hash = i
-end
-if i['section_position'] == nil
-  hash['section_position'] = $major+"."+$minor.to_s
-  $minor += 1
-else
-  # Store any major, start incrementing minor
-  $major = i['section_position'].to_s
+  position = Hash.new
+  $major = "1"
   $minor = 1
+  # go through and generate a position for each
+  yaml.each do |i|
+if i.instance_of? String
+  position[i] = $major+"."+$minor.to_s
+else
+  if i['section_position'] == nil
+position[i['path']] = $major+"."+$minor.to_s
+$minor += 1
+  else
+# Store any major, start incrementing minor
+position[i['path']] = i['section_position'].to_s
+$major = i['section_position'].to_s
+$minor = 1
+  end
+end
+  end
+  # sort on the position (NB: sort! for in-place sorting)
+  yaml.sort!{ |x,y| 
+$pos_x = nil
+$pos_y = nil
+if x.instance_of? String
+  $pos_x = position[x]
+else
+  $pos_x = position[x['path']]
+end
+if y.instance_of? String
+  $pos_y = position[y]
+else
+  $pos_y = position[y['path']]
+end
+Gem::Version.new($pos_x.to_s) <=> Gem::Version.new($pos_y.to_s) 
+}
 end
-hashArray << hash
-  end
-  # return the comparison between the versions (NB: sort! for in-place 
sorting)
-  hashArray.sort!{ |x,y| Gem::Version.new(x['section_position'].to_s) <=> 
Gem::Version.new(y['section_position'].to_s) }
-#  puts "2 > "+hashArray.to_s
-end
 
 ##
 # This function looks at all the *.md files at the YAML in the headers and 
produces a list of children ordered by section_position

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/a594c062/guide/index.md
--
diff --git a/guide/index.md b/guide/index.md
index cdb3b46..5c7ced3 100644
--- a/guide/index.md
+++ b/guide/index.md
@@ -5,12 +5,12 @@ breadcrumbs:
 - /website/documentation/index.md
 - index.md
 children:
-- { path: /guide/start/index.md }
+- { path: /guide/start/index.md, section_position: 3.1.2 }
 - { path: /guide/misc/download.md }
 - { path: /guide/concepts/index.md }
 - { path: /guide/yaml/index.md }
 - { path: /guide/java/index.md }
-- { path: /guide/ops/index.md }
+- { path: /guide/ops/index.md, section_position: 2 }
 - { path: /guide/misc/index.md }
 ---
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/a594c062/guide/start/policies.md
--
diff --git 

[10/10] brooklyn-docs git commit: This closes #20

[aledsage]

This closes #20


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

Branch: refs/heads/master
Commit: ae8b0abb342505b2c008d14b0861a848c2324622
Parents: bf43bd0 8984334
Author: Aled Sage 
Authored: Thu Mar 10 10:31:59 2016 +
Committer: Aled Sage 
Committed: Thu Mar 10 10:31:59 2016 +

--
 README.md   |   8 +-
 _plugins/page_structure.rb  | 220 ++
 _plugins/site_structure.rb  |  29 ++
 contributing/index.md   |  15 +
 contributing/inline-children.md |  54 +++
 contributing/ordering.md|  48 ++
 contributing/pdf-manual.md  |  58 +++
 contributing/site-structure.md  |  29 ++
 guide/ops/locations/byon.md |  74 
 guide/ops/locations/clouds.md   | 248 +++
 guide/ops/locations/index.md| 439 +--
 .../inheritance-and-named-locations.md  |  80 
 guide/ops/locations/localhost.md|  33 ++
 guide/ops/locations/more-clouds.md  |   8 +-
 guide/ops/locations/more-locations.md   |  55 ---
 guide/ops/locations/special-locations.md|  54 +++
 guide/ops/locations/ssh-keys.md |  13 +-
 guide/ops/locations/vpc-issues.md   |  32 --
 guide/start/policies.md |  95 +++-
 style/css/singlePage.css|  12 +
 20 files changed, 1057 insertions(+), 547 deletions(-)
--

[07/10] brooklyn-docs git commit: Merged conflicts from #19 & order bug

[aledsage]

Merged conflicts from #19 & order bug


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

Branch: refs/heads/master
Commit: 5ee36ffd47cbfd57433559322ae273092d42d6b3
Parents: f000a31
Author: Duncan Godwin 
Authored: Tue Mar 8 10:14:16 2016 +
Committer: Duncan Godwin 
Committed: Tue Mar 8 10:14:16 2016 +

--
 _plugins/page_structure.rb  | 20 -
 guide/ops/locations/cloud-specific-setup.md | 88 
 guide/ops/locations/clouds.md   | 21 +++--
 guide/ops/locations/index.md|  2 +
 .../inheritance-and-named-locations.md  |  2 +-
 guide/ops/locations/localhost.md|  2 +-
 guide/ops/locations/more-clouds.md  |  8 +-
 guide/ops/locations/more-locations.md   | 54 
 guide/ops/locations/special-locations.md| 54 
 guide/ops/locations/ssh-keys.md |  2 +-
 guide/ops/locations/vpc-issues.md   | 32 ---
 11 files changed, 95 insertions(+), 190 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5ee36ffd/_plugins/page_structure.rb
--
diff --git a/_plugins/page_structure.rb b/_plugins/page_structure.rb
index 6b3a2a1..d2e419b 100644
--- a/_plugins/page_structure.rb
+++ b/_plugins/page_structure.rb
@@ -45,6 +45,14 @@ module PageStructureUtils
   yaml.sort{ |x,y| Gem::Version.new(x.yaml['section_position'].to_s) <=> 
Gem::Version.new(y.yaml['section_position'].to_s) }
 end
 ##
+# This goes through the hash looking for the keys for the different types 
of children
+#
+def self.getDefiningParameterFromHash(hash)
+  param_name = hash['path']
+  param_name = (param_name == nil ? hash['link'] : param_name)
+   (param_name == nil ? hash['section'] : param_name)
+end
+##
 # Sorts a list of yaml children, if there's no numbering, use the YAML 
order to create a numbering
 # NOTE: doesn't alter the returned object as that seemed to break things 
downstream
 #
@@ -57,12 +65,14 @@ module PageStructureUtils
 if i.instance_of? String
   position[i] = $major+"."+$minor.to_s
 else
+  # get the key for this type of child
+  defining_param = getDefiningParameterFromHash(i)
   if i['section_position'] == nil
-position[i['path']] = $major+"."+$minor.to_s
+position[defining_param] = $major+"."+$minor.to_s
 $minor += 1
   else
 # Store any major, start incrementing minor
-position[i['path']] = i['section_position'].to_s
+position[defining_param] = i['section_position'].to_s
 $major = i['section_position'].to_s
 $minor = 1
   end
@@ -75,12 +85,14 @@ module PageStructureUtils
 if x.instance_of? String
   $pos_x = position[x]
 else
-  $pos_x = position[x['path']]
+  defining_param = getDefiningParameterFromHash(x)
+  $pos_x = position[defining_param]
 end
 if y.instance_of? String
   $pos_y = position[y]
 else
-  $pos_y = position[y['path']]
+  defining_param = getDefiningParameterFromHash(y)
+  $pos_y = position[defining_param]
 end
 Gem::Version.new($pos_x.to_s) <=> Gem::Version.new($pos_y.to_s) 
 }

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/5ee36ffd/guide/ops/locations/cloud-specific-setup.md
--
diff --git a/guide/ops/locations/cloud-specific-setup.md 
b/guide/ops/locations/cloud-specific-setup.md
deleted file mode 100644
index 56a701a..000
--- a/guide/ops/locations/cloud-specific-setup.md
+++ /dev/null
@@ -1,88 +0,0 @@

-section: Cloud Specific Setup
-section_type: inline
-section_position: 1.1

-
-### Cloud Specific Setup
-
-To connect to a Cloud, Brooklyn requires appropriate credentials. These 
comprise the "identity" and 
-"credential" in Brooklyn terminology. 
-
-For private clouds (and for some clouds being targeted using a standard API), 
the "endpoint"
-must also be specified, which is the cloud's URL.
-
-The [jclouds guides](https://jclouds.apache.org/guides) includes documentation 
on configuring 
-different clouds.
-
-
- AWS
-
-# Credentials
-
-AWS has an 

[08/10] brooklyn-docs git commit: Visibility correction

[aledsage]

Visibility correction


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

Branch: refs/heads/master
Commit: e04b38e3261fbfd58fc0b7f7a6361b5825eaf5c5
Parents: 5ee36ff
Author: Duncan Godwin 
Authored: Wed Mar 9 13:50:19 2016 +
Committer: Duncan Godwin 
Committed: Wed Mar 9 13:50:19 2016 +

--
 guide/start/policies.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e04b38e3/guide/start/policies.md
--
diff --git a/guide/start/policies.md b/guide/start/policies.md
index a12e77f..a1b2001 100644
--- a/guide/start/policies.md
+++ b/guide/start/policies.md
@@ -16,7 +16,7 @@ review and/or change the the location where the application 
will be deployed.
 You will need four machines for this example: one for the load-balancer 
(nginx), and three for the 
 Tomcat cluster (but you can reduce this by changing the `maxPoolSize` below).
 
-
+
 {% highlight yaml %}
 name: Tomcat Cluster
 

[2/2] brooklyn-server git commit: Merge branch 'master' of https://github.com/apache/brooklyn-server

[heneveld]

Merge branch 'master' of https://github.com/apache/brooklyn-server


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

Branch: refs/heads/master
Commit: c837f431592dfdb8af40ca5a826ff3e587f390b0
Parents: 99e09ee badd978
Author: Alex Heneveld 
Authored: Thu Mar 10 09:05:46 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 09:05:46 2016 +

--

--

[2/2] brooklyn-ui git commit: This closes #15

[heneveld]

This closes #15


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

Branch: refs/heads/master
Commit: 2668f86af157f245201652be3f4ffb41122bb260
Parents: dcbb6ef d94e1d2
Author: Alex Heneveld 
Authored: Thu Mar 10 09:00:11 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 09:00:11 2016 +

--
 src/main/license/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/2] brooklyn-ui git commit: Update comment following repo re-structure.

[heneveld]

Repository: brooklyn-ui
Updated Branches:
  refs/heads/master dcbb6ef37 -> 2668f86af


Update comment following repo re-structure.


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

Branch: refs/heads/master
Commit: d94e1d29d22fefbb2447ee3f44901536fa393a1d
Parents: dcbb6ef
Author: Geoff Macartney 
Authored: Fri Feb 26 12:28:59 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:16:32 2016 +

--
 src/main/license/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/d94e1d29/src/main/license/README.md
--
diff --git a/src/main/license/README.md b/src/main/license/README.md
index 2714c67..1f1fdec 100644
--- a/src/main/license/README.md
+++ b/src/main/license/README.md
@@ -3,5 +3,5 @@ This directory contains files to generate the custom license 
for this project.
 The files/ subdir contains the artifacts which are included in the JAR, some
 autogenerated by the dist/licensing scripts.
 
-See usage/dist/licensing/README.md for more information.
+See brooklyn-dist/dist/licensing/README.md for more information.
 

[1/2] brooklyn-server git commit: Update comment following repo re-structure

[svet]

Repository: brooklyn-server
Updated Branches:
  refs/heads/master 9f3128210 -> badd97867


Update comment following repo re-structure


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

Branch: refs/heads/master
Commit: 9224128512afe2b84708aa1a40574e59feb6ba56
Parents: 9f31282
Author: Geoff Macartney 
Authored: Fri Feb 26 12:25:44 2016 +
Committer: Geoff Macartney 
Committed: Wed Mar 9 20:19:11 2016 +

--
 server-cli/src/main/license/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

[2/2] brooklyn-server git commit: Closes #54

[svet]

Closes #54

Update comment following repo re-structure


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

Branch: refs/heads/master
Commit: badd978674efb00c7cb33b19c650c5d17f7f15a9
Parents: 9f31282 9224128
Author: Svetoslav Neykov 
Authored: Thu Mar 10 11:02:43 2016 +0200
Committer: Svetoslav Neykov 
Committed: Thu Mar 10 11:02:43 2016 +0200

--
 server-cli/src/main/license/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/3] brooklyn-client git commit: better errors in build script if missing/wrong go version

[heneveld]

Repository: brooklyn-client
Updated Branches:
  refs/heads/master 0623158fd -> d64428c52


better errors in build script if missing/wrong go version

and better progress output


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

Branch: refs/heads/master
Commit: 8cf78875115072c82b969146c0486f8274239108
Parents: 0623158
Author: Alex Heneveld 
Authored: Wed Mar 9 17:35:03 2016 +
Committer: Alex Heneveld 
Committed: Wed Mar 9 17:35:03 2016 +

--
 release/build.sh | 42 +++---
 1 file changed, 39 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/8cf78875/release/build.sh
--
diff --git a/release/build.sh b/release/build.sh
index bc9502e..a872624 100755
--- a/release/build.sh
+++ b/release/build.sh
@@ -30,7 +30,7 @@ CLI_PACKAGE="${PROJECT}/${BRNAME}"
 GOBIN=go
 GODEP=godep
 
-
+START_TIME=$(date +%s)
 
 #
 # Globals
@@ -129,11 +129,38 @@ while [ $# -gt 0 ]; do
esac
 done
 
+echo "Starting build.sh (brooklyn-client go build script)"
 
 #
 # Test if go is available
 #
-command -v $GOBIN >/dev/null 2>&1 || { echo "Command for compiling Go not 
found: $GOBIN" 1>&2 ; exit 1; }
+if ! command -v $GOBIN >/dev/null 2>&1 ; then
+  cat 1>&2 << \
+--MARKER--
+
+ERROR: Go language binaries not found (running "$GOBIN")
+
+The binaries for go v1.6 must be installed to build the brooklyn-client CLI.
+See golang.org for more information, or run maven with '-Pno-go-client' to 
skip.
+
+--MARKER--
+  exit 1
+fi
+
+GO_VERSION=`go version | awk '{print $3}'`
+GO_V=`echo $GO_VERSION | sed 's/^go1\.\([0-9][0-9]*\).*/\1/'`
+if ! (( "$GO_V" > 4 )) ; then
+  cat 1>&2 << \
+--MARKER--
+
+ERROR: Incompatible Go language version: $GO_VERSION
+
+Go version 1.6 or higher is required to build the brooklyn-client CLI.
+See golang.org for more information, or run maven with '-Pno-go-client' to 
skip.
+
+--MARKER--
+  exit 1
+fi
 
 
 if [ -n "$outdir" -a ! -d "$outdir" ]; then
@@ -149,7 +176,7 @@ mkdir -p ${GOPATH}/src/${PROJECT%/*}
 PATH=${GOPATH}/bin:${PATH}
 
 command -v $GODEP >/dev/null 2>&1 || {
-   echo installing $GODEP
+   echo Installing $GODEP
go get github.com/tools/godep || { echo failed installing $GODEP ; exit 
1; }
 }
 
@@ -216,4 +243,13 @@ else
done
 fi
 
+echo
+echo Successfully built the following binaries:
+echo
+ls -al ${GO_PATH}/bin/
+echo
+
+END_TIME=$(date +%s)
+echo "Completed build.sh (brooklyn-client go build script) in $(( $END_TIME - 
START_TIME ))s"
+
 exit 0

[2/3] brooklyn-client git commit: check go v1.6 not v1.5, as per code review

[heneveld]

check go v1.6 not v1.5, as per code review


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

Branch: refs/heads/master
Commit: e85f61eba5da8d3d7dc52a2ed906699a3d41a33f
Parents: 8cf7887
Author: Alex Heneveld 
Authored: Thu Mar 10 08:57:33 2016 +
Committer: Alex Heneveld 
Committed: Thu Mar 10 08:57:33 2016 +

--
 release/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/e85f61eb/release/build.sh
--
diff --git a/release/build.sh b/release/build.sh
index a872624..7b3d62a 100755
--- a/release/build.sh
+++ b/release/build.sh
@@ -149,7 +149,8 @@ fi
 
 GO_VERSION=`go version | awk '{print $3}'`
 GO_V=`echo $GO_VERSION | sed 's/^go1\.\([0-9][0-9]*\).*/\1/'`
-if ! (( "$GO_V" > 4 )) ; then
+# test if not okay so error shows if regex above not matched
+if ! (( "$GO_V" >= 6 )) ; then
   cat 1>&2 << \
 --MARKER--