You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/07/27 19:02:23 UTC

[1/2] incubator-brooklyn git commit: Website updates for 0.7.0-incubating release

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master bf5258b57 -> 69714b92c


Website updates for 0.7.0-incubating release


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

Branch: refs/heads/master
Commit: 48ea19c9619989f483977b79023c2d10db38f2ad
Parents: c2e55c0
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 27 17:19:05 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 27 17:19:05 2015 +0100

----------------------------------------------------------------------
 docs/_build/config-production.yml |  1 +
 docs/_config.yml                  |  5 +-
 docs/website/download/index.md    | 89 ++++++++++++++++++++++++----------
 docs/website/download/verify.md   | 59 +++++++++++++++++-----
 docs/website/meta/versions.md     | 15 ++++--
 5 files changed, 125 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48ea19c9/docs/_build/config-production.yml
----------------------------------------------------------------------
diff --git a/docs/_build/config-production.yml b/docs/_build/config-production.yml
index fe2065b..277641a 100644
--- a/docs/_build/config-production.yml
+++ b/docs/_build/config-production.yml
@@ -1,5 +1,6 @@
 # in production we always set the URL and dependencies should come from the remote source
 
 url: https://brooklyn.incubator.apache.org
+url_root: https://brooklyn.incubator.apache.org
 
 dependency_mode: remote

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48ea19c9/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index ade2bbe..f8ca5bd 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -45,10 +45,7 @@ exclude: ['/Gemfile*','/README.md']
 sass:
     sass_dir: style/css
 
-# used for the "verify" page
-brooklyn-stable-versions: [ 0.7.0-M2-incubating ]
-
-brooklyn-stable-version: 0.7.0-M2-incubating
+brooklyn-stable-version: 0.7.0-incubating
 
 brooklyn-version: 0.8.0-SNAPSHOT # BROOKLYN_VERSION
 brooklyn-snapshot-git-branch: master   # if line above is SNAPSHOT this should point to corresponding git branch (e.g. master, 0.4)

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48ea19c9/docs/website/download/index.md
----------------------------------------------------------------------
diff --git a/docs/website/download/index.md b/docs/website/download/index.md
index 08aebe0..bd6b5cd 100644
--- a/docs/website/download/index.md
+++ b/docs/website/download/index.md
@@ -6,47 +6,86 @@ children:
 - ../meta/versions.md
 ---
 
-## Latest Brooklyn Source Code Release
+<div class="row">
+<div class="col-md-6" markdown="1">
 
-[Download Apache Brooklyn {{ site.brooklyn-stable-version }} source release from our mirror sites](https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}.tar.gz)
+<div class="panel panel-default">
+  <div class="panel-heading" markdown="1">
+#### **Recommended download:** Distribution
+  </div>
+  <div class="panel-body" markdown="1">
+A pre-built package that contains Apache Brooklyn and all of its dependencies in a single, easy-to-run package. Suitable for
+Linux and Windows servers and workstations that have Java 1.7 or newer.
 
-You can also verify that you build has not been tampered with by [verifying the hashes and signatures](verify.html).
+**Choose your preferred file format to see the list of mirrors where you can download this file.**
 
+<div class="text-center">
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-bin.tar.gz" role="button">Tarball</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-bin.zip" role="button">Zip</a>
+  <br /><small>These are not direct download links, sorry</small>
+</div>
+  </div>
+</div>
 
-## Binary Releases
+</div><!-- col -->
+<div class="col-md-6" markdown="1">
 
-We do not yet have an official binary package for Apache Brooklyn. 
-For more information, and for information on unofficial binary builds,
-see the [download details for the latest version]({{ site.path.guide }}/misc/download.html).
+<div class="panel panel-default">
+  <div class="panel-heading" markdown="1">
+#### Source code
+  </div>
+  <div class="panel-body" markdown="1">
+The source code for Apache Brooklyn. Use this to build your own binaries and make private modifications. *If you want to
+contribute code changes to Apache Brooklyn, we recommend you get the source code from version control. Visit the
+[Developers pages](../developers/index.html) to find out more.*
 
+**Choose your preferred file format to see the list of mirrors where you can download this file.**
 
-## Build the Binary Package
+<div class="text-center">
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-src.tar.gz" role="button">Tarball</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-src.zip" role="button">Zip</a>
+  <br /><small>These are not direct download links, sorry</small>
+</div>
+  </div>
+</div>
 
-It is relatively easy to create the binary package from source code, if you have a working recent JDK and Maven 3.
+</div><!-- col -->
+</div><!-- row -->
 
-**1)** Unpack `apache-brooklyn-{{ site.brooklyn-stable-version }}.tar.gz`
+We also publish Maven artifacts for Apache Brooklyn. These are available from [Maven Central](https://search.maven.org/#search%7Cga%7C1%7Corg.apache.brooklyn).
 
-{% highlight bash %}
-tar xvfz apache-brooklyn-{{ site.brooklyn-stable-version }}.tar.gz
-{% endhighlight %}
+## What next?
 
-**2)** Move to the newly created `apache-brooklyn-{{ site.brooklyn-stable-version }}` folder:
+<div class="row">
+<div class="col-md-6" markdown="1">
 
-{% highlight bash %}
-cd apache-brooklyn-{{ site.brooklyn-stable-version }}
-{% endhighlight %}
+<div class="panel panel-default">
+  <div class="panel-heading" markdown="1">
+#### Verify your download
+  </div>
+  <div class="panel-body" markdown="1">
 
-**3)** Run this command in the `apache-brooklyn-{{ site.brooklyn-stable-version }}` folder:
+[Hashes and signatures](verify.html) of all our artifacts are available, if you wish to verify that they are genuine.
 
-{% highlight bash %}
-mvn clean install -DskipTests
-{% endhighlight %}
+  </div>
+</div>
 
-You should then find the binary distribution in the folder `usage/dist/target/brooklyn-dist`, or archived as `usage/dist/target/brooklyn-{{ site.brooklyn-stable-version }}-dist.tar.gz`.
+</div><!-- col -->
+<div class="col-md-6" markdown="1">
 
-**Problems?** More information on building is [here]({{ site.path.guide }}/dev/env/maven-build.html).
+<div class="panel panel-default">
+  <div class="panel-heading" markdown="1">
+#### **Get Started!**
+  </div>
+  <div class="panel-body" markdown="1">
 
+Take a look at our guide to getting started.
 
-## Get Started!
+<div class="text-center">
+  <a class="btn btn-primary" href="{{ site.path.guide }}/start/running.html" role="button">Get Started!</a>
+</div>
 
-Take a look at the **[Get Started]({{ site.path.guide }}/start/running.html)** page.
+</div>
+
+</div><!-- col -->
+</div><!-- row -->

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48ea19c9/docs/website/download/verify.md
----------------------------------------------------------------------
diff --git a/docs/website/download/verify.md b/docs/website/download/verify.md
index df0a516..dc50906 100644
--- a/docs/website/download/verify.md
+++ b/docs/website/download/verify.md
@@ -5,7 +5,6 @@ title: Verify the Integrity of Downloads
 
 You can verify the integrity of the downloaded files using their PGP signatures or SHA-1 checksums.
 
-
 ## Verifying Hashes
 
 To verify the downloads, first get the MD5, SHA1 and/or SHA256 hashes using these links. 
@@ -18,14 +17,36 @@ so there is already reduced opportunity for anyone maliciously tampering with th
 <th colspan="3">Hashes</th>
 </tr>
 
-{% for v in site.brooklyn-stable-versions %}
 <tr>
-<td>apache-brooklyn-{{ v }}.tar.gz</td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/{{ v }}/apache-brooklyn-{{ v }}.tar.gz.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/{{ v }}/apache-brooklyn-{{ v }}.tar.gz.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/{{ v }}/apache-brooklyn-{{ v }}.tar.gz.sha256">sha256</a></td>
+<td>apache-brooklyn-0.7.0-incubating-bin.tar.gz</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.md5">md5</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.sha1">sha1</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.sha256">sha256</a></td>
+</tr>
+<tr>
+<td>apache-brooklyn-0.7.0-incubating-bin.zip</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip.md5">md5</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip.sha1">sha1</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip.sha256">sha256</a></td>
+</tr>
+<tr>
+<td>apache-brooklyn-0.7.0-incubating-src.tar.gz</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz.md5">md5</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz.sha1">sha1</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz.sha256">sha256</a></td>
+</tr>
+<tr>
+<td>apache-brooklyn-0.7.0-incubating-src.zip</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip.md5">md5</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip.sha1">sha1</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip.sha256">sha256</a></td>
+</tr>
+<tr>
+<td>apache-brooklyn-0.7.0-M2-incubating</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.md5">md5</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.sha1">sha1</a></td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.sha256">sha256</a></td>
 </tr>
-{% endfor %}
 </table>
 
 You can verify the SHA1 or SHA256 hashes easily by placing the files in the same folder as the download artifact and
@@ -43,7 +64,7 @@ md5 apache-brooklyn-{{ site.brooklyn-stable-version }}.tar.gz
 {% endhighlight %}
 
 
-### Verifying PGP Signatures using PGP or GPG
+## Verifying PGP Signatures using PGP or GPG
 
 You can download PGP/GPG signatures using these links. Note that these links are for first-class Apache
 Software Foundation mirrors so there will be reduced opportunity for tampering with these files.
@@ -58,12 +79,26 @@ Software Foundation mirrors so there will be reduced opportunity for tampering w
 <td><a href="https://www.apache.org/dist/incubator/brooklyn/KEYS">KEYS</a></td>
 </tr>
 
-{% for v in site.brooklyn-stable-versions %}
 <tr>
-<td>apache-brooklyn-{{ site.brooklyn-stable-version }}.tar.gz.asc</td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}.tar.gz.asc">asc</a></td>
+<td>apache-brooklyn-0.7.0-incubating-bin.tar.gz</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz.asc">asc</a></td>
+</tr>
+<tr>
+<td>apache-brooklyn-0.7.0-incubating-bin.zip</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip.asc">asc</a></td>
+</tr>
+<tr>
+<td>apache-brooklyn-0.7.0-incubating-src.tar.gz</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz.asc">asc</a></td>
+</tr>
+<tr>
+<td>apache-brooklyn-0.7.0-incubating-src.zip</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip.asc">asc</a></td>
+</tr>
+<tr>
+<td>apache-brooklyn-0.7.0-M2-incubating.tar.gz</td>
+<td><a href="https://www.apache.org/dist/incubator/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.asc">asc</a></td>
 </tr>
-{% endfor %}
 
 </table>
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48ea19c9/docs/website/meta/versions.md
----------------------------------------------------------------------
diff --git a/docs/website/meta/versions.md b/docs/website/meta/versions.md
index b295040..b853110 100644
--- a/docs/website/meta/versions.md
+++ b/docs/website/meta/versions.md
@@ -16,9 +16,18 @@ This documentation was generated {{ site.time | date_to_string }}.
 
 ### Version History
 
-Apache versions:
-
-* **[0.7.0-M2-incubating](/v/0.7.0-M2-incubating/)**: YAML, persistence, Chef, Windows, Docker. The first Apache release! (Dec 2014)
+Apache Brooklyn has made the following releases (links are to the user guides):
+
+* **[0.7.0-incubating](/v/0.7.0-incubating/)**: New policies, more clouds, improved Windows support and many other improvements. Apache-endorsed binary release! (July 2015)
+  * [User guide](/v/0.7.0-incubating/), download via mirrors
+    &laquo;<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.tar.gz">bin.tar.gz</a>&raquo;
+    &laquo;<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-bin.zip">bin.zip</a>&raquo;
+    &laquo;<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.tar.gz">src.tar.gz</a>&raquo;
+    &laquo;<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-0.7.0-incubating/apache-brooklyn-0.7.0-incubating-src.zip">src.zip</a>&raquo;
+
+* **[0.7.0-M2-incubating](/v/0.7.0-M2-incubating/)**: YAML, persistence, Chef, Windows, Docker. The first Apache release! (December 2014)
+  * [User guide](/v/0.7.0-M2-incubating/), download via mirrors
+    &laquo;<a href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz">src.tar.gz</a>&raquo;
 
 * **[0.7.0-SNAPSHOT](/v/0.7.0-SNAPSHOT/)**: bleeding-edge (not voted on or endorsed by Apache!)

[2/2] incubator-brooklyn git commit: This closes #773

Posted by al...@apache.org.
This closes #773


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

Branch: refs/heads/master
Commit: 69714b92cee0cc32301ca8b96de66c8cabb9eabe
Parents: bf5258b 48ea19c
Author: Aled Sage <al...@gmail.com>
Authored: Mon Jul 27 18:01:54 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Jul 27 18:01:54 2015 +0100

----------------------------------------------------------------------
 docs/_build/config-production.yml |  1 +
 docs/_config.yml                  |  5 +-
 docs/website/download/index.md    | 89 ++++++++++++++++++++++++----------
 docs/website/download/verify.md   | 59 +++++++++++++++++-----
 docs/website/meta/versions.md     | 15 ++++--
 5 files changed, 125 insertions(+), 44 deletions(-)
----------------------------------------------------------------------