[01/10] brooklyn-docs git commit: Renamed files & scripts

2016-02-25 Thread aledsage 
Repository: brooklyn-docs
Updated Branches:
  refs/heads/master 7d24e76b3 -> c87b43fbb


Renamed files & scripts


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/70c731f4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/70c731f4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/70c731f4

Branch: refs/heads/master
Commit: 70c731f48844907615f2e82b7cfcfe359da86ca3
Parents: 5985336
Author: Duncan Godwin 
Authored: Mon Feb 8 12:10:32 2016 +
Committer: Duncan Godwin 
Committed: Thu Feb 25 14:50:25 2016 +

--
 README.md  |  2 ++
 _build/build.sh|  4 ++--
 _config.yml|  7 ++-
 singlePageManual.html  | 26 --
 singlePageStarted.html | 25 -
 zoneMergeManual.html   | 28 
 zoneMergeStarted.html  | 27 +++
 7 files changed, 65 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/README.md
--
diff --git a/README.md b/README.md
index 9f2465b..5b6cf54 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ Some issues we've encountered are:
(more details 
[here](http://www.nokogiri.org/tutorials/installing_nokogiri.html))
  * on Ubuntu, `sudo apt-get install libxslt-dev libxml2-dev`
 
+If you are building the PDF documentation, this requires 
[wkhtmltopdf](http://wkhtmltopdf.org/). 
+You can download it from [here](http://wkhtmltopdf.org/downloads.html) or use 
the usual apt-get / yum / brew.
 
 Seeing the Website and Docs
 ---

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/_build/build.sh
--
diff --git a/_build/build.sh b/_build/build.sh
index ee3d331..7b734d5 100755
--- a/_build/build.sh
+++ b/_build/build.sh
@@ -191,10 +191,10 @@ function build_pdf() {
   PDF_STARTED_LOG="_pdf/pdf_gen_started.log"
   
   if [ "$SKIP_PDF_MANUAL" != "true" ]; then
-_build/buildPDF.sh "_site/singlePageManual.html" "_pdf/UserManual.pdf" 
2>&1 | tee $PDF_MANUAL_LOG
+_build/buildPDF.sh "_site/zoneMergeManual.html" "_pdf/UserManual.pdf" 2>&1 
| tee $PDF_MANUAL_LOG
   fi
   if [ "$SKIP_PDF_STARTED" != "true" ]; then
-_build/buildPDF.sh "_site/singlePageStarted.html" 
"_pdf/GettingStarted.pdf" 2>&1 | tee $PDF_STARTED_LOG
+_build/buildPDF.sh "_site/zoneMergeStarted.html" "_pdf/GettingStarted.pdf" 
2>&1 | tee $PDF_STARTED_LOG
   fi
 }
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/_config.yml
--
diff --git a/_config.yml b/_config.yml
index 7b634b2..bb44fb5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,7 +29,7 @@ path:
   guide: /guide
   website: /website
   v: /v
-
+  
 # Use local copies of dependencies in dev build (switched to remote using URLs 
for prod build)
 dependency_mode: local
 dependency_urls:
@@ -46,7 +46,12 @@ sass:
 sass_dir: style/css
 
 brooklyn-stable-version: 0.8.0-incubating
+brooklyn-base-url: https://brooklyn.apache.org
 
+pdf-rewrite-prefixes: 
+'/guide' : '/v/0.9.0-SNAPSHOT'
+'/website' : ''
+
 brooklyn-version: 0.9.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/brooklyn-docs/blob/70c731f4/singlePageManual.html
--
diff --git a/singlePageManual.html b/singlePageManual.html
deleted file mode 100644
index bfdfa69..000
--- a/singlePageManual.html
+++ /dev/null
@@ -1,26 +0,0 @@

-title: Apache Brooklyn Manual
-layout: singlePage
-page_mask: usermanual-pdf-exclude

-   
-   
-   Apache Brooklyn: User Manual
-   
-   Contents
-   
-   
- {% assign visited = "" | split: "|" %}
- {% for node in site.data.menu  %}
- {% push site_items node %}
- {% include singlepage-item.html %}
- {% endfor %}
-   
-
-   {% assign visitedb = "" | split: "|" %}
-   {% for node in site.data.menu  %}
- {% push site_items node %}
- {% include singlepage-content.html %}
- {% endfor %}
- 
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/70c731f4/singlePageStarted.html
--

[10/10] brooklyn-docs git commit: This closes #4

2016-02-25 Thread aledsage 
This closes #4


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

Branch: refs/heads/master
Commit: c87b43fbb638a52651b12a5843890bf8b90f8d2d
Parents: 7d24e76 f78c5e9
Author: Aled Sage 
Authored: Thu Feb 25 15:39:16 2016 +
Committer: Aled Sage 
Committed: Thu Feb 25 15:39:16 2016 +

--
 .gitignore |   1 +
 README.md  |   2 +
 _build/build.sh|  36 ++
 _build/buildPDF.sh |  28 +
 _config.yml|   8 +-
 _includes/singlepage-content.html  |  51 +
 _includes/singlepage-item.html |  41 +++
 _layouts/singlePage.html   |  30 +
 _plugins/regex_filter.rb   | 118 
 _plugins/stringTools.rb|  35 ++
 guide/concepts/stop-start-restart-behaviour.md |   4 +-
 guide/dev/index.md |   1 +
 guide/java/index.md|   1 +
 guide/misc/index.md|   1 +
 guide/ops/index.md |   1 +
 guide/start/blueprints.md  |   8 +-
 guide/start/index.md   |   1 +
 guide/start/managing.md|  24 ++--
 guide/start/running.md |  15 ++-
 style/css/singlePage.css   |  56 ++
 website/community/index.md |   2 +
 website/developers/index.md|   1 +
 website/documentation/index.md |   1 +
 website/download/index.md  |   2 +
 website/learnmore/blueprint-tour.md|   1 +
 website/learnmore/catalog/catalog-item.html|   2 +
 website/learnmore/catalog/index.html   |   2 +
 website/learnmore/index.md |   1 +
 website/meta/sitemap.md|   1 +
 website/meta/versions.md   |   1 +
 zoneMergeManual.html   |  31 +
 zoneMergeStarted.html  |  31 +
 32 files changed, 519 insertions(+), 19 deletions(-)
--

[03/10] brooklyn-docs git commit: Combine Brooklyn docs into single page/pdf - for review

2016-02-25 Thread aledsage 
Combine Brooklyn docs into single page/pdf - for review


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

Branch: refs/heads/master
Commit: cbdf51d17705284d40736087fae2f3fd9eeec14c
Parents: 7d24e76
Author: Duncan Godwin 
Authored: Tue Feb 2 11:03:42 2016 +
Committer: Duncan Godwin 
Committed: Thu Feb 25 14:50:25 2016 +

--
 .gitignore|  1 +
 _build/build.sh   | 28 +---
 _build/buildPDF.sh| 25 ++
 _includes/singlepage-content.html | 59 ++
 _includes/singlepage-item.html| 46 ++
 _layouts/singlePage.html  | 15 +
 _plugins/regex_filter.rb  | 12 +++
 guide/dev/index.md|  1 +
 guide/java/index.md   |  1 +
 guide/misc/index.md   |  1 +
 guide/ops/index.md|  1 +
 guide/start/index.md  |  1 +
 singlePageManual.html | 26 +++
 singlePageStarted.html| 26 +++
 website/community/index.md|  2 ++
 website/developers/index.md   |  1 +
 website/documentation/index.md|  1 +
 website/learnmore/index.md|  1 +
 website/meta/sitemap.md   |  1 +
 website/meta/versions.md  |  1 +
 20 files changed, 246 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/cbdf51d1/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 806a062..97a4608 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ brooklyn*.log.*
 
 ignored
 _site
+_pdf
 _config_local.yml
 .sass-cache
 style/js/catalog/items.js

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/cbdf51d1/_build/build.sh
--
diff --git a/_build/build.sh b/_build/build.sh
index b4c8f15..1438424 100755
--- a/_build/build.sh
+++ b/_build/build.sh
@@ -31,9 +31,10 @@ function help() {
   echo "* --skip-javadoc : to skip javadoc build"
   echo "* --quick-javadoc : to do a quick javadoc build (for testing)"
   echo "* --serve : serve files from _site after building (for testing)"
-  echo "* --install : install files from _site to the appropriate place in 
"'$'"BROOKLYN_SITE_DIR (or ../../brooklyn-site-public)"
+  echo "* --install : install files from _site to the appropriate place in 
"'$'"BROOKLYN_SITE_DIR (or ../../incubator-brooklyn-site-public)"
   echo "* --skip-htmlproof : skip the HTML Proof run on _site"
   echo "* --quick-htmlproof : do a fast HTML Proof run on _site (not checking 
external links)"
+  echo "* --skip-pdf : skip generation of the PDF Documentation"
   echo ""
 }
 
@@ -156,6 +157,10 @@ function parse_arguments() {
   QUICK_HTMLPROOF=true
   shift
   ;;
+"--skip-pdf")
+  SKIP_PDF=true
+  shift
+  ;;
 *)
   echo "ERROR: invalid argument '"$1"'"
   exit 1
@@ -165,12 +170,25 @@ function parse_arguments() {
 }
 
 # Runs htmlproof against _site
+function build_pdf() {
+  if [ "$SKIP_PDF" == "true" ]; then
+return
+  fi
+  echo "Running PDF Generation on _site/UserManual.html"
+  rm -rf _pdf
+  mkdir -p _pdf
+  PDF_MANUAL_LOG="_pdf/pdf_gen_manual.log"
+  PDF_STARTED_LOG="_pdf/pdf_gen_started.log"
+  _build/buildPDF.sh "_site/singlePageManual.html" "_pdf/UserManual.pdf" 2>&1 
| tee $PDF_MANUAL_LOG
+  _build/buildPDF.sh "_site/singlePageStarted.html" "_pdf/GettingStarted.pdf" 
2>&1 | tee $PDF_STARTED_LOG
+}
+
+# Runs htmlproof against _site
 function test_site() {
   if [ "$SKIP_HTMLPROOF" == "true" ]; then
 return
   fi
   echo "Running htmlproof on _site"
-  mkdir -p _build/target
   HTMLPROOF_LOG="_build/target/htmlproof.log"
   if [ "$QUICK_HTMLPROOF" == "true" ]; then
 HTMLPROOF_OPTS="$HTMLPROOF_OPTS --disable_external"
@@ -250,8 +268,8 @@ function make_install() {
   fi
   if [ ! -z ${QUICK_JAVADOC+SET} ]; then echo "ERROR: --install not permitted 
when doing quick javadoc" ; return 1 ; fi
 
-  SITE_DIR=${BROOKLYN_SITE_DIR-../../brooklyn-site-public}
-  ls $SITE_DIR/style/img/apache-brooklyn-logo-244px-wide.png > /dev/null || { 
echo "ERROR: cannot find brooklyn-site-public; set BROOKLYN_SITE_DIR" ; return 
1 ; }
+  SITE_DIR=${BROOKLYN_SITE_DIR-../../incubator-brooklyn-site-public}
+  ls $SITE_DIR/style/img/apache-brooklyn-logo-244px-wide.png > /dev/null || { 
echo "ERROR: cannot find incubator-brooklyn-site-public; set BROOKLYN_SITE_DIR" 
; return 1 ; }
   if [ -z

[07/10] brooklyn-docs git commit: Updates to spacing and script

2016-02-25 Thread aledsage 
Updates to spacing and script


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

Branch: refs/heads/master
Commit: b6ae8329c7aa8b11c703b0748e84e9e5b586287a
Parents: de1d17f
Author: Duncan Godwin 
Authored: Mon Feb 22 13:58:07 2016 +
Committer: Duncan Godwin 
Committed: Thu Feb 25 14:52:55 2016 +

--
 _build/buildPDF.sh   |  9 ---
 style/css/singlePage.css | 60 +--
 zoneMergeManual.html | 32 +++
 zoneMergeStarted.html| 31 +++---
 4 files changed, 67 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b6ae8329/_build/buildPDF.sh
--
diff --git a/_build/buildPDF.sh b/_build/buildPDF.sh
index a3d1196..a41ca69 100755
--- a/_build/buildPDF.sh
+++ b/_build/buildPDF.sh
@@ -7,14 +7,15 @@ if [ ! -x _build/build.sh ] ; then
   exit 1
 fi
 
-if [ "$#" -lt 2 ] ; then
+if [ "$#" -ne 2 ] ; then
echo "Usage: buildPDF.sh  "
exit 1
 fi
 
-command -v wkhtmltopdf >/dev/null 2>&1 || { 
-   echo "ERROR: script requires wkhtmltopdf but it's not installed." >&2; 
exit 1;
-   }
+if ! command -v wkhtmltopdf >/dev/null 2>&1; then
+   echo "ERROR: script requires wkhtmltopdf but it's not installed."
+   exit 1
+fi

 # run the PDF build with wkhtmltopdf
 wkhtmltopdf --page-size Letter --margin-top 0.75in --margin-right 0.75in 
--margin-bottom 0.75in --margin-left 0.75in --encoding UTF-8 $1 $2

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b6ae8329/style/css/singlePage.css
--
diff --git a/style/css/singlePage.css b/style/css/singlePage.css
index 0517ddb..07d7395 100644
--- a/style/css/singlePage.css
+++ b/style/css/singlePage.css
@@ -1,56 +1,56 @@
 /* Fix the bootstrap parts so they show the content not the controls*/
 .nav.nav-tabs{
-   display: none;
+  display: none;
 }
 .tab-content > .tab-pane {
-display: inline;
+  display: inline;
 }
 .fade {
-opacity: 1;
+  opacity: 1;
 }
 #next, *[id$='_next']{
-   display: none;
+  display: none;
 }
 .collapse {
-display: block;
+  display: block;
 }
 .section-breaker {
-   page-break-before:always;
+  page-break-before:always;
 }
 .panel-heading{
-   padding-bottom: 15px;
+  padding-bottom: 15px;
 }
 /* The styled bootstrap panels */
 .panel-body, .panel-default{
-   background: none;
-   border: 0px solid #fff !important;
-   box-shadow: none;
-   padding: 0px;
+  background: none;
+  border: 0px solid #fff !important;
+  box-shadow: none;
+  padding: 0px;
 }
 .panel-default > .panel-heading{
-   background: none;
-   border: 0px solid #fff !important;
-   box-shadow: none;
-   padding-top: 0px;
-   padding-right: 0px;
-   padding-left: 0px;
+  background: none;
+  border: 0px solid #fff !important;
+  box-shadow: none;
+  padding-top: 0px;
+  padding-right: 0px;
+  padding-left: 0px;
 }
 pre, pre code{
-   overflow: auto;
-   white-space: pre-wrap;   /* CSS 3 */
-white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-white-space: -pre-wrap;  /* Opera 4-6 */
-white-space: -o-pre-wrap;/* Opera 7 */
-word-wrap: break-word;   /* Internet Explorer 5.5+ */
+  overflow: auto;
+  white-space: pre-wrap;   /* CSS 3 */
+  white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+  white-space: -pre-wrap;  /* Opera 4-6 */
+  white-space: -o-pre-wrap;/* Opera 7 */
+  word-wrap: break-word;   /* Internet Explorer 5.5+ */
 }
 .goToTop{
-   padding-right: 25px;
-padding-top: 75px;
-   float: right;
-font-size: 20pt;
-font-weight: bold;
+  padding-right: 25px;
+  padding-top: 75px;
+  float: right;
+  font-size: 20pt;
+  font-weight: bold;
 }
 #content_container h1{
-   display: inline-block;
-   width: 95%;
+  display: inline-block;
+  width: 95%;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b6ae8329/zoneMergeManual.html
--
diff --git a/zoneMergeManual.html b/zoneMergeManual.html
index 89c57f1..d1b8e6e 100644
--- a/zoneMergeManual.html
+++ b/zoneMergeManual.html
@@ -8,24 +8,24 @@ availablePages: []
 ---
 {% comment %}{% endcomment %}
 
-   
+

Apache Brooklyn: User Manual

-   Contents
+   Contents

-   
-

[09/10] brooklyn-docs git commit: Exclusion and style updates

2016-02-25 Thread aledsage 
Exclusion and style updates


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

Branch: refs/heads/master
Commit: de1d17fc53254e12d93765debbbfc120cdb1c3ec
Parents: ad3cad8
Author: Duncan Godwin 
Authored: Wed Feb 10 09:34:13 2016 +
Committer: Duncan Godwin 
Committed: Thu Feb 25 14:52:55 2016 +

--
 style/css/singlePage.css| 2 +-
 website/download/index.md   | 2 ++
 website/learnmore/catalog/catalog-item.html | 2 ++
 website/learnmore/catalog/index.html| 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/de1d17fc/style/css/singlePage.css
--
diff --git a/style/css/singlePage.css b/style/css/singlePage.css
index f8f14f6..0517ddb 100644
--- a/style/css/singlePage.css
+++ b/style/css/singlePage.css
@@ -8,7 +8,7 @@
 .fade {
 opacity: 1;
 }
-#next{
+#next, *[id$='_next']{
display: none;
 }
 .collapse {

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/de1d17fc/website/download/index.md
--
diff --git a/website/download/index.md b/website/download/index.md
index 077e068..c4fc01e 100644
--- a/website/download/index.md
+++ b/website/download/index.md
@@ -1,6 +1,8 @@
 ---
 layout: website-normal
 title: Download
+started-pdf-exclude: true
+usermanual-pdf-exclude: true
 children:
 - { path: /guide/misc/download.md, title: Details }
 - { path: verify.md, title: Verify }

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/de1d17fc/website/learnmore/catalog/catalog-item.html
--
diff --git a/website/learnmore/catalog/catalog-item.html 
b/website/learnmore/catalog/catalog-item.html
index abff4c4..f0e0108 100644
--- a/website/learnmore/catalog/catalog-item.html
+++ b/website/learnmore/catalog/catalog-item.html
@@ -1,5 +1,7 @@
 ---
 title: Catalog
+page_mask: usermanual-pdf-exclude
+page_mask: started-pdf-exclude
 ---

[08/10] brooklyn-docs git commit: Style updates & jump to top

2016-02-25 Thread aledsage 
Style updates & jump to top


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

Branch: refs/heads/master
Commit: ad3cad8266f56cef6c276100c06eab4cd6459d9c
Parents: f3c06f5
Author: Duncan Godwin 
Authored: Tue Feb 9 15:49:38 2016 +
Committer: Duncan Godwin 
Committed: Thu Feb 25 14:52:55 2016 +

--
 _includes/singlepage-content.html |  3 +--
 style/css/singlePage.css  | 11 +++
 zoneMergeManual.html  |  2 +-
 zoneMergeStarted.html |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ad3cad82/_includes/singlepage-content.html
--
diff --git a/_includes/singlepage-content.html 
b/_includes/singlepage-content.html
index 7d24206..5fadfe2 100644
--- a/_includes/singlepage-content.html
+++ b/_includes/singlepage-content.html
@@ -16,13 +16,12 @@
 {% capture pid %}{{ item.title | remove:'/' | replace:' ','-' | 
downcase }}{% endcapture %}
 {% if item_content != null %}

-   {{ item_title }}
+   {{ item_title }}^
{% comment %}

{% endcomment %}
-   
{% comment %}{% endcomment %}
{% capture page_url %}{{ item_url | replace_regex:'[^\/]*$', '' }}{% 
endcapture %}


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ad3cad82/style/css/singlePage.css
--
diff --git a/style/css/singlePage.css b/style/css/singlePage.css
index 4b03262..f8f14f6 100644
--- a/style/css/singlePage.css
+++ b/style/css/singlePage.css
@@ -42,4 +42,15 @@ pre, pre code{
 white-space: -pre-wrap;  /* Opera 4-6 */
 white-space: -o-pre-wrap;/* Opera 7 */
 word-wrap: break-word;   /* Internet Explorer 5.5+ */
+}
+.goToTop{
+   padding-right: 25px;
+padding-top: 75px;
+   float: right;
+font-size: 20pt;
+font-weight: bold;
+}
+#content_container h1{
+   display: inline-block;
+   width: 95%;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ad3cad82/zoneMergeManual.html
--
diff --git a/zoneMergeManual.html b/zoneMergeManual.html
index 3111d01..89c57f1 100644
--- a/zoneMergeManual.html
+++ b/zoneMergeManual.html
@@ -10,7 +10,7 @@ availablePages: []
 


-   Apache Brooklyn: User Manual
+   Apache Brooklyn: User Manual

Contents


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ad3cad82/zoneMergeStarted.html
--
diff --git a/zoneMergeStarted.html b/zoneMergeStarted.html
index 3cc0e3a..3cf4710 100644
--- a/zoneMergeStarted.html
+++ b/zoneMergeStarted.html
@@ -10,7 +10,7 @@ availablePages: []
 


-   Apache Brooklyn: Getting Started Guide
+   Apache Brooklyn: Getting Started Guide

Contents

[02/10] brooklyn-docs git commit: Updated single page theme

2016-02-25 Thread aledsage 
Updated single page theme


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

Branch: refs/heads/master
Commit: 598533648ef48da07ecdedc45c5d37a0a97dc7fa
Parents: 247a1b5
Author: Duncan Godwin 
Authored: Fri Feb 5 11:56:35 2016 +
Committer: Duncan Godwin 
Committed: Thu Feb 25 14:50:25 2016 +

--
 _build/build.sh| 21 ++--
 _includes/singlepage-content.html  | 32 +
 _includes/singlepage-item.html | 14 ++--
 _layouts/singlePage.html   |  8 +
 _plugins/stringTools.rb| 26 ++
 guide/concepts/stop-start-restart-behaviour.md |  4 +--
 guide/start/blueprints.md  |  2 +-
 guide/start/running.md |  2 +-
 singlePageManual.html  |  6 ++--
 singlePageStarted.html |  5 ++-
 style/css/singlePage.css   | 38 +
 website/learnmore/blueprint-tour.md|  1 +
 12 files changed, 121 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/59853364/_build/build.sh
--
diff --git a/_build/build.sh b/_build/build.sh
index 6081145..ee3d331 100755
--- a/_build/build.sh
+++ b/_build/build.sh
@@ -34,7 +34,9 @@ function help() {
   echo "* --install : install files from _site to the appropriate place in 
"'$'"BROOKLYN_SITE_DIR (or ../../brooklyn-site-public)"
   echo "* --skip-htmlproof : skip the HTML Proof run on _site"
   echo "* --quick-htmlproof : do a fast HTML Proof run on _site (not checking 
external links)"
-  echo "* --skip-pdf : skip generation of the PDF Documentation"
+  echo "* --skip-pdf : skip generation of all PDF Documentation"
+  echo "* --skip-pdf-manual : skip generation of the PDF Manual"
+  echo "* --skip-pdf-started : skip generation of the Getting Started PDF"
   echo ""
 }
 
@@ -161,6 +163,14 @@ function parse_arguments() {
   SKIP_PDF=true
   shift
   ;;
+"--skip-pdf-manual")
+  SKIP_PDF_MANUAL=true
+  shift
+  ;;
+"--skip-pdf-started")
+  SKIP_PDF_STARTED=true
+  shift
+  ;;
 *)
   echo "ERROR: invalid argument '"$1"'"
   exit 1
@@ -179,8 +189,13 @@ function build_pdf() {
   mkdir -p _pdf
   PDF_MANUAL_LOG="_pdf/pdf_gen_manual.log"
   PDF_STARTED_LOG="_pdf/pdf_gen_started.log"
-  _build/buildPDF.sh "_site/singlePageManual.html" "_pdf/UserManual.pdf" 2>&1 
| tee $PDF_MANUAL_LOG
-  _build/buildPDF.sh "_site/singlePageStarted.html" "_pdf/GettingStarted.pdf" 
2>&1 | tee $PDF_STARTED_LOG
+  
+  if [ "$SKIP_PDF_MANUAL" != "true" ]; then
+_build/buildPDF.sh "_site/singlePageManual.html" "_pdf/UserManual.pdf" 
2>&1 | tee $PDF_MANUAL_LOG
+  fi
+  if [ "$SKIP_PDF_STARTED" != "true" ]; then
+_build/buildPDF.sh "_site/singlePageStarted.html" 
"_pdf/GettingStarted.pdf" 2>&1 | tee $PDF_STARTED_LOG
+  fi
 }
 
 # Runs htmlproof against _site

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/59853364/_includes/singlepage-content.html
--
diff --git a/_includes/singlepage-content.html 
b/_includes/singlepage-content.html
index 4b10bf8..18fc1b7 100644
--- a/_includes/singlepage-content.html
+++ b/_includes/singlepage-content.html
@@ -1,5 +1,5 @@
 {% pop site_items item %}
-{% if item[pageMask] != true %}
+{% if item[page.page_mask] != true %}

{% set_hash_entry item path item_path %}
{% set_hash_entry item url item_url %}
@@ -7,15 +7,6 @@
{% set_hash_entry item title item_title %}
{% set_hash_entry item id item_id %}

-   {% unless item_path %}
-{% unless item_url %}
- {% puts error, null item_url %}
- {% putp item %}
- {% putv item_url %}
- {% fail item missing path and url (jekyll block evaluation order can 
cause this) %}
-{% endunless %}
-   {% endunless %}
-   
 {% if visitedb contains item_title %}
  {% comment %}  {% endcomment %}
 {% elsif item['external'] %}
@@ -24,7 +15,7 @@
 {% else %}
 {% capture pid %}{{ item.title | remove:'/' | replace:' ','-' | 
downcase }}{% endcapture %}
 {% if item_content != null %}
-   
+   
{{ item_title }}
{% comment %}
{% endcomment %}
{% capture page_url %}{{ item_url | replace_regex:'[^\/]*$', '' }}{% 
endcapture %}
-   {%

[1/2] brooklyn-server git commit: Revert winrmPort sensor in VanillaWindowsProcess

2016-02-25 Thread aledsage 
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 798fbbbd0 -> 972854a8c


Revert winrmPort sensor in VanillaWindowsProcess

- rename RDP_PORT and WINRM_PORT to values
  keeping the .port configuration convention


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

Branch: refs/heads/master
Commit: fba4412e2bfe26a6da045a079b48bba663c691f2
Parents: 5b01f8f
Author: Valentin Aitken 
Authored: Mon Feb 15 12:04:03 2016 +0200
Committer: Valentin Aitken 
Committed: Thu Feb 18 15:16:41 2016 +0200

--
 .../software/base/VanillaWindowsProcess.java| 24 +---
 .../base/VanillaWindowsProcessImpl.java |  4 
 .../util/core/internal/winrm/WinRmTool.java |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fba4412e/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
--
diff --git 
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
 
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
index eb64063..0e6673c 100644
--- 
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
+++ 
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java
@@ -103,7 +103,25 @@ public interface VanillaWindowsProcess extends 
AbstractVanillaProcess {
 // TODO If automatic updates are enabled and there are updates waiting to 
be installed, thirty minutes may not be sufficient...
 ConfigKey REBOOT_COMPLETED_TIMEOUT = 
ConfigKeys.newDurationConfigKey("reboot.completed.timeout",
 "duration to wait whilst waiting for a machine to finish 
rebooting, and thus to become available again", Duration.minutes(30));
-
-AttributeSensor RDP_PORT = Sensors.newIntegerSensor("rdpPort");
-AttributeSensor WINRM_PORT = 
Sensors.newIntegerSensor(WinRmTool.PROP_PORT.getName());
+
+AttributeSensor RDP_PORT = Sensors.newIntegerSensor("rdp.port", 
"RDP port used by the machine of this entity.");
+AttributeSensor WINRM_PORT = 
Sensors.newIntegerSensor("winrm.port", "WinRM port used by the machine of this 
entity.");
+
+/**
+ * @deprecated since 0.9.0; use {@link #RDP_PORT} instead.
+ */
+@Deprecated
+AttributeSensor RDP_PORT_CAMEL_CASE = 
Sensors.newIntegerSensor("rdpPort", "[DEPRECATED] instead use 'rdp.port'");
+
+/**
+ * @deprecated since 0.9.0; use {@link #WINRM_PORT} instead.
+ */
+@Deprecated
+AttributeSensor WINRM_PORT_CAMEL_CASE = 
Sensors.newIntegerSensor("winrmPort", "[DEPRECATED] instead use 'winrm.port'");
+
+/**
+ * @deprecated since 0.9.0; use {@link #WINRM_PORT} instead.
+ */
+@Deprecated
+AttributeSensor WINRM_PORT_SHORTEN = 
Sensors.newIntegerSensor("port", "[DEPRECATED] instead use 'winrm.port'");
 }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fba4412e/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcessImpl.java
--
diff --git 
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcessImpl.java
 
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcessImpl.java
index b6a7d0e..c3e0aa2 100644
--- 
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcessImpl.java
+++ 
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcessImpl.java
@@ -33,9 +33,13 @@ public class VanillaWindowsProcessImpl extends 
SoftwareProcessImpl implements Va
 protected void preStart() {
 super.preStart();
 sensors().set(RDP_PORT, 3389);
+sensors().set(RDP_PORT_CAMEL_CASE, 3389);
+
 WinRmMachineLocation loc = 
Iterables.getFirst(Iterables.filter(getLocations(), 
WinRmMachineLocation.class), null);
 if (loc != null) {
 sensors().set(WINRM_PORT, loc.getPort());
+sensors().set(WINRM_PORT_SHORTEN, loc.getPort());
+sensors().set(WINRM_PORT_CAMEL_CASE, loc.getPort());
 }
 }
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fba4412e/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/WinRmTool.java
--
diff --git