You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/12/22 14:47:48 UTC
[5/8] incubator-brooklyn git commit: link to repo GUI *and* to dir,
simplify (a bit) how url's are computed, and tidy guide downloads page
link to repo GUI *and* to dir, simplify (a bit) how url's are computed, and tidy guide downloads page
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bc543411
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bc543411
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bc543411
Branch: refs/heads/master
Commit: bc5434112d02c1bf9b31ecd1611a2df4dd250fc0
Parents: 5bf2807
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Dec 19 01:16:24 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Dec 19 11:44:10 2014 +0000
----------------------------------------------------------------------
docs/_includes/fields.md | 14 ++++++++------
docs/guide/start/download.md | 28 ++++++++++++++++++----------
2 files changed, 26 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bc543411/docs/_includes/fields.md
----------------------------------------------------------------------
diff --git a/docs/_includes/fields.md b/docs/_includes/fields.md
index 5089b74..10ac024 100644
--- a/docs/_includes/fields.md
+++ b/docs/_includes/fields.md
@@ -14,21 +14,23 @@
{% capture apache_snapshots_repo_groupid_url %}{{ this_repo_base_url }}/content/repositories/snapshots/{{ brooklyn_group_id_path }}{% endcapture %}
{% capture apache_releases_repo_groupid_url %}{{ this_repo_base_url }}/content/repositories/releases/{{ brooklyn_group_id_path }}{% endcapture %}
+{% capture this_repo_base_url_content %}{{ apache_snapshots_repo_groupid_url }}{% endcapture %}
+{% capture this_dist_url_list %}{{ this_repo_base_url_content }}/brooklyn-dist/{{ site.brooklyn-version }}/{% endcapture %}
+{% capture this_alljar_url_list %}{{ this_repo_base_url_content }}/brooklyn-all/{{ site.brooklyn-version }}/{% endcapture %}
+
{% if SNAPSHOT %}
- {% capture this_repo_base_url_content %}{{ apache_snapshots_repo_groupid_url }}{% endcapture %}
{% capture this_dist_url_zip %}{{ this_repo_base_url_artifact }}?r=snapshots&g={{ brooklyn_group_id }}&a=brooklyn-dist&v={{ site.brooklyn-version }}&e=zip&c=dist{% endcapture %}
{% capture this_dist_url_tgz %}{{ this_repo_base_url_artifact }}?r=snapshots&g={{ brooklyn_group_id }}&a=brooklyn-dist&v={{ site.brooklyn-version }}&e=tgz&c=dist{% endcapture %}
{% capture this_alljar_url_jar %}{{ this_repo_base_url_artifact }}?r=snapshots&g={{ brooklyn_group_id }}&a=brooklyn-all&v={{ site.brooklyn-version }}&e=jar&c=with-dependencies{% endcapture %}
{% else %}<!--- RELEASE -->
- {% capture this_repo_base_url_content %}{{ apache_releases_repo_groupid_url }}{% endcapture %}
- {% capture this_dist_url_zip %}{{ this_repo_base_url_content }}/brooklyn-dist/{{ site.brooklyn-version }}/brooklyn-dist-{{ site.brooklyn-version }}-dist.zip{% endcapture %}
- {% capture this_dist_url_tgz %}{{ this_repo_base_url_content }}/brooklyn-dist/{{ site.brooklyn-version }}/brooklyn-dist-{{ site.brooklyn-version }}-dist.tar.gz{% endcapture %}
- {% capture this_alljar_url_jar %}{{ this_repo_base_url_content }}/brooklyn-all/{{ site.brooklyn-version }}/brooklyn-all-{{ site.brooklyn-version }}-with-dependencies.jar{% endcapture %}
+ {% capture this_dist_url_zip %}{{ this_dist_url_list }}/brooklyn-dist-{{ site.brooklyn-version }}-dist.zip{% endcapture %}
+ {% capture this_dist_url_tgz %}{{ this_dist_url_list }}/brooklyn-dist-{{ site.brooklyn-version }}-dist.tar.gz{% endcapture %}
+ {% capture this_alljar_url_jar %}{{ this_alljar_url_list }}/brooklyn-all-{{ site.brooklyn-version }}-with-dependencies.jar{% endcapture %}
{% endif %}
{% capture this_anything_url_search %}{{ this_repo_base_url_search }};gav~{{ brooklyn_group_id }}~~{{ site.brooklyn-version }}~~{% endcapture %}
{% capture this_dist_url_search %}{{ this_repo_base_url_search }};gav~{{ brooklyn_group_id }}~brooklyn-dist~{{ site.brooklyn-version }}~~{% endcapture %}
-{% capture this_dist_url_search %}{{ this_repo_base_url_search }};gav~{{ brooklyn_group_id }}~brooklyn-all~{{ site.brooklyn-version }}~~{% endcapture %}
+{% capture this_alljar_url_search %}{{ this_repo_base_url_search }};gav~{{ brooklyn_group_id }}~brooklyn-all~{{ site.brooklyn-version }}~~{% endcapture %}
<!-- OLD things -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bc543411/docs/guide/start/download.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/download.md b/docs/guide/start/download.md
index 08ea26f..34e07ff 100644
--- a/docs/guide/start/download.md
+++ b/docs/guide/start/download.md
@@ -30,14 +30,18 @@ First time user? The [getting started]({{ site.path.guide }}/use/guide/quickstar
<td><small><a href='{{ this_alljar_url_jar }}.asc'>PGP</a>, <a href='{{ this_alljar_url_jar }}.sha1'>SHA1</a></small></td>
</tr>
<tr>
- <td style='text-align:left'>Other Variants</td>
- <td style='text-align:left'><a href='{{ this_anything_url_search }}' title='Other Variants'><i>listing</i></a></td>
- <td> - </td>
+ <td style='text-align:left'>Apache Repo</td>
+ <td style='text-align:left'>
+ <a href='{{ this_anything_url_search }}' title='Search'><i>GUI</i></a>
+ —
+ <a href='{{ this_dist_url_list }}' title='List'><i>dir</i></a>
+ </td>
+ <td> — </td>
</tr>
<tr>
- <td style='text-align:left'>Release notes</td>
+ <td style='text-align:left'>Release Notes</td>
<td style='text-align:left'><a href='{{ site.path.guide }}/start/release-notes.html'>{{ site.brooklyn-version }}</a></td>
- <td> - </td>
+ <td> — </td>
</tr>
</table>
@@ -99,7 +103,11 @@ A good example to start with is the [Elastic Web Cluster]({{site.path.guide}}/us
If you use Maven, you can add Brooklyn with the following in your pom:
+<!-- the comment is included due to a jekyll/highlight bug which
+ removes indentation on the first line in a highlight block;
+ we want the actual XML indented so you can cut and paste into a pom.xml sensibly -->
{% highlight xml %}
+<!-- include all Brooklyn items in our project -->
<dependencies>
<dependency>
<groupId>org.apache.brooklyn</groupId>
@@ -118,13 +126,9 @@ If you wish to use the Apache snapshot repo and/or Cloudsoft repositories,
you can add some of the following sections:
{% highlight xml %}
+<!-- include repos for snapshot items and other dependencies -->
<repositories>
<repository>
- <id>cloudsoft-cloudfront-releases-repo</id>
- <url>http://developers.cloudsoftcorp.com/maven/releases/</url>
- </repository>
- <!-- optional for snapshot versions -->
- <repository>
<id>apache-nexus-snapshots</id>
<name>Apache Nexus Snapshots</name>
<url>https://repository.apache.org/content/repositories/snapshots</url>
@@ -132,6 +136,10 @@ you can add some of the following sections:
<snapshots> <enabled>true</enabled> </snapshots>
</repository>
<repository>
+ <id>cloudsoft-cloudfront-releases-repo</id>
+ <url>http://developers.cloudsoftcorp.com/maven/releases/</url>
+ </repository>
+ <repository>
<id>cloudsoft-cloudfront-snapshots-repo</id>
<url>http://developers.cloudsoftcorp.com/maven/snapshots/</url>
<snapshots>