Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5907D18FFF for ; Mon, 1 Feb 2016 17:43:52 +0000 (UTC) Received: (qmail 14922 invoked by uid 500); 1 Feb 2016 17:43:52 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 14896 invoked by uid 500); 1 Feb 2016 17:43:52 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 14041 invoked by uid 99); 1 Feb 2016 17:43:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2016 17:43:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72495DFF85; Mon, 1 Feb 2016 17:43:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Mon, 01 Feb 2016 17:44:22 -0000 Message-Id: <91067ca1002e45048d2e96d0ae92eb13@git.apache.org> In-Reply-To: <589a21bbf75b48f58acfe94bd6c591f4@git.apache.org> References: <589a21bbf75b48f58acfe94bd6c591f4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] brooklyn-docs git commit: Updates to Examples Before you Begin and Simple Web server to improve path from Getting Started. Updates to Examples Before you Begin and Simple Web server to improve path from Getting Started. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/a2ae7d76 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/a2ae7d76 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/a2ae7d76 Branch: refs/heads/0.5.0 Commit: a2ae7d76e1706142dafe41627c3bd20ab1f6b207 Parents: 293c105 Author: David Toy Authored: Thu Apr 18 18:03:04 2013 +0100 Committer: David Toy Committed: Mon Apr 22 12:52:48 2013 +0100 ---------------------------------------------------------------------- docs/use/examples/before-begin.include.md | 12 +++++++++--- docs/use/examples/webcluster/webcluster.include.md | 9 +++++---- 2 files changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/a2ae7d76/docs/use/examples/before-begin.include.md ---------------------------------------------------------------------- diff --git a/docs/use/examples/before-begin.include.md b/docs/use/examples/before-begin.include.md index 547c57a..b153548 100644 --- a/docs/use/examples/before-begin.include.md +++ b/docs/use/examples/before-begin.include.md @@ -1,8 +1,12 @@ +{% include fields.md %} + ## Before You Begin To use the examples, you'll need ``curl``, ``git``, ``java`` (1.6+), and ``maven`` (v3) installed. -{% include fields.md %} +### Installing Brooklyn + +(If you followed the [Getting Started](/use/guide/quickstart/index.html) instructions, you can skip to Installing the Examples.) {% if SNAPSHOT %} @@ -20,7 +24,7 @@ and export `BROOKLYN_HOME`: {% else %} -First, grab a copy of the Brooklyn distribution and set up `BROOKLYN_HOME`: +Grab a copy of the Brooklyn distribution and set up `BROOKLYN_HOME`: {% highlight bash %} % curl -LO {{ this_dist_url_tgz }} @@ -30,8 +34,9 @@ First, grab a copy of the Brooklyn distribution and set up `BROOKLYN_HOME`: {% endif %} +### Installing the Examples -Then, grab a copy of the brooklyn-examples source code and build with Maven: +Grab a copy of the brooklyn-examples source code and build with Maven: {% highlight bash %} % git clone https://github.com/brooklyncentral/brooklyn-examples.git @@ -45,6 +50,7 @@ Please note, these instructions are for a SNAPSHOT release of Brooklyn, so proceed with caution. For the latest stable version, go [here](/meta/versions.html). {% endif %} + For more information on ways to download Brooklyn please see the [download page]({{site.url}}/start/download.html). For more information on the Brooklyn CLI and launching apps, http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/a2ae7d76/docs/use/examples/webcluster/webcluster.include.md ---------------------------------------------------------------------- diff --git a/docs/use/examples/webcluster/webcluster.include.md b/docs/use/examples/webcluster/webcluster.include.md index 1318514..0de16cd 100644 --- a/docs/use/examples/webcluster/webcluster.include.md +++ b/docs/use/examples/webcluster/webcluster.include.md @@ -1,8 +1,9 @@ - - + {% readj ../before-begin.include.md %} -Now, go to this particular example's directory: +## Simple Web Server + +Go to this particular example's directory: {% highlight bash %} % cd simple-web-cluster @@ -18,7 +19,7 @@ the ``BROOKLYN_CLASSPATH`` environment variable in the following way: The project ``simple-web-cluster`` includes several deployment descriptors for rolling out a web application, under ``src/main/java``. -## Simple Web Server + The simplest of these, ``SingleWebServerExample``, starts JBoss on a single machine with a "Hello World" war deployed, with a single line: