From 499f3a0f826a46c17a9bba849091cae676e51e01 Mon Sep 17 00:00:00 2001 From: Duncan Godwin Date: Thu, 7 Apr 2016 15:05:49 +0100 Subject: [PATCH 1/4] Added CLI download locations --- guide/start/running.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/guide/start/running.md b/guide/start/running.md index 0518743d..9809b835 100644 --- a/guide/start/running.md +++ b/guide/start/running.md @@ -187,10 +187,16 @@ address of the management interface: INFO Started Brooklyn console at http://127.0.0.1:8081/, running classpath://brooklyn.war -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. +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 both distributed with Apache Brooklyn or can be downloaded 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) + +For details on the CLI, see the [Client CLI Reference](../ops/cli/) page. ## Next From 3c745d6165ede9f183f95a0a3db5886a899aa86b Mon Sep 17 00:00:00 2001 From: Duncan Godwin Date: Thu, 7 Apr 2016 15:15:21 +0100 Subject: [PATCH 2/4] Added changes to CLI index --- guide/ops/cli/index.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/guide/ops/cli/index.md b/guide/ops/cli/index.md index 15ea9057..1a8a24f2 100644 --- a/guide/ops/cli/index.md +++ b/guide/ops/cli/index.md @@ -12,8 +12,14 @@ 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, under `bin/brooklyn-client-cli/`. -The tool is an executable binary available for many platforms, with each build in its own subdirectory: +A selection of distributions of the CLI tool, `br`, are available to download from the download site 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) + +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: * Mac: `darwin.amd64/` * Windows 32-bit: `windows.386/` From d8ea805341653e47e6c9aec0221079e3d4146c2a Mon Sep 17 00:00:00 2001 From: Duncan Godwin Date: Fri, 29 Apr 2016 11:24:33 +0100 Subject: [PATCH 3/4] Added SNAPSHOT download locations --- guide/ops/cli/index.md | 5 ++++- guide/start/running.md | 24 ++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/guide/ops/cli/index.md b/guide/ops/cli/index.md index 1a8a24f2..1c79ce9d 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: diff --git a/guide/start/running.md b/guide/start/running.md index 9809b835..d018f6cf 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. From 649fa444a734eee81501b294ad22afcc2627d399 Mon Sep 17 00:00:00 2001 From: Duncan Godwin Date: Fri, 29 Apr 2016 11:27:54 +0100 Subject: [PATCH 4/4] Updated RPM locations --- guide/start/running.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/start/running.md b/guide/start/running.md index d018f6cf..0278dfba 100644 --- a/guide/start/running.md +++ b/guide/start/running.md @@ -61,7 +61,7 @@ For Centos 7 and RHEL 7 users, the recommended way to install Apache Brooklyn on RPM is the de facto standard for packaging software on these Linux distributions and provides a mechanism for installing, upgrading and removing packages such as Apache Brooklyn. The AMP package contains all the necessary files associated with the Apache Brooklyn application. -Download the Apache Brooklyn [RPM distribution](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-1.noarch.rpm){:target="_blank"}. +Download the Apache Brooklyn [RPM distribution](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}/apache-brooklyn-{{site.brooklyn-version}}-1.noarch.rpm){:target="_blank"}. Once downloaded, run the following shell command as root: