You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/04/30 11:12:23 UTC
[3/5] brooklyn-docs git commit: Added SNAPSHOT download locations
Added SNAPSHOT download 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/d8ea8053
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/d8ea8053
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/d8ea8053
Branch: refs/heads/master
Commit: d8ea805341653e47e6c9aec0221079e3d4146c2a
Parents: 3c745d6
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Fri Apr 29 11:24:33 2016 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Fri Apr 29 11:24:33 2016 +0100
----------------------------------------------------------------------
guide/ops/cli/index.md | 5 ++++-
guide/start/running.md | 24 ++++++++++++++++--------
2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d8ea8053/guide/ops/cli/index.md
----------------------------------------------------------------------
diff --git a/guide/ops/cli/index.md b/guide/ops/cli/index.md
index 1a8a24f..1c79ce9 100644
--- a/guide/ops/cli/index.md
+++ b/guide/ops/cli/index.md
@@ -12,11 +12,14 @@ information on starting on a Brooklyn Server, refer to [Server CLI Reference](..
## Obtaining the CLI tool
-A selection of distributions of the CLI tool, `br`, are available to download from the download site here:
+A selection of distributions of the CLI tool, `br`, are available to download from the download site {% if site.brooklyn-version contains 'SNAPSHOT' %}
+[here](https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&a=brooklyn-client-cli&v={{site.brooklyn-version}}&c=bin&e=zip).
+{% else %} here:
* [Windows](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-client-cli-windows.zip)
* [Linux](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-client-cli-linux.tar.gz)
* [OSX](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-client-cli-macosx.tar.gz)
+{% endif %}
Alternatively the CLI tool is available as an executable binary for many more platforms in the Apache Brooklyn
distribution, under `bin/brooklyn-client-cli/`, with each build in its own subdirectory:
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d8ea8053/guide/start/running.md
----------------------------------------------------------------------
diff --git a/guide/start/running.md b/guide/start/running.md
index 9809b83..d018f6c 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -38,9 +38,13 @@ Firstly, download and install:
* [Vagrant](https://www.vagrantup.com/downloads.html){:target="_blank"}
* [Oracle VirtualBox](https://www.virtualbox.org/wiki/Downloads){:target="_blank"}
-Then download the provided Apache Brooklyn vagrant configuration from [here](https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}. This archive contains everything you need to create an environment for use with this guide, providing an Apache Brooklyn instance and some blank VMs.
+Then download the provided Apache Brooklyn vagrant configuration from {% if site.brooklyn-version contains 'SNAPSHOT' %}
+from [here](https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&a=brooklyn-vagrant&v={{site.brooklyn-version}}&c=dist&e=zip){:target="_blank"}.
+{% else %}
+[here](https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz){:target="_blank"}.
+{% endif %} This archive contains everything you need to create an environment for use with this guide, providing an Apache Brooklyn instance and some blank VMs.
-Extract the `tar.gz` archive and navigate into the expanded `apache-brooklyn-{{site.brooklyn-version}}-vagrant` folder
+Extract the `tar.gz` archive and navigate into the expanded `apache-brooklyn-{{site.brooklyn-version}}-vagrant` folder {% if site.brooklyn-version contains 'SNAPSHOT' %}(note: as this is a -SNAPSHOT version, your filename will be slightly different){% endif %}
{% highlight bash %}
$ tar xvf apache-brooklyn-{{site.brooklyn-version}}-vagrant.tar.gz
@@ -72,13 +76,13 @@ $ yum install apache-brooklyn-{{site.brooklyn-version}}-1.rpm
For Linux or OSX please download the Apache Brooklyn `tar.gz` archive from the [download]({{site.path.website}}/download/){:target="_blank"} section.
-{% if brooklyn_version contains 'SNAPSHOT' %}
+{% if site.brooklyn-version contains 'SNAPSHOT' %}
Extract the `tar.gz` archive (note: as this is a -SNAPSHOT version, your filename will be slightly different):
{% else %}
Extract the `tar.gz` archive and navigate into the expanded `apache-brooklyn-{{ site.brooklyn-version }}` folder.
{% endif %}
-{% if brooklyn_version contains 'SNAPSHOT' %}
+{% if site.brooklyn-version contains 'SNAPSHOT' %}
{% highlight bash %}
$ tar -zxf apache-brooklyn-dist-{{ site.brooklyn-version }}-timestamp-dist.tar.gz
$ cd apache-brooklyn-{{ site.brooklyn.version }}
@@ -190,11 +194,15 @@ 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 both distributed with Apache Brooklyn or can be downloaded using the most appropriate link for your OS:
+This tool is both distributed with Apache Brooklyn or can be downloaded {% if site.brooklyn-version contains 'SNAPSHOT' %}
+from [here](https://repository.apache.org/service/local/artifact/maven/redirect?r=snapshots&g=org.apache.brooklyn&a=brooklyn-client-cli&v={{site.brooklyn-version}}&c=bin&e=zip).
+{% else %}
+using the most appropriate link for your OS:
-* [Windows](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-client-cli-windows.zip)
-* [Linux](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-client-cli-linux.tar.gz)
-* [OSX](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-client-cli-macosx.tar.gz)
+* [Windows](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-client-cli-windows.zip)
+* [Linux](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-client-cli-linux.tar.gz)
+* [OSX](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-client-cli-macosx.tar.gz)
+{% endif %}
For details on the CLI, see the [Client CLI Reference](../ops/cli/) page.