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 2015/12/12 01:21:51 UTC

svn commit: r1719606 - in /brooklyn/site: download/index.html download/verify.html index.html meta/sitemap.html meta/versions.html style/js/catalog/items.js

Author: richard
Date: Sat Dec 12 00:21:50 2015
New Revision: 1719606

URL: http://svn.apache.org/viewvc?rev=1719606&view=rev
Log:
Update Brooklyn website - source repo commit ID ed928a5

Modified:
    brooklyn/site/download/index.html
    brooklyn/site/download/verify.html
    brooklyn/site/index.html
    brooklyn/site/meta/sitemap.html
    brooklyn/site/meta/versions.html
    brooklyn/site/style/js/catalog/items.js

Modified: brooklyn/site/download/index.html
URL: http://svn.apache.org/viewvc/brooklyn/site/download/index.html?rev=1719606&r1=1719605&r2=1719606&view=diff
==============================================================================
--- brooklyn/site/download/index.html (original)
+++ brooklyn/site/download/index.html Sat Dec 12 00:21:50 2015
@@ -377,8 +377,8 @@ under the License.
         <p><strong>Choose your preferred file format to see the list of mirrors where you can download this file.</strong></p>
 
         <div class="text-center">
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz" role="button">Tarball</a>
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip" role="button">Zip</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz" role="button">Tarball</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip" role="button">Zip</a>
   <br /><small>These are not direct download links, sorry</small>
 </div>
       </div>
@@ -401,8 +401,8 @@ contribute code changes to Apache Brookl
         <p><strong>Choose your preferred file format to see the list of mirrors where you can download this file.</strong></p>
 
         <div class="text-center">
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz" role="button">Tarball</a>
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip" role="button">Zip</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz" role="button">Tarball</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip" role="button">Zip</a>
   <br /><small>These are not direct download links, sorry</small>
 </div>
       </div>

Modified: brooklyn/site/download/verify.html
URL: http://svn.apache.org/viewvc/brooklyn/site/download/verify.html?rev=1719606&r1=1719605&r2=1719606&view=diff
==============================================================================
--- brooklyn/site/download/verify.html (original)
+++ brooklyn/site/download/verify.html Sat Dec 12 00:21:50 2015
@@ -376,57 +376,57 @@ so there is already reduced opportunity
 
 <tr>
 <td>apache-brooklyn-0.8.0-incubating-bin.tar.gz</td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha256">sha256</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.md5">md5</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha1">sha1</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.tar.gz.sha256">sha256</a></td>
 </tr>
 <tr>
 <td>apache-brooklyn-0.8.0-incubating-bin.zip</td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha256">sha256</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.md5">md5</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha1">sha1</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-bin.zip.sha256">sha256</a></td>
 </tr>
 <tr>
 <td>apache-brooklyn-0.8.0-incubating-src.tar.gz</td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha256">sha256</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.md5">md5</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha1">sha1</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.tar.gz.sha256">sha256</a></td>
 </tr>
 <tr>
 <td>apache-brooklyn-0.8.0-incubating-src.zip</td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.md5">md5</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha1">sha1</a></td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha256">sha256</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.md5">md5</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha1">sha1</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/apache-brooklyn-0.8.0-incubating/apache-brooklyn-0.8.0-incubating-src.zip.sha256">sha256</a></td>
 </tr>
 <tr>
 <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>
+<td><a href="https://www.apache.org/dist/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/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/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>
+<td><a href="https://www.apache.org/dist/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/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/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>
+<td><a href="https://www.apache.org/dist/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/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/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>
+<td><a href="https://www.apache.org/dist/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/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/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>
+<td><a href="https://www.apache.org/dist/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/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/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.sha256">sha256</a></td>
 </tr>
 </table>
 
@@ -452,28 +452,28 @@ Software Foundation mirrors so there wil
 </tr>
 <tr>
 <td>Release Manager's public keys</td>
-<td><a href="https://www.apache.org/dist/incubator/brooklyn/KEYS">KEYS</a></td>
+<td><a href="https://www.apache.org/dist/brooklyn/KEYS">KEYS</a></td>
 </tr>
 
 <tr>
 <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>
+<td><a href="https://www.apache.org/dist/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>
+<td><a href="https://www.apache.org/dist/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>
+<td><a href="https://www.apache.org/dist/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>
+<td><a href="https://www.apache.org/dist/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>
+<td><a href="https://www.apache.org/dist/brooklyn/0.7.0-M2-incubating/apache-brooklyn-0.7.0-M2-incubating.tar.gz.asc">asc</a></td>
 </tr>
 
 </table>

Modified: brooklyn/site/index.html
URL: http://svn.apache.org/viewvc/brooklyn/site/index.html?rev=1719606&r1=1719605&r2=1719606&view=diff
==============================================================================
--- brooklyn/site/index.html (original)
+++ brooklyn/site/index.html Sat Dec 12 00:21:50 2015
@@ -404,7 +404,7 @@ under the License.
 <div style="text-align: center">
 
     <p><a class="btn btn-primary btn-lg" role="button" href="learnmore/">learn more</a>
-<a class="btn btn-primary btn-lg" role="button" href="/v/latest/start/concept-quickstart.html">get started</a></p>
+<a class="btn btn-primary btn-lg" role="button" href="/v/latest/guide/start/running.md">get started</a></p>
 
   </div>
 

Modified: brooklyn/site/meta/sitemap.html
URL: http://svn.apache.org/viewvc/brooklyn/site/meta/sitemap.html?rev=1719606&r1=1719605&r2=1719606&view=diff
==============================================================================
--- brooklyn/site/meta/sitemap.html (original)
+++ brooklyn/site/meta/sitemap.html Sat Dec 12 00:21:50 2015
@@ -1138,6 +1138,22 @@ under the License.
 
 
 
+<a id="guide/yaml/blueprinting-tips.md" name="guide/yaml/blueprinting-tips.md" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/yaml/blueprinting-tips.html">Blueprinting Tips</a>
+  
+ 
+</li>
+
+    
+     
+     
+
+
+
+
+
 <a id="guide/yaml/custom-entities.md" name="guide/yaml/custom-entities.md" href="javascript:void(0);"></a>
 <li>
  
@@ -1314,6 +1330,22 @@ under the License.
 
 
 
+<a id="guide/yaml/advanced-example.md" name="guide/yaml/advanced-example.md" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/yaml/advanced-example.html">YAML BLueprint Advanced Example</a>
+  
+ 
+</li>
+
+    
+     
+     
+
+
+
+
+
 <a id="guide/yaml/yaml-reference.md" name="guide/yaml/yaml-reference.md" href="javascript:void(0);"></a>
 <li>
  
@@ -1556,10 +1588,142 @@ under the License.
 
 
 
-<a id="guide/ops/cli-reference.md" name="guide/ops/cli-reference.md" href="javascript:void(0);"></a>
+<a id="guide/ops/server-cli-reference.md" name="guide/ops/server-cli-reference.md" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/ops/server-cli-reference.html">Server CLI Reference</a>
+  
+ 
+</li>
+
+    
+     
+     
+
+
+
+
+
+<a id="guide/ops/gui/index.md" name="guide/ops/gui/index.md" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/ops/gui/index.html">GUI Guide</a>
+  
+   
+   <ul>
+    
+    
+    
+     
+     
+
+
+
+
+
+<a id="guide/ops/gui/running.md" name="guide/ops/gui/running.md" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/ops/gui/running.html">Launching</a>
+  
+ 
+</li>
+
+    
+     
+     
+
+
+
+
+
+<a id="guide/ops/gui/blueprints.md" name="guide/ops/gui/blueprints.md" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/ops/gui/blueprints.html">Deploying Blueprints</a>
+  
+   
+   <ul>
+    
+    
+    
+     
+     
+
+
+
+
+ 
+
+
+<a name="" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/ops/gui/blueprints.html#launching-from-a-blueprint">Launching from a Blueprint</a>
+  
+ 
+</li>
+
+    
+     
+     
+
+
+
+
+ 
+
+
+<a name="" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/ops/gui/blueprints.html#launching-from-the-catalog">Launching from the Catalog</a>
+  
+ 
+</li>
+
+    
+    
+   </ul>
+  
+ 
+</li>
+
+    
+     
+     
+
+
+
+
+
+<a id="guide/ops/gui/managing.md" name="guide/ops/gui/managing.md" href="javascript:void(0);"></a>
 <li>
  
-  <a href="/v/latest/ops/cli-reference.html">CLI Reference</a>
+  <a href="/v/latest/ops/gui/managing.html">Monitoring and Managing Applications</a>
+  
+ 
+</li>
+
+    
+     
+     
+
+
+
+
+
+<a id="guide/ops/gui/policies.md" name="guide/ops/gui/policies.md" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/ops/gui/policies.html">Using Policies</a>
+  
+ 
+</li>
+
+    
+    
+   </ul>
   
  
 </li>
@@ -2304,6 +2468,22 @@ under the License.
 
 
 
+<a id="guide/ops/security-guidelines.md" name="guide/ops/security-guidelines.md" href="javascript:void(0);"></a>
+<li>
+ 
+  <a href="/v/latest/ops/security-guidelines.html">Security Guidelines</a>
+  
+ 
+</li>
+
+    
+     
+     
+
+
+
+
+
 <a id="guide/ops/troubleshooting/index.md" name="guide/ops/troubleshooting/index.md" href="javascript:void(0);"></a>
 <li>
  
@@ -2698,22 +2878,6 @@ under the License.
 
 
 
-
-<a id="guide/dev/rest/rest-api-doc.md" name="guide/dev/rest/rest-api-doc.md" href="javascript:void(0);"></a>
-<li>
- 
-  <a href="/v/latest/dev/rest/rest-api-doc.html">REST API Documentation</a>
-  
- 
-</li>
-
-    
-     
-     
-
-
-
-
  
 
 
@@ -2747,46 +2911,6 @@ under the License.
  
 </li>
 
-    
-    
-   </ul>
-  
- 
-</li>
-
-    
-     
-     
-
-
-
-
-
-<a id="guide/test/index.md" name="guide/test/index.md" href="javascript:void(0);"></a>
-<li>
- 
-  <a href="/v/latest/test/index.html">QA Test Framework</a>
-  
-   
-   <ul>
-    
-    
-    
-     
-     
-
-
-
-
-
-<a id="guide/test/entities.md" name="guide/test/entities.md" href="javascript:void(0);"></a>
-<li>
- 
-  <a href="/v/latest/test/entities.html">Entities</a>
-  
- 
-</li>
-
     
     
    </ul>

Modified: brooklyn/site/meta/versions.html
URL: http://svn.apache.org/viewvc/brooklyn/site/meta/versions.html?rev=1719606&r1=1719605&r2=1719606&view=diff
==============================================================================
--- brooklyn/site/meta/versions.html (original)
+++ brooklyn/site/meta/versions.html Sat Dec 12 00:21:50 2015
@@ -370,7 +370,7 @@ under the License.
   <li><a href="/v/latest/misc/release-notes.html">Release Notes</a></li>
 </ul>
 
-<p>This documentation was generated 23 Nov 2015.</p>
+<p>This documentation was generated 12 Dec 2015.</p>
 
 <h2 id="version-history">Version History</h2>
 

Modified: brooklyn/site/style/js/catalog/items.js
URL: http://svn.apache.org/viewvc/brooklyn/site/style/js/catalog/items.js?rev=1719606&r1=1719605&r2=1719606&view=diff
==============================================================================
--- brooklyn/site/style/js/catalog/items.js (original)
+++ brooklyn/site/style/js/catalog/items.js Sat Dec 12 00:21:50 2015
@@ -551,7 +551,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -1240,7 +1240,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.failureDetector",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$ZoneFailureDetector",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@2cd59385",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@15e75a48",
       "description" : "Zone failure detector",
       "reconfigurable" : false,
       "label" : null,
@@ -1250,7 +1250,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.placementStrategy",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$NodePlacementStrategy",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@7059890d",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@ba20523",
       "description" : "Node placement strategy",
       "reconfigurable" : false,
       "label" : null,
@@ -1434,6 +1434,11 @@ var items = {
       "description" : "Set on an entity if it is a member of a cluster",
       "links" : { }
     }, {
+      "name" : "cluster.one_and_all.members.up",
+      "type" : "java.lang.Boolean",
+      "description" : "True cluster is running, there is on member, and all members are service.isUp",
+      "links" : { }
+    }, {
       "name" : "datastore.url",
       "type" : "java.lang.String",
       "description" : "Primary contact URL for a datastore (e.g. mysql://localhost:3306/)",
@@ -2315,7 +2320,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -2392,6 +2397,16 @@ var items = {
       "priority" : null,
       "possibleValues" : null,
       "links" : null
+    }, {
+      "name" : "thriftMonitoring.enabled",
+      "type" : "java.lang.Boolean",
+      "defaultValue" : true,
+      "description" : "Thrift-port monitoring enabled",
+      "reconfigurable" : false,
+      "label" : null,
+      "priority" : null,
+      "possibleValues" : null,
+      "links" : null
     } ],
     "sensors" : [ {
       "name" : "cassandra.cluster.name",
@@ -3267,7 +3282,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -4075,7 +4090,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -5059,7 +5074,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -6103,7 +6118,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.failureDetector",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$ZoneFailureDetector",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@2cd59385",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@15e75a48",
       "description" : "Zone failure detector",
       "reconfigurable" : false,
       "label" : null,
@@ -6113,7 +6128,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.placementStrategy",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$NodePlacementStrategy",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@7059890d",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@ba20523",
       "description" : "Node placement strategy",
       "reconfigurable" : false,
       "label" : null,
@@ -6182,6 +6197,11 @@ var items = {
       "description" : "Set on an entity if it is a member of a cluster",
       "links" : { }
     }, {
+      "name" : "cluster.one_and_all.members.up",
+      "type" : "java.lang.Boolean",
+      "description" : "True cluster is running, there is on member, and all members are service.isUp",
+      "links" : { }
+    }, {
       "name" : "coucbase.cluster.actualClusterSize",
       "type" : "java.lang.Integer",
       "description" : "returns the actual number of nodes in the cluster",
@@ -6873,7 +6893,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -7696,7 +7716,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -8123,7 +8143,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.failureDetector",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$ZoneFailureDetector",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@2cd59385",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@15e75a48",
       "description" : "Zone failure detector",
       "reconfigurable" : false,
       "label" : null,
@@ -8133,7 +8153,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.placementStrategy",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$NodePlacementStrategy",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@7059890d",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@ba20523",
       "description" : "Node placement strategy",
       "reconfigurable" : false,
       "label" : null,
@@ -8312,6 +8332,11 @@ var items = {
       "description" : "Set on an entity if it is a member of a cluster",
       "links" : { }
     }, {
+      "name" : "cluster.one_and_all.members.up",
+      "type" : "java.lang.Boolean",
+      "description" : "True cluster is running, there is on member, and all members are service.isUp",
+      "links" : { }
+    }, {
       "name" : "dynamiccluster.entityQuarantined",
       "type" : "org.apache.brooklyn.api.entity.Entity",
       "description" : "Entity failed to start, and has been quarantined",
@@ -8690,7 +8715,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.failureDetector",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$ZoneFailureDetector",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@2cd59385",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@15e75a48",
       "description" : "Zone failure detector",
       "reconfigurable" : false,
       "label" : null,
@@ -8700,7 +8725,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.placementStrategy",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$NodePlacementStrategy",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@7059890d",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@ba20523",
       "description" : "Node placement strategy",
       "reconfigurable" : false,
       "label" : null,
@@ -8779,6 +8804,11 @@ var items = {
       "description" : "Set on an entity if it is a member of a cluster",
       "links" : { }
     }, {
+      "name" : "cluster.one_and_all.members.up",
+      "type" : "java.lang.Boolean",
+      "description" : "True cluster is running, there is on member, and all members are service.isUp",
+      "links" : { }
+    }, {
       "name" : "dynamiccluster.entityQuarantined",
       "type" : "org.apache.brooklyn.api.entity.Entity",
       "description" : "Entity failed to start, and has been quarantined",
@@ -9295,7 +9325,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -10086,7 +10116,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -10624,6 +10654,16 @@ var items = {
       "possibleValues" : null,
       "links" : null
     }, {
+      "name" : "httpMonitoring.enabled",
+      "type" : "java.lang.Boolean",
+      "defaultValue" : true,
+      "description" : "HTTP(S) monitoring enabled",
+      "reconfigurable" : false,
+      "label" : null,
+      "priority" : null,
+      "possibleValues" : null,
+      "links" : null
+    }, {
       "name" : "https.port",
       "type" : "org.apache.brooklyn.api.location.PortRange",
       "defaultValue" : "8443,18443-65535",
@@ -10876,7 +10916,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -11869,7 +11909,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -12899,7 +12939,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -13552,7 +13592,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -14227,7 +14267,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -14866,7 +14906,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -15117,6 +15157,16 @@ var items = {
       } ],
       "links" : null
     }, {
+      "name" : "clientMonitoring.enabled",
+      "type" : "java.lang.Boolean",
+      "defaultValue" : true,
+      "description" : "Monitoring via the MongoDB client enabled",
+      "reconfigurable" : false,
+      "label" : null,
+      "priority" : null,
+      "possibleValues" : null,
+      "links" : null
+    }, {
       "name" : "customize.latch",
       "type" : "java.lang.Boolean",
       "defaultValue" : null,
@@ -15519,7 +15569,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -16303,7 +16353,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -16625,7 +16675,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.failureDetector",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$ZoneFailureDetector",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@2cd59385",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@15e75a48",
       "description" : "Zone failure detector",
       "reconfigurable" : false,
       "label" : null,
@@ -16635,7 +16685,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.placementStrategy",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$NodePlacementStrategy",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@7059890d",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@ba20523",
       "description" : "Node placement strategy",
       "reconfigurable" : false,
       "label" : null,
@@ -16804,6 +16854,11 @@ var items = {
       "description" : "Set on an entity if it is a member of a cluster",
       "links" : { }
     }, {
+      "name" : "cluster.one_and_all.members.up",
+      "type" : "java.lang.Boolean",
+      "description" : "True cluster is running, there is on member, and all members are service.isUp",
+      "links" : { }
+    }, {
       "name" : "datastore.url",
       "type" : "java.lang.String",
       "description" : "Primary contact URL for a datastore (e.g. mysql://localhost:3306/)",
@@ -17370,7 +17425,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -17900,7 +17955,7 @@ var items = {
     }, {
       "name" : "nginx.config.generator",
       "type" : "org.apache.brooklyn.entity.proxy.nginx.NginxConfigFileGenerator",
-      "defaultValue" : "org.apache.brooklyn.entity.proxy.nginx.NginxDefaultConfigGenerator@2d359fa5",
+      "defaultValue" : "org.apache.brooklyn.entity.proxy.nginx.NginxDefaultConfigGenerator@52a194f3",
       "description" : "The server.conf generator class",
       "reconfigurable" : false,
       "label" : null,
@@ -18180,7 +18235,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -18887,7 +18942,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -19630,7 +19685,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -20392,7 +20447,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -21035,7 +21090,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -21629,7 +21684,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -21981,7 +22036,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.failureDetector",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$ZoneFailureDetector",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@2cd59385",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@15e75a48",
       "description" : "Zone failure detector",
       "reconfigurable" : false,
       "label" : null,
@@ -21991,7 +22046,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.placementStrategy",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$NodePlacementStrategy",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@7059890d",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@ba20523",
       "description" : "Node placement strategy",
       "reconfigurable" : false,
       "label" : null,
@@ -22070,6 +22125,11 @@ var items = {
       "description" : "Set on an entity if it is a member of a cluster",
       "links" : { }
     }, {
+      "name" : "cluster.one_and_all.members.up",
+      "type" : "java.lang.Boolean",
+      "description" : "True cluster is running, there is on member, and all members are service.isUp",
+      "links" : { }
+    }, {
       "name" : "dynamiccluster.entityQuarantined",
       "type" : "org.apache.brooklyn.api.entity.Entity",
       "description" : "Entity failed to start, and has been quarantined",
@@ -22434,6 +22494,16 @@ var items = {
       "possibleValues" : null,
       "links" : null
     }, {
+      "name" : "httpMonitoring.enabled",
+      "type" : "java.lang.Boolean",
+      "defaultValue" : true,
+      "description" : "HTTP(S) monitoring enabled",
+      "reconfigurable" : false,
+      "label" : null,
+      "priority" : null,
+      "possibleValues" : null,
+      "links" : null
+    }, {
       "name" : "install.dir",
       "type" : "java.lang.String",
       "defaultValue" : "${config['onbox.base.dir']!config['brooklyn.datadir']!'/<ERROR>-ONBOX_BASE_DIR-not-set'}/installs/${(config['install.unique_label']??)?string(config['install.unique_label']!'X',(entity.entityType.simpleName)+((config['install.version']??)?string('_'+(config['install.version']!'X'),'')))}",
@@ -22786,7 +22856,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -23718,7 +23788,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -24040,7 +24110,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.failureDetector",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$ZoneFailureDetector",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@2cd59385",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@15e75a48",
       "description" : "Zone failure detector",
       "reconfigurable" : false,
       "label" : null,
@@ -24050,7 +24120,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.placementStrategy",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$NodePlacementStrategy",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@7059890d",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@ba20523",
       "description" : "Node placement strategy",
       "reconfigurable" : false,
       "label" : null,
@@ -24159,6 +24229,11 @@ var items = {
       "description" : "Set on an entity if it is a member of a cluster",
       "links" : { }
     }, {
+      "name" : "cluster.one_and_all.members.up",
+      "type" : "java.lang.Boolean",
+      "description" : "True cluster is running, there is on member, and all members are service.isUp",
+      "links" : { }
+    }, {
       "name" : "dynamiccluster.entityQuarantined",
       "type" : "org.apache.brooklyn.api.entity.Entity",
       "description" : "Entity failed to start, and has been quarantined",
@@ -24870,7 +24945,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -25745,7 +25820,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -26688,7 +26763,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -27473,7 +27548,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -28161,7 +28236,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -28699,7 +28774,7 @@ var items = {
     }, {
       "name" : "softwareProcess.lifecycleTasks",
       "type" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks",
-      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@5fdb8570",
+      "defaultValue" : "org.apache.brooklyn.entity.software.base.SoftwareProcessDriverLifecycleEffectorTasks@478f38cf",
       "description" : "An object that handles lifecycle of an entity's associated machine.",
       "reconfigurable" : false,
       "label" : null,
@@ -29086,7 +29161,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.failureDetector",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$ZoneFailureDetector",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@2cd59385",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.ProportionalZoneFailureDetector@15e75a48",
       "description" : "Zone failure detector",
       "reconfigurable" : false,
       "label" : null,
@@ -29096,7 +29171,7 @@ var items = {
     }, {
       "name" : "dynamiccluster.zone.placementStrategy",
       "type" : "org.apache.brooklyn.entity.group.DynamicCluster$NodePlacementStrategy",
-      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@7059890d",
+      "defaultValue" : "org.apache.brooklyn.entity.group.zoneaware.BalancingNodePlacementStrategy@ba20523",
       "description" : "Node placement strategy",
       "reconfigurable" : false,
       "label" : null,
@@ -29175,6 +29250,11 @@ var items = {
       "description" : "Set on an entity if it is a member of a cluster",
       "links" : { }
     }, {
+      "name" : "cluster.one_and_all.members.up",
+      "type" : "java.lang.Boolean",
+      "description" : "True cluster is running, there is on member, and all members are service.isUp",
+      "links" : { }
+    }, {
       "name" : "dynamiccluster.entityQuarantined",
       "type" : "org.apache.brooklyn.api.entity.Entity",
       "description" : "Entity failed to start, and has been quarantined",
@@ -29301,7 +29381,7 @@ var items = {
     "config" : [ {
       "name" : "autoscaler.currentSizeOperator",
       "type" : "com.google.common.base.Function",
-      "defaultValue" : "org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy$4@cd43f55",
+      "defaultValue" : "org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy$4@38c34fe5",
       "description" : null,
       "reconfigurable" : false,
       "label" : null,
@@ -29461,7 +29541,7 @@ var items = {
     }, {
       "name" : "autoscaler.resizeOperator",
       "type" : "org.apache.brooklyn.policy.autoscaling.ResizeOperator",
-      "defaultValue" : "org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy$3@6ce6e1b1",
+      "defaultValue" : "org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy$3@50dd833e",
       "description" : null,
       "reconfigurable" : false,
       "label" : null,
@@ -30255,6 +30335,16 @@ var items = {
       "possibleValues" : null,
       "links" : null
     }, {
+      "name" : "pollForFirstReachableAddress",
+      "type" : "java.lang.String",
+      "defaultValue" : "5m",
+      "description" : "Whether and how long to wait for reaching the VM's ip:port; if 'false', will default to the node's first public IP (or privae if no public IPs); if 'true' uses default duration; otherwise accepts a time string e.g. '5m' (the default) or a number of milliseconds",
+      "reconfigurable" : false,
+      "label" : null,
+      "priority" : null,
+      "possibleValues" : null,
+      "links" : null
+    }, {
       "name" : "private-key-data",
       "type" : "java.lang.String",
       "defaultValue" : null,
@@ -31287,7 +31377,7 @@ var items = {
     }, {
       "name" : "imageChooser",
       "type" : "com.google.common.base.Function",
-      "defaultValue" : "org.apache.brooklyn.location.jclouds.BrooklynImageChooser$ImageChooserFromOrdering@5379a4b8",
+      "defaultValue" : "org.apache.brooklyn.location.jclouds.BrooklynImageChooser$ImageChooserFromOrdering@28f4a2f8",
       "description" : "An image chooser function to control which images are preferred",
       "reconfigurable" : false,
       "label" : null,
@@ -31357,7 +31447,7 @@ var items = {
     }, {
       "name" : "jclouds.computeServiceRegistry",
       "type" : "org.apache.brooklyn.location.jclouds.ComputeServiceRegistry",
-      "defaultValue" : "org.apache.brooklyn.location.jclouds.ComputeServiceRegistryImpl@5d635c88",
+      "defaultValue" : "org.apache.brooklyn.location.jclouds.ComputeServiceRegistryImpl@5869bd25",
       "description" : "Registry/Factory for creating jclouds ComputeService; default is almost always fine, except where tests want to customize behaviour",
       "reconfigurable" : false,
       "label" : null,
@@ -31805,6 +31895,16 @@ var items = {
       "possibleValues" : null,
       "links" : null
     }, {
+      "name" : "pollForFirstReachableAddress",
+      "type" : "java.lang.String",
+      "defaultValue" : "5m",
+      "description" : "Whether and how long to wait for reaching the VM's ip:port; if 'false', will default to the node's first public IP (or privae if no public IPs); if 'true' uses default duration; otherwise accepts a time string e.g. '5m' (the default) or a number of milliseconds",
+      "reconfigurable" : false,
+      "label" : null,
+      "priority" : null,
+      "possibleValues" : null,
+      "links" : null
+    }, {
       "name" : "portforwarding.enabled",
       "type" : "java.lang.Boolean",
       "defaultValue" : false,
@@ -32543,7 +32643,7 @@ var items = {
       "name" : "password",
       "type" : "java.lang.String",
       "defaultValue" : null,
-      "description" : "Password to use when connecting to the remote machine",
+      "description" : "Password to use to connect",
       "reconfigurable" : false,
       "label" : null,
       "priority" : null,
@@ -32623,7 +32723,7 @@ var items = {
       "name" : "user",
       "type" : "java.lang.String",
       "defaultValue" : null,
-      "description" : "Username to use when connecting to the remote machine",
+      "description" : "User to connect as",
       "reconfigurable" : false,
       "label" : null,
       "priority" : null,
@@ -32649,6 +32749,16 @@ var items = {
       "priority" : null,
       "possibleValues" : null,
       "links" : null
+    }, {
+      "name" : "winrmToolClass",
+      "type" : "java.lang.String",
+      "defaultValue" : null,
+      "description" : "WinRmTool implementation to use (or null for default)",
+      "reconfigurable" : false,
+      "label" : null,
+      "priority" : null,
+      "possibleValues" : null,
+      "links" : null
     } ],
     "sensors" : [ ],
     "effectors" : [ ]
@@ -33463,7 +33573,7 @@ var items = {
       "name" : "password",
       "type" : "java.lang.String",
       "defaultValue" : null,
-      "description" : "Password to use when connecting to the remote machine",
+      "description" : "Password to use to connect",
       "reconfigurable" : false,
       "label" : null,
       "priority" : null,
@@ -33543,7 +33653,7 @@ var items = {
       "name" : "user",
       "type" : "java.lang.String",
       "defaultValue" : null,
-      "description" : "Username to use when connecting to the remote machine",
+      "description" : "User to connect as",
       "reconfigurable" : false,
       "label" : null,
       "priority" : null,
@@ -33567,6 +33677,16 @@ var items = {
       "reconfigurable" : false,
       "label" : null,
       "priority" : null,
+      "possibleValues" : null,
+      "links" : null
+    }, {
+      "name" : "winrmToolClass",
+      "type" : "java.lang.String",
+      "defaultValue" : null,
+      "description" : "WinRmTool implementation to use (or null for default)",
+      "reconfigurable" : false,
+      "label" : null,
+      "priority" : null,
       "possibleValues" : null,
       "links" : null
     } ],