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/01/09 16:38:49 UTC
[07/36] incubator-brooklyn git commit: Cherry-pick merge of PR #389
into 0.7.0-M2-incubating-docs branch
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/catalog.xml
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/catalog.xml b/docs/use/guide/quickstart/catalog.xml
deleted file mode 100644
index 7a4199e..0000000
--- a/docs/use/guide/quickstart/catalog.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog>
- <name>Brooklyn Demos</name>
-
-
- <template type="brooklyn.demo.WebClusterDatabaseExample" name="Demo Web Cluster with DB">
- <description>Deploys a demonstration web application to a managed JBoss cluster with elasticity, persisting to a MySQL</description>
- <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/JBoss_by_Red_Hat.png</iconUrl>
- </template>
-
- <template type="brooklyn.demo.GlobalWebFabricExample" name="Demo GeoDNS Web Fabric DB">
- <description>Deploys a demonstration web application to JBoss clusters around the world</description>
- <iconUrl>http://downloads.cloudsoftcorp.com/brooklyn/catalog/logos/JBoss_by_Red_Hat.png</iconUrl>
- </template>
-
- <classpath>
- <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.7.0-M2-incubating&e=jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.7.0-M2-incubating&e=jar</entry> <!-- BROOKLYN_VERSION -->
- </classpath>
-
-
-</catalog>
-
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-large.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-large.png b/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-large.png
deleted file mode 100644
index b566b1a..0000000
Binary files a/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-large.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-location-large.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-location-large.png b/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-location-large.png
deleted file mode 100644
index 05e9b0c..0000000
Binary files a/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-location-large.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-location.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-location.png b/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-location.png
deleted file mode 100644
index c13fdd8..0000000
Binary files a/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db-location.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db.png b/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db.png
deleted file mode 100644
index ebb6f42..0000000
Binary files a/docs/use/guide/quickstart/images/add-application-catalog-web-cluster-with-db.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/add-application-modal-yaml.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/add-application-modal-yaml.png b/docs/use/guide/quickstart/images/add-application-modal-yaml.png
deleted file mode 100644
index c50b7ab..0000000
Binary files a/docs/use/guide/quickstart/images/add-application-modal-yaml.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/jboss7-cluster-policies-large.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/jboss7-cluster-policies-large.png b/docs/use/guide/quickstart/images/jboss7-cluster-policies-large.png
deleted file mode 100644
index 3d84477..0000000
Binary files a/docs/use/guide/quickstart/images/jboss7-cluster-policies-large.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/jboss7-cluster-policies.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/jboss7-cluster-policies.png b/docs/use/guide/quickstart/images/jboss7-cluster-policies.png
deleted file mode 100644
index 2f85328..0000000
Binary files a/docs/use/guide/quickstart/images/jboss7-cluster-policies.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/my-db-activities-large.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/my-db-activities-large.png b/docs/use/guide/quickstart/images/my-db-activities-large.png
deleted file mode 100644
index c214d9e..0000000
Binary files a/docs/use/guide/quickstart/images/my-db-activities-large.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/my-db-activities.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/my-db-activities.png b/docs/use/guide/quickstart/images/my-db-activities.png
deleted file mode 100644
index 0f2327c..0000000
Binary files a/docs/use/guide/quickstart/images/my-db-activities.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/my-web-cluster-starting.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/my-web-cluster-starting.png b/docs/use/guide/quickstart/images/my-web-cluster-starting.png
deleted file mode 100644
index c389b0b..0000000
Binary files a/docs/use/guide/quickstart/images/my-web-cluster-starting.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/my-web-cluster-stop-confirm-large.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/my-web-cluster-stop-confirm-large.png b/docs/use/guide/quickstart/images/my-web-cluster-stop-confirm-large.png
deleted file mode 100644
index c9bdab6..0000000
Binary files a/docs/use/guide/quickstart/images/my-web-cluster-stop-confirm-large.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/my-web-cluster-stop-confirm.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/my-web-cluster-stop-confirm.png b/docs/use/guide/quickstart/images/my-web-cluster-stop-confirm.png
deleted file mode 100644
index 179b00a..0000000
Binary files a/docs/use/guide/quickstart/images/my-web-cluster-stop-confirm.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/my-web-summary-large.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/my-web-summary-large.png b/docs/use/guide/quickstart/images/my-web-summary-large.png
deleted file mode 100644
index fc4bffe..0000000
Binary files a/docs/use/guide/quickstart/images/my-web-summary-large.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/my-web-summary.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/my-web-summary.png b/docs/use/guide/quickstart/images/my-web-summary.png
deleted file mode 100644
index e85752f..0000000
Binary files a/docs/use/guide/quickstart/images/my-web-summary.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/images/my-web.png
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/images/my-web.png b/docs/use/guide/quickstart/images/my-web.png
deleted file mode 100644
index 2bd6ac3..0000000
Binary files a/docs/use/guide/quickstart/images/my-web.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/index.md
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/index.md b/docs/use/guide/quickstart/index.md
deleted file mode 100644
index b8042bf..0000000
--- a/docs/use/guide/quickstart/index.md
+++ /dev/null
@@ -1,221 +0,0 @@
----
-title: Getting Started
-layout: page
-toc: ../guide_toc.json
-categories: [use, guide]
----
-
-{% include fields.md %}
-
-This guide will walk you through deploying an application to a public cloud.
-
-We will be deploying an example 3-tier web application, described using this blueprint:
-
-{% highlight yaml %}
-{% readj my-web-cluster.yaml %}
-{% endhighlight %}
-
-(This is written in YAML, following the [camp specification](https://www.oasis-open.org/committees/camp/). )
-
-
-## Install Brooklyn
-
-Download the [Brooklyn distribution]({{ this_dist_url_tgz }}) and expand it to your home directory ( `~/` ), or in a location of your choice. (Other [download options]({{site.url}}/start/download.html) are available.)
-
-{% if site.brooklyn-version contains 'SNAPSHOT' %}
-Expand the `tar.gz` archive (note: as this is a -SNAPSHOT version, your filename will be slightly different):
-{% else %}
-Expand the `tar.gz` archive:
-{% endif %}
-
-{% if site.brooklyn-version contains 'SNAPSHOT' %}
-{% highlight bash %}
-$ tar -zxf brooklyn-dist-{{ site.brooklyn-version }}-timestamp-dist.tar.gz
-{% endhighlight %}
-{% else %}
-{% highlight bash %}
-$ tar -zxf brooklyn-dist-{{ site.brooklyn-version }}-dist.tar.gz
-{% endhighlight %}
-{% endif %}
-
-This will create a `brooklyn-{{ site.brooklyn-version }}` folder.
-
-Note: You'll need a Java JRE or SDK installed (version 6 or later), as Brooklyn is Java under the covers.
-
-## Launch Brooklyn
-
-Let's setup some paths for easy commands.
-
-(Click the clipboard on these code snippets for easier c&p.)
-
-{% highlight bash %}
-$ cd brooklyn-{{ site.brooklyn-version }}
-$ BROOKLYN_DIR="$(pwd)"
-$ export PATH=$PATH:$BROOKLYN_DIR/bin/
-{% endhighlight %}
-
-We can do a quick test drive by launching Brooklyn:
-
-{% highlight bash %}
-$ brooklyn launch
-{% endhighlight %}
-
-Brooklyn will output the address of the management interface:
-
- INFO Starting brooklyn web-console on loopback interface because no security config is set
- INFO Started Brooklyn console at http://127.0.0.1:8081/, running classpath://brooklyn.war and []
-
-But before we really use Brooklyn, we need to configure security and locations.
-In particular, if you are running on a remote server, you'll notice that Brooklyn has
-bound only to the loopback device, not a public network interface, and you won't be able
-to access the server. This is for security reasons; you can override by passing `-b 0.0.0.0`,
-or once you have configured security it will automatically bind to all interfaces by default.
-
-Stop Brooklyn with ctrl-c, or in the web-browser (under "Help"), or with `kill`.
-(The PID is written to a file in the directory where you launch.)
-
-
-<a name="properties"></a>
-## Configuring Brooklyn with brooklyn.properties
-
-Brooklyn reads startup configuration from a file `~/.brooklyn/brooklyn.properties`, by default.
-You can create this from a template [brooklyn.properties](brooklyn.properties) file which you edit;
-this file can be installed with:
-
-{% highlight bash %}
-$ mkdir ~/.brooklyn
-$ cd ~/.brooklyn
-$ wget {{site.url}}/use/guide/quickstart/brooklyn.properties
-{% endhighlight %}
-
-Open this file in a text editor and follow the instructions there. The main settings are summarized below:
-
-<a name="security"></a>
-## Configuring Security
-
-To configure Brooklyn to run on a public IP address, security should be enabled.
-The simplest way is to define a user and password in `~/.brooklyn/brooklyn.properties`
-(described above):
-
- brooklyn.webconsole.security.users=admin
- brooklyn.webconsole.security.user.admin.password=s3cr3t
-
-Other modes, including LDAP, are described in this file.
-
-The other common setting is to run under https (on port 8443 by default):
-
- brooklyn.webconsole.security.https.required=true
-
-These settings require a restart to Brooklyn.
-
-
-<a name="location"></a>
-## Configuring a Location
-
-Brooklyn deploys applications to ``locations''. These locations
-can be clouds, machines with fixed IPs or localhost (for testing).
-Their configuration can be specified in `~/.brooklyn/brooklyn.properties` (described above),
-and then these locations can be easily selected within Brooklyn.
-Alternatively this information can be specified in the YAML when applications are deployed,
-without needing to set it in `brooklyn.properties`.
-
-Some sample settings for this are:
-
- brooklyn.location.jclouds.aws-ec2.identity = AKA_YOUR_ACCESS_KEY_ID
- brooklyn.location.jclouds.aws-ec2.credential = <access-key-hex-digits>
- brooklyn.location.named.aws-california = jclouds:aws-ec2:us-west-1
- brooklyn.location.named.aws-california.displayName = AWS US West 1 (CA)
-
- brooklyn.location.jclouds.softlayer.identity = username
- brooklyn.location.jclouds.softlayer.credential = <private-key-hex-digits>
- brooklyn.location.named.softlayer-dal05 = jclouds:softlayer:dal05
- brooklyn.location.named.softlayer-dal05.displayName = Softlayer Dallas
-
-If you want to test Brooklyn on localhost, follow [these instructions]({{site.url}}/use/guide/locations/)
-to ensure that your Brooklyn can access your machine.
-
-Once updated, restart Brooklyn (or reload the properties within the web GUI).
-
-
-## Launching an Application in Brooklyn
-
-There are several ways to deploy a YAML blueprint (including specifying the blueprint on the command line or submitting it via the REST API).
-
-For now, we will simply copy-and-paste the raw YAML blueprint into the web console.
-
-Open the web console ([127.0.0.1:8081](http://127.0.0.1:8081)). As Brooklyn is not currently managing any applications the 'Create Application' dialog opens automatically. Select the YAML tab.
-
-
-
-
-### Chose your Cloud / Location
-
-Edit the 'location' parameter in the YAML template (repeated below) to use the location you configured.
-
-For example, replace:
-{% highlight yaml %}
-location: location
-{% endhighlight %}
-
-with (one of):
-{% highlight yaml %}
-location: aws-ec2:us-east-1
-location: rackspace-cloudservers-us:ORD
-location: google-compute-engine:europe-west1-a
-location: localhost
-{% endhighlight %}
-
-**My Web Cluster Blueprint**
-
-{% highlight yaml %}
-{% readj my-web-cluster.yaml %}
-{% endhighlight %}
-
-Paste the modified YAML into the dialog and click 'Finish'.
-The dialog will close and Brooklyn will begin deploying your application.
-
-Your application will be shown as 'Starting' on the web console's front page.
-
-
-
-
-## Monitoring and Managing Applications
-
-Click on the application name, or open the Applications tab.
-
-We can explore the management hierarchy of the application, which will show us the entities it is composed of.
-
- * My Web Cluster (A `BasicApplication`)
- * My DB (A `MySqlNode`)
- * My Web (A `ControlledDynamicWebAppCluster`)
- * Cluster of JBoss7 Servers (A `DynamicWebAppCluster`)
- * NginxController (An `NginxController`)
-
-
-
-Clicking on the 'My Web' entity will show the Summary tab. Here we can see if the cluster is ready to serve and, when ready, grab the web address for the front of the loadbalancer.
-
-
-
-
-The Activity tab allows us to drill down into what activities each entity is currently doing or has recently done. It is possible to drill down to all child tasks, and view the commands issued, and any errors or warnings that occured.
-
-Drill into the 'My DB' start operation. Working down through 'Start (processes)', then 'launch', we can discover the ssh command used including the stdin, stdout and stderr.
-
-[](images/my-db-activities-large.png)
-
-
-## Stopping the Application
-
-To stop an application, select the application in the tree view (the top/root entity), click on the Effectors tab, and invoke the 'Stop' effector. This will cleanly shutdown all components in the application and return any cloud machines that were being used.
-
-[](images/my-web-cluster-stop-confirm-large.png)
-
-
-### Next
-
-So far we have touched on Brooklyn's ability to *deploy* an application blueprint to a cloud provider, but this a very small part of Brooklyn's capabilities!
-
-Brooklyn's real power is in using Policies to automatically *manage* applications. There is also the (very useful) ability to store a catalog of application blueprints, ready to go.
-
-[Getting Started - Policies and Catalogs](policies-and-catalogs.html)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/my-web-cluster.yaml
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/my-web-cluster.yaml b/docs/use/guide/quickstart/my-web-cluster.yaml
deleted file mode 100644
index bbafa00..0000000
--- a/docs/use/guide/quickstart/my-web-cluster.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: My Web Cluster
-location: location
-services:
-
-- serviceType: brooklyn.entity.webapp.ControlledDynamicWebAppCluster
- name: My Web
- brooklyn.config:
- wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/{{ site.brooklyn-version }}/brooklyn-example-hello-world-sql-webapp-{{ site.brooklyn-version }}.war
- java.sysprops:
- brooklyn.example.db.url: >
- $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",
- component("db").attributeWhenReady("datastore.url"),
- "visitors", "brooklyn", "br00k11n")
-
-- serviceType: brooklyn.entity.database.mysql.MySqlNode
- id: db
- name: My DB
- brooklyn.config:
- creationScriptUrl: https://bit.ly/brooklyn-visitors-creation-script
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/policies-and-catalogs.md
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/policies-and-catalogs.md b/docs/use/guide/quickstart/policies-and-catalogs.md
deleted file mode 100644
index f649cf9..0000000
--- a/docs/use/guide/quickstart/policies-and-catalogs.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-title: Getting Started - Policies and Catalogs
-layout: page
-toc: ../guide_toc.json
-categories: [use, guide]
----
-
-{% include fields.md %}
-
-In the [previous step](index.html) we downloaded Brooklyn and used it to deploy an application to a cloud, but at its heart Brooklyn is a policy driven *management* plane.
-
-Here we will introduce Polices using a simple demo app, which we will load from a Service Catalog.
-
-## Service Catalogs
-
-Download the template [catalog.xml](catalog.xml) to your `~/.brooklyn/` folder, and relaunch Brooklyn.
-
-{% highlight bash %}
-$ cd ~/.brooklyn
-$ wget {{site.url}}/use/guide/quickstart/catalog.xml
-
-$ brooklyn launch
-{% endhighlight %}
-
-Now when we open the web console, two applications are displayed from the catalog.
-
-Select the 'Demo Web Cluster with DB' and click 'Next'.
-
-[](add-application-catalog-web-cluster-with-db-large.png)
-
-Select the Location that Brooklyn should deploy to, and name your application:
-
-[](images/add-application-catalog-web-cluster-with-db-location-large.png)
-
-Click 'Finish' to launch the application as before.
-
-
-### Exploring and Testing Policies
-
-The Demo Web Cluster with DB application is pre-configured with two polices.
-
-The app server cluster has an `AutoScalerPolicy`, and the loadbalancer has a `targets` policy.
-
-Use the Applications tab in the web console to drill down into the Policies section of the ControlledDynamicWebAppCluster's Cluster of JBoss7Servers.
-
-You will see that the `AutoScalerPolicy` is running.
-
-[](images/jboss7-cluster-policies-large.png)
-
-
-This policy automatically scales the cluster up or down to be the right size for the cluster's current load. (One server is the minimum size allowed by the policy.)
-
-The loadbalancer's `targets` policy ensures that the loadbalancer is updated as the cluster size changes.
-
-Sitting idle, this cluster will only contain one server, but you can use a tool like [jmeter](http://jmeter.apache.org/) pointed at the nginx endpoint to create load on the cluster. (Download a [jmeter test plan](https://github.com/brooklyncentral/brooklyn/blob/master/examples/simple-web-cluster/resources/jmeter-test-plan.jmx).)
-
-As load is added, Brooklyn requests a new cloud machine, creates a new app server, and adds it to the cluster. As load is removed, servers are removed from the cluster, and the infrastructure is handed back to the cloud.
-
-### Next
-
-The [Elastic Web Cluster Example]({{site.url}}use/examples/webcluster/index.html) page
-details how to build this demo application from scratch in Java. It shows in more detail how Brooklyn can
-complement your application with policy driven management, and how applications can be
-run from the command line.
-
-
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/quickstart/toc.json
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/toc.json b/docs/use/guide/quickstart/toc.json
deleted file mode 100644
index d65eddb..0000000
--- a/docs/use/guide/quickstart/toc.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[{ "title": "Download & Deploy",
- "file": "{{ site.url }}/use/guide/quickstart/index.html" },
-{ "title": "Policies & Catalogs",
- "file": "{{ site.url }}/use/guide/quickstart/policies-and-catalogs.html" }]
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/guide/toc.json
----------------------------------------------------------------------
diff --git a/docs/use/guide/toc.json b/docs/use/guide/toc.json
deleted file mode 100644
index 9a59b2a..0000000
--- a/docs/use/guide/toc.json
+++ /dev/null
@@ -1,25 +0,0 @@
-[
-{ "title": "Quick Start",
- "file": "{{ site.url }}/use/guide/quickstart/index.html",
- "children": {% readj ./quickstart/toc.json %} },
-{ "title": "Defining Applications",
- "file": "{{ site.url }}/use/guide/defining-applications/basic-concepts.html",
- "children": {% readj ./defining-applications/toc.json %} },
-{ "title": "Management",
- "file": "{{ site.url }}/use/guide/management/index.html" ,
- "children": {% readj ./management/toc.json %} },
-{ "title": "Persistence",
- "file": "{{ site.url }}/use/guide/persistence/index.html" ,
- "children": {% readj ./persistence/toc.json %} },
-{ "title": "Locations",
- "file": "{{ site.url }}/use/guide/locations/index.html" },
-{ "title": "Policies",
- "file": "{{ site.url }}/use/guide/policies/index.html",
- "children": {% readj ./policies/toc.json %} },
-{ "title": "Custom Entities",
- "file": "{{ site.url }}/use/guide/entities/index.html",
- "children": {% readj ./entities/toc.json %} },
-{ "title": "Extras",
- "file": "{{ site.url }}/use/guide/extras/index.html",
- "children": {% readj ./extras/toc.json %} }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/index.md
----------------------------------------------------------------------
diff --git a/docs/use/index.md b/docs/use/index.md
deleted file mode 100644
index e91dde5..0000000
--- a/docs/use/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: page
-title: Using Brooklyn
-toc: ../toc.json
----
-
-{% readj /start/docs-summary.include.md %}
-
-Beyond this, [just come chat to us](contact.html).
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/use/toc.json
----------------------------------------------------------------------
diff --git a/docs/use/toc.json b/docs/use/toc.json
deleted file mode 100644
index 1a5e3c9..0000000
--- a/docs/use/toc.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-{ "title": "User Guide",
- "file": "{{ site.url }}/use/guide/index.html",
- "children": {% readj ./guide/toc.json %} },
-{ "title": "Examples",
- "file": "{{ site.url }}/use/examples/index.html",
- "children": {% readj ./examples/toc.json %} },
-{ "title": "API Reference (javadoc)",
- "file": "{{ site.url }}/use/api/index.html" },
-{ "title": "Discuss",
- "file": "{{ site.url }}/use/contact.html" }
-]
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/community/committers.md
----------------------------------------------------------------------
diff --git a/docs/website/community/committers.md b/docs/website/community/committers.md
new file mode 100644
index 0000000..944ad0b
--- /dev/null
+++ b/docs/website/community/committers.md
@@ -0,0 +1,119 @@
+---
+layout: website-normal
+title: Committer's Guide
+navgroup: community
+---
+
+The Apache Brooklyn Git repositories are hosted in the ASF infrastructure and mirrored to Github. This is the current
+repository layout:
+
+- [Apache](https://git-wip-us.apache.org/repos/asf?s=incubator-brooklyn) - the main and official repository
+- [GitHub](https://github.com/apache/incubator-brooklyn) - mirror of the ASF repository, used to accept contributions
+ and do code reviews
+
+
+Before
+------
+
+For everything except the most trivial changes, the submitter must have a CLA on file. Check the [list of Apache
+committers, and non-commiters with ICLAs on record](https://people.apache.org/committer-index.html) and prompt the
+contributor to file an appropriate CLA if required.
+
+For all significant changes, there must be a Jira issue. If a Jira issue is not referenced in the PR and/or commit
+messages, prompt the contributor to open a Jira issue.
+
+
+Rules of thumb
+--------------
+
+1. Every contribution is a piece of intellectual property. This is the precious sustenance that nourishes our
+ project. Please treat it with respect.
+2. Always give credit where it is due, ensure every merged commit reflects properly the individual who authored that
+ commit. Preserve both the name and email address.
+3. Ensure your name and email address are there as the committer prior to pushing it to the Apache repositories.
+4. Always strive for linear commit history, avoid merge commits while pulling in contributor's changes.
+
+
+Setting up your repository
+--------------------------
+
+Clone the canonical ASF repo using this command. The `--origin` option tells git to name the remote `apache` instead
+of the default, `origin`; this will reduce ambiguity when we later add a second remote upstream.
+
+ git clone --origin apache https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git
+
+Add a second remote, for the GitHub repository.
+
+ git remote add github https://github.com/apache/incubator-brooklyn.git
+
+For the GitHub remote, add an additional `fetch` reference which will cause
+every pull request to be made available as a remote branch in your workspace.
+
+ git config --local --add remote.github.fetch '+refs/pull/*/head:refs/remotes/github/pr/*'
+
+Finally, run `git fetch --all` to update from all remote repositories - you will see all the pull requests appear:
+
+ * [new ref] refs/pull/98/head -> github/pr/98
+ * [new ref] refs/pull/99/head -> github/pr/99
+
+
+Merging a pull request
+----------------------
+
+Fetch the latest remote branches, which will cause a remote branch for the PR to become available to you.
+
+ git fetch --all
+
+If you want to inspect the PR and/or run tests, check out the branch:
+
+ git checkout github/pr/1234
+
+To perform the merge, first update your master branch to the latest:
+
+ git checkout master
+ git pull --rebase
+
+Then merge and push:
+
+ git merge --no-ff -m 'This closes #1234' github/pr/1234
+ git push apache master
+
+Note that this commit message is important, as this is what will trigger the
+pull request to be automatically closed, and the `--no-ff` means that a merge
+commit will always be created.
+
+
+Alternative options
+-------------------
+
+### Adding the remote reference to the contributor's repository
+
+Fetch the branch of the user you want to merge from
+
+ git fetch https://github.com/user-to-merge-from/incubator-brooklyn.git branch-to-merge-from
+
+If you commonly merge from a particular user, you'll want to add their repo as a remote to make fetching branches easier.
+
+ git remote add user-to-merge-from https://github.com/user-to-merge-from/incubator-brooklyn.git
+ git fetch user-to-merge-from
+
+
+### Merging from a patch file
+
+Save the patch from the Github patch link (just append '.patch' to the pull request link to get it). This patch will
+keep the authorship of the commit, so we should use it instead of the diff.
+
+Apply the patch preserving the original author:
+
+ git am pull-request-9876.patch
+
+
+Additional information
+----------------------
+
+Particularly for new committers, you may find the following information useful:
+
+* [Guide for new project
+ committers](https://www.apache.org/dev/new-committers-guide.html)
+* [Committers FAQ](https://www.apache.org/dev/committers.html)
+* [Git at Apache](https://git-wip-us.apache.org/)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/community/fork-after.png
----------------------------------------------------------------------
diff --git a/docs/website/community/fork-after.png b/docs/website/community/fork-after.png
new file mode 100644
index 0000000..3148ff3
Binary files /dev/null and b/docs/website/community/fork-after.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/community/fork-before.png
----------------------------------------------------------------------
diff --git a/docs/website/community/fork-before.png b/docs/website/community/fork-before.png
new file mode 100644
index 0000000..276eb9d
Binary files /dev/null and b/docs/website/community/fork-before.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/community/fork-new.png
----------------------------------------------------------------------
diff --git a/docs/website/community/fork-new.png b/docs/website/community/fork-new.png
new file mode 100644
index 0000000..34c2053
Binary files /dev/null and b/docs/website/community/fork-new.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/community/how-to-contribute-docs.md
----------------------------------------------------------------------
diff --git a/docs/website/community/how-to-contribute-docs.md b/docs/website/community/how-to-contribute-docs.md
new file mode 100644
index 0000000..b6b3cd5
--- /dev/null
+++ b/docs/website/community/how-to-contribute-docs.md
@@ -0,0 +1,158 @@
+---
+layout: website-normal
+title: How to Contribute Documentation
+navgroup: community
+---
+
+<!-- TODO do we want this page? can be simplified a lot since the process is identical as for how-to-contribute,
+ with the exception of the "Edit this Page" (and reminder we can accept small changes without CLA or Jira);
+ we could promote much of the content from README.md to here... -->
+
+
+Welcome and thank you for your interest in contributing to Apache Brooklyn! This guide will take you through the
+process of making contributions to the Apache Brooklyn website and documentation.
+
+
+Two types of documentation
+--------------------------
+
+The Brooklyn docs live in the **docs** project in the Brooklyn codebase,
+built using standard jekyll/markdown with a few extensions.
+
+The Brooklyn documentation is split into two parts:
+
+- **The main website and shared documentation**. This covers the root website
+ and all pages that are not part of the version-specific user guide.
+ Content for this is in the `website` directory.
+
+- **Version-specific user guide**. These pages have a URL with a path that
+ begins /v/*version-number*: for example,
+ https://brooklyn.incubator.apache.org/v/0.7.0-SNAPSHOT and <!-- BROOKLYN-VERSION -->
+ the special *latest* set at https://brooklyn.incubator.apache.org/v/latest .
+ Content for this is in the `guide` directory.
+
+
+Contributor license agreement
+-----------------------------
+
+Apache Brooklyn is licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). All
+contributions will be under this license, so please read and understand this license before contributing.
+
+For all but the most trivial patches, you are required to file a Contributor License Agreement with the Apache
+Software Foundation. Please read the [guide to CLAs](https://www.apache.org/licenses/#clas) to find out how to file a
+CLA with the Foundation.
+
+
+Before you start
+----------------
+
+### Join the community
+
+If it's your first contribution or it's a particularly big or complex contribution, things typically go much more
+smoothly when they start off with a conversation. Visit our [Community](index.html) page to see how you can contact
+us via IRC or email.
+
+### Create an issue in Jira
+
+Your first step is to create or find an issue in [Brooklyn's Jira](https://issues.apache.org/jira/browse/BROOKLYN)
+for your feature request or fix. For small changes this isn't necessary, but it's good to see if your change fixes an
+existing issue anyway.
+
+
+Contributing using *Edit this page*
+-----------------------------------
+
+Most of the pages on the website have an *Edit this page* button at the bottom.
+Clicking this button will take you to the GitHub repository and immediately
+begin editing the file. This approach makes editing easy, as you do not need to
+clone the repository to your workstation and make changes there; they can be
+changed directly on the GitHub website for the repository.
+
+Once you have made your edits, there is a short form titled *Propose file
+change*. Provide a short description of the change in the first box; optionally,
+provide a longer description in the second box. If your change fixes or
+addresses a Jira issue, be sure to mention it. Finally, click the *Propose file
+change* button to prepare a pull request, and then *Create pull request* to
+formally submit your change request and notify the dev team of your proposed
+change.
+
+The website is not a Wiki and your changes will not appear immediately. The
+community mailing list will receive a notification of your proposed change, and
+an Apache Brooklyn committer will review your changes. Once your change has
+passed review, the committer will merge it and re-publish the public website.
+
+While the *Edit this page* button is great for quickly editing a single page, if
+you want to do anything that involves editing multiple pages, you will need to
+fork and clone the repository and make the changes on your own workstation - see
+the next section for information on this.
+
+
+Contributing using GitHub
+-------------------------
+
+Our GitHub repository is located at
+[https://github.com/apache/incubator-brooklyn](https://github.com/apache/incubator-brooklyn)
+
+Your commit messages must properly describes the changes that have been made and
+their purpose ([here are some
+guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)).
+If your contributions fix a Jira issue, then ensure that you reference the issue
+(like `BROOKLYN-9876`) in the commit message.
+
+Create a pull request (PR) in GitHub for the change you're interested in making.
+The comment section of the PR must contain a link to the Jira issue (if it has
+one).
+
+Some good references for working with GitHub are below. We ask that you keep
+your change rebased to master as much as possible, and we will ask you to rebase
+again if master has moved before accepting your patch.
+
+- [Setting Up Git with GitHub](https://help.github.com/articles/set-up-git)
+- [Forking a Repository](https://help.github.com/articles/fork-a-repo)
+- [Submitting Pull Requests](https://help.github.com/articles/using-pull-requests)
+- [Rebasing your Branch](https://help.github.com/articles/interactive-rebase)
+
+Finally, add a comment in the Jira issue with a link to the pull request so we
+know the code is ready to be reviewed.
+
+
+### Reviews
+
+The Apache Brooklyn community will review your pull request before it is merged.
+This process can take a while, so please be patient. If we are slow to respond,
+please feel free to post a reminder to the PR, Jira issue, IRC channel or
+mailing list - see the [Community](index.html) page to see how to contact us.
+
+During the review process you may be asked to make some changes to your
+submission. While working through feedback, it can be beneficial to create new
+commits so the incremental change is obvious. This can also lead to a complex
+set of commits, and having an atomic change per commit is preferred in the end.
+Use your best judgement and work with your reviewer as to when you should revise
+a commit or create a new one.
+
+A pull request is considered ready to be merged once it gets at lease one +1
+from a committer. Once all the changes have been completed and the pull request
+is accepted, you may be asked to rebase it against the latest code. You may also
+wish to squash some commits together and make other history revisions, to leave
+the commit history clean and easily understood.
+
+
+### Contributing without using GitHub
+
+If you prefer to not use GitHub, then that is fine - we are also happy to accept
+patches attached to a Jira issue. Our canonical repository is located at
+`https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git`; for example:
+
+ $ git clone https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git
+
+When producing patches, please use `git format-patch` or a similar mechanism -
+this will ensure that you are properly attributed as the author of the patch
+when a committer merges it.
+
+
+For More Information
+--------------------
+
+Advanced instructions for building, previewing and publishing docs are in a `README.md` file
+in the `docs` folder; see those instructions
+[here](https://github.com/apache/incubator-brooklyn/tree/master/docs/README.md).
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/community/how-to-contribute.md
----------------------------------------------------------------------
diff --git a/docs/website/community/how-to-contribute.md b/docs/website/community/how-to-contribute.md
new file mode 100644
index 0000000..f73c2fb
--- /dev/null
+++ b/docs/website/community/how-to-contribute.md
@@ -0,0 +1,85 @@
+---
+layout: website-normal
+title: How to Contribute
+navgroup: community
+---
+
+Welcome and thank you for your interest in contributing to Apache Brooklyn! This guide will take you through the
+process of making contributions to the Apache Brooklyn code base.
+
+
+Contributor license agreement
+-----------------------------
+
+Apache Brooklyn is licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). All
+contributions will be under this license, so please read and understand this license before contributing.
+
+For all but the most trivial patches, you are required to file a Contributor License Agreement with the Apache
+Software Foundation. Please read the [guide to CLAs](https://www.apache.org/licenses/#clas) to find out how to file a
+CLA with the Foundation.
+
+
+Before you start
+----------------
+
+### Join the community
+
+If it's your first contribution or it's a particularly big or complex contribution, things typically go much more
+smoothly when they start off with a conversation. Visit our [Community](index.html) page to see how you can contact
+us via IRC or email.
+
+### Create an issue in Jira
+
+Your first step is to create or find an issue in [Brooklyn's Jira](https://issues.apache.org/jira/browse/BROOKLYN)
+for your feature request or fix. For small changes this isn't necessary, but it's good to see if your change fixes an
+existing issue anyway.
+
+
+### Contributing using GitHub
+
+This is our preferred way for contributing code. Our GitHub repository is located at
+[https://github.com/apache/incubator-brooklyn](https://github.com/apache/incubator-brooklyn)
+
+Your commit messages must properly describes the changes that have been made and their purpose
+([here are some guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)). If your
+contributions fix a Jira issue, then ensure that you reference the issue (like `BROOKLYN-9876`) in the commit message.
+
+Create a pull request (PR) in GitHub for the change you're interested in making. The comment section of the PR must
+contain a link to the Jira issue (if it has one).
+
+Some good references for working with GitHub are below. We ask that you keep your change rebased to master as much
+as possible, and we will ask you to rebase again if master has moved before accepting your patch.
+
+- [Setting Up Git with GitHub](https://help.github.com/articles/set-up-git)
+- [Forking a Repository](https://help.github.com/articles/fork-a-repo)
+- [Submitting Pull Requests](https://help.github.com/articles/using-pull-requests)
+- [Rebasing your Branch](https://help.github.com/articles/interactive-rebase)
+
+Finally, add a comment in the Jira issue with a link to the pull request so we know the code is ready to be reviewed.
+
+### Reviews
+
+The Apache Brooklyn community will review your pull request before it is merged. This process can take a while, so
+please be patient. If we are slow to respond, please feel free to post a reminder to the PR, Jira issue, IRC channel
+or mailing list - see the [Community](index.html) page to see how to contact us.
+
+During the review process you may be asked to make some changes to your submission. While working through feedback,
+it can be beneficial to create new commits so the incremental change is obvious. This can also lead to a complex set
+of commits, and having an atomic change per commit is preferred in the end. Use your best judgement and work with
+your reviewer as to when you should revise a commit or create a new one.
+
+A pull request is considered ready to be merged once it gets at lease one +1 from a committer. Once all the changes
+have been completed and the pull request is accepted, you may be asked to rebase it against the latest code. You may
+also wish to squash some commits together and make other history revisions, to leave the commit history clean and
+easily understood.
+
+
+### Contributing without using GitHub
+
+If you prefer to not use GitHub, then that is fine - we are also happy to accept patches attached to a Jira issue.
+Our canonical repository is located at `https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git`; for example:
+
+ $ git clone https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git
+
+When producing patches, please use `git format-patch` or a similar mechanism - this will ensure that you are properly
+attributed as the author of the patch when a committer merges it.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/community/index.md
----------------------------------------------------------------------
diff --git a/docs/website/community/index.md b/docs/website/community/index.md
new file mode 100644
index 0000000..e998e69
--- /dev/null
+++ b/docs/website/community/index.md
@@ -0,0 +1,86 @@
+---
+layout: website-normal
+title: Community
+children:
+- { path: how-to-contribute.md }
+- { path: migrate-to-apache.md }
+- { path: committers.md }
+- { path: how-to-contribute-docs.md }
+---
+
+<div class="row">
+<div class="col-md-6" markdown="1">
+
+## Mailing lists
+
+Our main discussion list is our *dev* list - here you can ask questions and get
+help with issues, ranging from basic getting started through to detailed
+questions about Brooklyn's internals.
+
+To subscribe, send an email to:
+[dev-subscribe@brooklyn.incubator.apache.org](mailto:dev-subscribe@brooklyn.incubator.apache.org)
+
+You can also [read and search the dev list
+archives](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/) on
+Apache's list archiver.
+
+
+### Other lists
+
+We also have a *commits* list - a read-only list which automatically posts as
+commits are made to our source repositories. Subscribe by sending an email to
+[commits-subscribe@brooklyn.incubator.apache.org](mailto:commits-subscribe@brooklyn.incubator.apache.org),
+and [read the archives here](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-commits/).
+
+
+### Historical lists
+
+Before Brooklyn joined the Apache Incubator, we had lists hosted on Google
+Groups. These lists are now deprecated and it's no longer possible to subscribe
+or post, but you may find useful information in the archives.
+
+- [Old Brooklyn users list archive](https://groups.google.com/forum/#!forum/brooklyn-dev)
+- [Old Brooklyn dev list archive](https://groups.google.com/forum/#!forum/brooklyn-dev)
+
+Once again, these lists are deprecated, so please subscribe to the Apache-hosted
+lists to receive new messages.
+
+</div><!-- col -->
+<div class="col-md-6" markdown="1">
+
+## Issue tracker
+
+We have a [Jira instance at Apache](https://issues.apache.org/jira/browse/BROOKLYN)
+
+
+## Contributing source code
+
+If you have changes or additions to the Brooklyn source code, we would love to
+see them! Please read our guide on [how to contribute](how-to-contribute.html).
+
+If you have used the *brooklyncentral* repository prior to Brooklyn's move to
+Apache, you can read the guide on
+[how to migrate your brooklyncentral fork to Apache](migrate-to-apache.html).
+
+Committers can read the corresponding [guide for committers](committers.html)
+to see how to review and merge contributions.
+
+
+## Contributing to the website and documentation
+
+We would also be very happy to receive contributions to our website and
+documentation. You can read our [How to contribute
+documentation](how-to-contribute-docs.html) guide or, if you are impatient,
+simply click on the *Edit this page* button at the bottom of most pages on this
+site and follow the instructions.
+
+
+## IRC
+
+Join channel `#brooklyncentral` on the [Freenode](https://freenode.net/) IRC
+network. Many of the Brooklyn dev team can be found here. Note that the team
+is predominantly Europe-based, and channel activity is usually centered
+around European daylight hours.
+
+</div><!-- col -->
+</div><!-- row -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/community/migrate-to-apache.md
----------------------------------------------------------------------
diff --git a/docs/website/community/migrate-to-apache.md b/docs/website/community/migrate-to-apache.md
new file mode 100644
index 0000000..ece385d
--- /dev/null
+++ b/docs/website/community/migrate-to-apache.md
@@ -0,0 +1,117 @@
+---
+layout: website-normal
+title: How to Migrate
+---
+
+Prior to our adoption by the Apache Incubator, Brooklyn was developed in a
+GitHub repository at `https://github.com/brooklyncentral/brooklyn`. If you
+already have a fork of this repository, follow this guide to smoothly shift
+your repository references to the new repository at Apache.
+
+If you have not forked or cloned the `brooklyncentral/brooklyn` repository,
+then this is not the right guide for you. Instead, you should refer to the
+[How to contribute](how-to-contribute.html) page, and possibly refer to
+[GitHub Help - Fork A Repo](https://help.github.com/articles/fork-a-repo) for
+further help.
+
+
+Assumptions
+-----------
+
+This guides assumes that you have followed the standard GitHub workflow, as
+describe in [GitHub Help - Fork A Repo](https://help.github.com/articles/fork-a-repo).
+In particular:
+
+- You have forked the `brooklyncentral/brooklyn` repository into your own
+ username:
+
+
+
+- You have used `git clone` to clone this fork onto your own computer;
+- You have added an additional remote, `upstream`, to refer to the original
+ `brooklyncentral/brooklyn` repository.
+
+In short, if you can recognise the above screenshot, and the output of the
+`git remote -v` command looks similar to below, then this guide should work
+for you. (Replace `rdowner` with your own GitHub username.)
+
+ origin https://github.com/rdowner/brooklyn.git (fetch)
+ origin https://github.com/rdowner/brooklyn.git (push)
+ upstream https://github.com/brooklyncentral/brooklyn (fetch)
+ upstream https://github.com/brooklyncentral/brooklyn (push)
+
+Or, if you are using SSH to access your remote repositories, it may look like
+this:
+
+ origin git@github.com:rdowner/brooklyn.git (fetch)
+ origin git@github.com:rdowner/brooklyn.git (push)
+ upstream git@github.com:brooklyncentral/brooklyn.git (fetch)
+ upstream git@github.com:brooklyncentral/brooklyn (push)
+
+
+
+Procedure
+---------
+
+The new repository has a mirror in GitHub, located at
+[https://github.com/apache/incubator-brooklyn](https://github.com/apache/incubator-brooklyn).
+Go to this page now, and fork it:
+
+
+
+This will now create a fork of this repository under your own username:
+
+
+
+So previously you referred to repositories named `brooklyn` under the
+`brooklyncentral` organization and your own username. Now, you will need to
+refer to repositories named `incubator-brooklyn` under the `Apache`
+organization and your own username.
+
+To update the cloned repository on your computer to point to the new
+repositories instead of the old ones, use these commands, replacing `rdowner`
+with your own GitHub username.
+
+ git remote set-url origin https://github.com/rdowner/incubator-brooklyn.git
+ git remote set-url upstream https://github.com/apache/incubator-brooklyn.git
+
+Or, if you would prefer to use SSH to access your remote repositories:
+
+ git remote set-url origin git@github.com:rdowner/incubator-brooklyn.git
+ git remote set-url upstream git@github.com:apache/incubator-brooklyn.git
+
+Finally, fetch everything:
+
+ git fetch --all
+
+
+Existing pull requests
+----------------------
+
+If you have submitted a pull request at `brooklyncentral/brooklyn`, this pull
+request will be closed, unmerged, with a message pointing you to this page. You
+will need to re-submit your pull request against the
+`apache/incubator-brooklyn`.
+
+If you have followed the above procedure, all you will need to do is identify
+the branch in your local repository on your computer that you used to make the
+original pull request, and push this to your new fork:
+
+```
+git push origin my-new-feature-branch
+```
+
+Now, go to your `incubator-brooklyn` fork on the GitHub website, and you should
+see the **Compare & pull request** button; click this, and it will set up a
+pull request against the new repository.
+
+
+
+
+Any problems?
+-------------
+
+If you are not sure how to do this, perhaps because you have a slightly
+different arrangement in your repositories, or is something unusual happens,
+please ask our community for help. You can find details of our IRC channel
+and mailing lists on our [Community](index.html) page.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/community/pull-request.png
----------------------------------------------------------------------
diff --git a/docs/website/community/pull-request.png b/docs/website/community/pull-request.png
new file mode 100644
index 0000000..70407f2
Binary files /dev/null and b/docs/website/community/pull-request.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/documentation.md
----------------------------------------------------------------------
diff --git a/docs/website/documentation.md b/docs/website/documentation.md
new file mode 100644
index 0000000..4ad3c8e
--- /dev/null
+++ b/docs/website/documentation.md
@@ -0,0 +1,19 @@
+---
+layout: website-normal
+title: Documentation
+children:
+- { link: "{{ site.path.guide }}", title: User Guide }
+- { path: glossary.md }
+- { path: documentation/install-on-server.md }
+---
+
+## Official User Manual
+
+Our main user manual is organised by release version. Please pick the version that you are using:
+
+- [0.7.0-M1]({{ site.path.v }}/0.7.0-M1) -
+ Please note that this release was made prior to entering the Apache Incubator,
+ and therefore it is not endorsed by Apache.
+
+## Server install
+Follow this [guide](documentation/install-on-server.html) to install Brooklyn on a production server.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/documentation/increase-entropy.md
----------------------------------------------------------------------
diff --git a/docs/website/documentation/increase-entropy.md b/docs/website/documentation/increase-entropy.md
new file mode 100644
index 0000000..bd0e8ea
--- /dev/null
+++ b/docs/website/documentation/increase-entropy.md
@@ -0,0 +1,31 @@
+---
+title: Increase entropy
+layout: website-normal
+---
+If you are installing AMP on a virtual machine, you may find it useful to increase the Linux kernel entropy to speed up the ssh connections to the managed entities. You can install and configure `rng-tools` or just use /dev/urandom`.
+
+### Installing rng-tool
+if you are using a RHEL-based OS:
+{% highlight bash %}
+yum -y -q install rng-tools
+echo "EXTRAOPTIONS=\"-r /dev/urandom\"" | cat >> /etc/sysconfig/rngd
+/etc/init.d/rngd start
+{% endhighlight %}
+
+if you are using a Debian-based OS:
+{% highlight bash %}
+apt-get -y install rng-tools
+echo "HRNGDEVICE=/dev/urandom" | cat >> /etc/default/rng-tools
+/etc/init.d/rng-tools start
+{% endhighlight %}
+
+The following links contain further [information for RHEL or CentOS](http://my.itwnik.com/how-to-increase-linux-kernel-entropy/), and [Ubuntu](http://www.howtoforge.com/helping-the-random-number-generator-to-gain-enough-entropy-with-rng-tools-debian-lenny).
+
+### Using /dev/urandom
+You can also just mv /dev/random then create it again linked to /dev/urandom, by issuing the following commands:
+
+{% highlight bash %}
+sudo mv /dev/random /dev/random-real
+sudo ln -s /dev/urandom /dev/random
+{% endhighlight %}
+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/documentation/install-on-server.md
----------------------------------------------------------------------
diff --git a/docs/website/documentation/install-on-server.md b/docs/website/documentation/install-on-server.md
new file mode 100644
index 0000000..c3da352
--- /dev/null
+++ b/docs/website/documentation/install-on-server.md
@@ -0,0 +1,125 @@
+---
+layout: website-normal
+title: Installing on a Server
+---
+
+{% include fields.md %}
+
+Here we present two *alternatives* to install Brooklyn:
+
+- [Running the *installation script*](#script)
+- [Manual installation](#manual)
+
+## <a id="script"></a> Running the installation script
+There is a simple bash script available to help with the installation process.
+
+#### Script prerequisites
+The script assumes that the server is a recent *RHEL/CentOS 6.x Linux* or *Ubuntu 12.04* installation, but other Linux variants have been tested successfully.
+
+The script will install Java 7 and other required packages if they are not present. You must have root access over [passwordless SSH]({{ site.path.website }}/documentation/passwordless-ssh.html) to install brooklyn, but the service runs as an ordinary user once installed.
+
+To manage the brooklyn service you must also be able to connect to port 8081 remotely.
+
+Once the above prerequisites are satisfied, you should be able to run successfully:
+{% highlight bash %}
+$ curl -o brooklyn-install.sh -L https://github.com/apache/incubator-brooklyn/raw/master/brooklyn-install.sh
+$ chmod +x ./brooklyn-install.sh
+$ ./brooklyn-install.sh -s -r <your-server-ip>
+{% endhighlight %}
+
+## <a id="manual"></a> Manual installation
+
+1. [Set up the prerequisites](#prerequisites)
+1. [Download Brooklyn](#download)
+1. [Configuring brooklyn.properties](#configuring-properties)
+1. [Configuring catalog.xml](#configuring-catalog)
+1. [Test the installation](#confirm)
+
+### <a id="prerequisites"></a>Set up the prerequisites
+
+Before installing Apache Brooklyn, you will need to configure the host as follows.
+
+* install Java JRE or SDK (version 6 or later)
+* install [SSH key]({{ site.path.website }}/documentation//ssh-key.html), if not available.
+* enable [passwordless ssh login]({{ site.path.website }}/documentation/passwordless-ssh.html).
+* create a `~/.brooklyn` directory on the host with `$ mkdir ~/.brooklyn`
+* Check your iptables service, and if enabled, make sure that it accepts all incoming connections to 8443+ ports.
+* [optional] Increase [linux kernel entropy]({{ site.path.website }}/documentation//increase-entropy.html) for faster ssh connections.
+
+## <a id="download"></a>Download Brooklyn
+
+Download the [Brooklyn distribution]({{ site.data.brooklyn.url.dist.tgz }}) and expand it to your home directory ( `~/` ), or in a location of your choice. Other [download options]({{site.path.website}}/download.html) are available.
+
+{% if brooklyn_version contains 'SNAPSHOT' %}
+Expand the `tar.gz` archive (note: as this is a -SNAPSHOT version, your filename will be slightly different):
+{% else %}
+Expand the `tar.gz` archive:
+{% endif %}
+
+{% if brooklyn_version contains 'SNAPSHOT' %}
+{% highlight bash %}
+$ tar -zxf brooklyn-dist-{{ site.data.brooklyn.version }}-timestamp-dist.tar.gz
+{% endhighlight %}
+{% else %}
+{% highlight bash %}
+$ tar -zxf brooklyn-dist-{{ site.data.brooklyn.version }}-dist.tar.gz
+{% endhighlight %}
+{% endif %}
+
+This will create a `brooklyn-{{ site.data.brooklyn.version }}` folder.
+
+Let's setup some paths for easy commands.
+
+{% highlight bash %}
+$ cd brooklyn-{{ site.data.brooklyn.version }}
+$ BROOKLYN_DIR="$(pwd)"
+$ export PATH=$PATH:$BROOKLYN_DIR/bin/
+{% endhighlight %}
+
+## <a id="configuring-properties"></a>Configuring brooklyn.properties
+Brooklyn deploys applications to Locations. *Locations* can be clouds, machines with fixed IPs or localhost (for testing).
+
+By default Brooklyn loads configuration parameters (including credentials for any cloud accounts) from
+
+`~/.brooklyn/brooklyn.properties`
+
+The `brooklyn.properties` is the main configuration file for deployment locations. Contains the connection details and credentials for all public or on-premises cloud providers, as well as controlling some application startup and security options.
+
+Create a `.brooklyn` folder in your home directory and download the template [brooklyn.properties]({{brooklyn_properties_url_path}}) to that folder.
+
+{% highlight bash %}
+$ mkdir -p ~/.brooklyn
+$ wget -O ~/.brooklyn/brooklyn.properties {{brooklyn_properties_url_live}}
+$ chmod 600 ~/.brooklyn/brooklyn.properties
+{% endhighlight %}
+
+You may need to edit `~/.brooklyn/brooklyn.properties` to ensure that brooklyn can access cloud locations for application deployment.
+
+## <a id="configuring-catalog"></a>Configuring catalog.xml
+By default Brooklyn loads the catalog of available application components and services from
+`~/.brooklyn/catalog.xml`.
+
+{% highlight bash %}
+$ wget -O ~/.brooklyn/catalog.xml {{site.url_root}}{{site.path.website}}/quickstart/catalog.xml
+{% endhighlight %}
+
+The `catalog.xml` is the application blueprint catalog. The above example file contains some blueprints which will be automatically downloaded from the web if you run them.
+
+You may need to edit `~/.brooklyn/catalog.xml` to update links to any resources for download.
+
+## <a id="confirm"></a>Confirm installation
+We can do a quick test drive by launching Brooklyn:
+
+{% highlight bash %}
+$ brooklyn launch
+{% endhighlight %}
+
+Brooklyn will output the address of the management interface:
+
+{% highlight bash %}
+INFO Starting brooklyn web-console on loopback interface because no security config is set
+
+INFO Started Brooklyn console at http://127.0.0.1:8081/, running classpath://brooklyn.war and []
+{% endhighlight %}
+
+Stop Brooklyn with ctrl-c.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/documentation/passwordless-ssh.md
----------------------------------------------------------------------
diff --git a/docs/website/documentation/passwordless-ssh.md b/docs/website/documentation/passwordless-ssh.md
new file mode 100644
index 0000000..6cd3e5a
--- /dev/null
+++ b/docs/website/documentation/passwordless-ssh.md
@@ -0,0 +1,29 @@
+---
+title: Passwordless SSH login
+layout: website-normal
+---
+To enable passwordless SSH login to a *nix server, first you will need a pair of keys. If you don't already have a keypair generated you'll first of all need to create one.
+To generate a new keypair you run the following command:
+
+ your-user@host1:~$ ssh-keygen -t rsa
+
+This will prompt you for a location to save the keys, and a pass-phrase:
+
+ Generating public/private rsa key pair.
+ Enter file in which to save the key (/home/skx/.ssh/id_rsa):
+ Enter passphrase (empty for no passphrase):
+ Enter same passphrase again:
+ Your identification has been saved in /home/skx/.ssh/id_rsa.
+ Your public key has been saved in /home/skx/.ssh/id_rsa.pub.
+
+Then, assuming that you want to enable passwordless SSH login to the `host2` server from `host1` with the `id_rsa` and `id_rsa.pub` files you've just generated you should run the following command:
+
+ your-user@host1:~$ ssh-copy-id -i ~/.ssh/id_rsa.pub username@host2
+
+If `host1` doesn't have `ssh-copy-id` installed, you can either install `ssh-copy-id` or manually copy the `id_rsa.pub` key to the `host2` by issuing the following commands:
+
+ host1# cat ~/.ssh/id_rsa.pub | ssh user@host2 'cat >> .ssh/authorized_keys'
+
+or if you need to make a `.ssh` directory on `host2`
+
+ host1#cat ~/.ssh/id_rsa.pub | ssh user@host2 'mkdir .ssh; chmod 700 .ssh; cat >> .ssh/authorized_keys; chmod 644 .ssh/authorized_keys'
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/documentation/ssh-key.md
----------------------------------------------------------------------
diff --git a/docs/website/documentation/ssh-key.md b/docs/website/documentation/ssh-key.md
new file mode 100644
index 0000000..9082af1
--- /dev/null
+++ b/docs/website/documentation/ssh-key.md
@@ -0,0 +1,9 @@
+---
+title: SSH keys
+layout: website-normal
+---
+Brooklyn requires an SSH key, which will be used to connect to cloud VMs. By default Brooklyn will look for SSH keys named `~/.ssh/id_rsa` or `~/.ssh/id_dsa`. If you do not already have an SSH key installed, create a new key.
+
+{% highlight bash %}
+$ ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa
+{% endhighlight %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/download.md
----------------------------------------------------------------------
diff --git a/docs/website/download.md b/docs/website/download.md
new file mode 100644
index 0000000..20d6410
--- /dev/null
+++ b/docs/website/download.md
@@ -0,0 +1,70 @@
+---
+layout: website-normal
+title: Download
+---
+
+## Download Brooklyn Binary Distributions
+
+**New to Brooklyn**? Download the *Milestone* release below then take a look
+at the [Get Started](quickstart/) page.
+
+<div class="row">
+<div class="col-md-6" markdown="1">
+
+### Milestone
+
+#### 0.7.0-M1
+*Recommended*. A good compromise between stability and features which has undergone live testing.
+
+Download [.tar.gz](http://search.maven.org/remotecontent?filepath=io/brooklyn/brooklyn-dist/0.7.0-M1/brooklyn-dist-0.7.0-M1-dist.tar.gz)
+• [.zip](http://search.maven.org/remotecontent?filepath=io/brooklyn/brooklyn-dist/0.7.0-M1/brooklyn-dist-0.7.0-M1-dist.zip)
+
+Please note that this release was made prior to entering the Apache Incubator, and therefore it is not endorsed by Apache.
+
+</div>
+<div class="col-md-6" markdown="1">
+
+### Stable
+
+#### 0.6.0
+Well-tested releases, but missing the latest features.
+
+Download [.tar.gz](http://search.maven.org/remotecontent?filepath=io/brooklyn/brooklyn-dist/0.6.0/brooklyn-dist-0.6.0-dist.tar.gz)
+• [.zip](http://search.maven.org/remotecontent?filepath=io/brooklyn/brooklyn-dist/0.6.0/brooklyn-dist-0.6.0-dist.zip)
+
+Please note that this release was made prior to entering the Apache Incubator, and therefore it is not endorsed by Apache.
+
+</div>
+</div>
+
+
+## Download Brooklyn source code
+
+<div class="row">
+<div class="col-md-6" markdown="1">
+
+### Milestone
+
+#### 0.7.0-M1
+*Recommended*. A good compromise between stability and features which has undergone live testing.
+
+Download [.tar.gz](https://github.com/apache/incubator-brooklyn/archive/0.7.0-M1.tar.gz)
+• [.zip](https://github.com/apache/incubator-brooklyn/archive/0.7.0-M1.zip)
+
+Please note that this release was made prior to entering the Apache Incubator, and therefore it is not endorsed by Apache.
+
+</div>
+<div class="col-md-6" markdown="1">
+
+### Stable
+
+#### 0.6.0
+Well-tested releases, but missing the latest features.
+
+Download [.tar.gz](https://github.com/apache/incubator-brooklyn/archive/v0.6.0.tar.gz)
+• [.zip](https://github.com/apache/incubator-brooklyn/archive/v0.6.0.zip)
+
+Please note that this release was made prior to entering the Apache Incubator, and therefore it is not endorsed by Apache.
+
+</div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/glossary.md
----------------------------------------------------------------------
diff --git a/docs/website/glossary.md b/docs/website/glossary.md
new file mode 100644
index 0000000..0651068
--- /dev/null
+++ b/docs/website/glossary.md
@@ -0,0 +1,92 @@
+---
+layout: website-normal
+title: Glossary
+---
+
+[//]: # (Abusing link groups to write comments that are not rendered in the document..)
+[//]: # (The links below reference the id attributes generated for the headers.)
+[//]: # (For example, the Autonomic section can be referred to with a link to #autonomic.)
+[//]: # (So if you alter any of the headers you should update the relevant link group too.)
+
+[autonomic]: #autonomic
+[blueprint]: #blueprint
+[effector]: #effector
+[entity]: #entity
+[policy]: #policy
+[sensor]: #sensor
+[YAML]: #yaml
+
+[//]: # (Note: Autonomic and blueprint section could link to learnmore page.)
+
+
+#### Autonomic
+
+Refers to the self-managing characteristics of distributed computing resources,
+adapting to unpredictable changes while hiding intrinsic complexity to
+operators and users.
+
+
+#### Blueprint
+
+A description of an application or system, which can be used for its automated
+deployment and runtime management. The blueprint describes a model of the
+application (i.e. its components, their configuration, and their
+relationships), along with policies for runtime management. The blueprint can
+be described in [YAML][].
+
+###### See also
+* [Documentation]({{site.path.website}}/learnmore/catalog/index.html) for the entity,
+ policy and enricher blueprints that Apache Brooklyn supports out-of-the-box.
+
+
+#### Effector
+
+An operation on an [entity][].
+
+
+#### Entity
+
+A component of an application or system. This could be a physical component, a
+service, a grouping of components, or a logical construct describing part of an
+application/system. It is a "managed element" in autonomic computing parlance.
+
+
+#### Policy
+
+Part of an autonomic management system, performing runtime management. A policy
+is associated with an [entity][]; it normally manages the health of that entity
+or an associated group of entities (e.g. HA policies or auto-scaling policies).
+
+
+#### Sensor
+
+An attribute of an [entity][].
+
+
+#### YAML
+
+A human-readable data format.
+
+###### See also
+* [Wikipedia article](http://en.wikipedia.org/wiki/YAML) on YAML
+
+
+#### Apache Jclouds
+
+An open source Java library that provides a consistent interface to many
+clouds. Apache Brooklyn uses Apache Jclouds as its core cloud abstraction.
+
+###### See also
+* [Project homepage](https://jclouds.apache.org/)
+
+
+#### CAMP and TOSCA
+
+OASIS Cloud Application Management for Platforms (CAMP) and OASIS Topology and
+Orchestration Specification for Cloud Applications (TOSCA) are specifications
+that aim to standardise the portability and management of cloud applications.
+
+###### See also
+* [CAMP homepage](https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=camp)
+* [TOSCA homepage](https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=tosca)
+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/index.md
----------------------------------------------------------------------
diff --git a/docs/website/index.md b/docs/website/index.md
new file mode 100644
index 0000000..33f33e7
--- /dev/null
+++ b/docs/website/index.md
@@ -0,0 +1,71 @@
+---
+layout: website-landing
+title: Home
+navgroup: home
+children:
+- { path: learnmore/index.md }
+- { path: download.md }
+- { path: quickstart/index.md }
+- { path: documentation.md }
+- { path: community/index.md }
+navgroups:
+- { id: learnmore, page: learnmore/index.md, title: learn more, title_in_menu: Learn More }
+- { id: download, page: download.md, title: download }
+- { id: getstarted, page: quickstart/index.md, title: get started, title_in_menu: Get Started }
+- { id: documentation, page: documentation.md, title: documentation, title_in_menu: All Documentation }
+- { id: website/community, page: community/index.md, title: community, title_in_menu: Community Home }
+---
+
+<div class="jumbotron">
+<div id="apachebrooklynbanner"> </div>
+
+<div class="row">
+<div class="col-md-4" markdown="1">
+
+### model
+
+*Blueprints* describe your application, stored as *text files* in *version control*
+
+*Compose* from the [*dozens* of supported components](learnmore/catalog/) or your *own components* using *bash, Java, Chef...*
+
+<div class="text-muted" markdown="1">
+#### JBoss • Cassandra • QPid • nginx • [many more](learnmore/catalog/)
+</div>
+
+</div>
+<div class="col-md-4" markdown="1">
+
+### deploy
+
+Components *configured & integrated* across *multiple machines* automatically
+
+*20+ public clouds*, or your *private cloud* or bare servers - and *Docker* containers
+
+<div class="text-muted" markdown="1">
+#### Amazon EC2 • CloudStack • OpenStack • SoftLayer • many more
+</div>
+
+</div>
+<div class="col-md-4" markdown="1">
+
+### manage
+
+*Monitor* key application *metrics*; *scale* to meet demand; *restart* and *replace* failed components
+
+View and modify using the *web console* or automate using the *REST API*
+
+<div class="text-muted" markdown="1">
+#### Metric-based autoscaler • Restarter & replacer • Follow the sun • Load balancing
+</div>
+
+</div>
+</div><!-- row -->
+
+<div style="text-align: center" markdown="1">
+
+<a class="btn btn-primary btn-lg" role="button" href="learnmore.html">learn more</a>
+<a class="btn btn-primary btn-lg" role="button" href="quickstart/">get started</a>
+
+</div>
+
+</div><!-- jumbotron -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/learnmore/catalog/common.js
----------------------------------------------------------------------
diff --git a/docs/website/learnmore/catalog/common.js b/docs/website/learnmore/catalog/common.js
new file mode 100644
index 0000000..8e8a45f
--- /dev/null
+++ b/docs/website/learnmore/catalog/common.js
@@ -0,0 +1,94 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+var brooklyn = (function ($, _) {
+
+ return {
+ findItemOfType: function(items, type) {
+ return _.findWhere(items, { type: type });
+ },
+
+ entityCard: _.template(
+ "<a class='plain' data-type='<%= type %>' href='entities/<%= type %>.html'>" +
+ "<div class='card'>" +
+ "<span class='glyphicon glyphicon-chevron-right'/>" +
+ "<div class='name'><%=name%></div>" +
+ "<div class='type'><%=type%></div>" +
+ "<div class='description'><%=description%></div>" +
+ "</div>" +
+ "</a>"
+ ),
+ policyCard: _.template(
+ "<a class='plain' data-type='<%= type %>' href='policies/<%= type %>.html'>" +
+ "<div class='card'>" +
+ "<span class='glyphicon glyphicon-chevron-right'/>" +
+ "<div class='name'><%=name%></div>" +
+ "<div class='type'><%=type%></div>" +
+ "<div class='description'><%=description%></div>" +
+ "</div>" +
+ "</a>"
+ ),
+ enricherCard: _.template(
+ "<a class='plain' data-type='<%= type %>' href='enrichers/<%= type %>.html'>" +
+ "<div class='card'>" +
+ "<span class='glyphicon glyphicon-chevron-right'/>" +
+ "<div class='name'><%=name%></div>" +
+ "<div class='type'><%=type%></div>" +
+ "<div class='description'><%=description%></div>" +
+ "</div>" +
+ "</a>"
+ ),
+
+ typeSummary: _.template(
+ "<div class='summaryLabel'><%=name%></div>" +
+ "<div class='summaryType'><%=type%></div>" +
+ "<div class='description'><%=description%></div>"
+ ),
+
+ configKeyCard: _.template(
+ "<div class='card configKey'>" +
+ "<div class='name'><%=name%></div>" +
+ "<dl>" +
+ "<dt>description</dt><dd><%=(description||' ')%></dd>" +
+ "<dt>value type</dt><dd class='java'><%=(type||' ')%></dd>" +
+ "<dt>default value</dt><dd><%=(defaultValue||' ')%></dd>" +
+ "</dl>" +
+ "</div>"
+ ),
+ sensorCard: _.template(
+ "<div class='card sensor'>" +
+ "<div class='name'><%=name%></div>" +
+ "<dl>" +
+ "<dt>description</dt><dd><%=(description||' ')%></dd>" +
+ "<dt>value type</dt><dd class='java'><%=(type||' ')%></dd>" +
+ "</dl>" +
+ "</div>"
+ ),
+ effectorCard: _.template(
+ "<div class='card effector'>" +
+ "<div class='name'><%=name%></div>" +
+ "<dl>" +
+ "<dt>description</dt><dd><%=(description||' ')%></dd>" +
+ "<dt>return type</dt><dd class='java'><%=(returnType||' ')%></dd>" +
+ "</dl>" +
+ "</div>"
+ )
+ };
+
+}(jQuery, _));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.DeltaEnricher.html
----------------------------------------------------------------------
diff --git a/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.DeltaEnricher.html b/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.DeltaEnricher.html
new file mode 100644
index 0000000..d888b8c
--- /dev/null
+++ b/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.DeltaEnricher.html
@@ -0,0 +1,59 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+ <head>
+ <title>Brooklyn Enricher - Delta</title>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../items.css" type="text/css" media="screen"/>
+ </head>
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="identity">
+ <a href="http://brooklyncentral.github.com/" rel="home">Brooklyn</a>
+ </div>
+ </div>
+
+ <div id="summary"></div>
+
+ <ul class="nav nav-tabs">
+ <li class="active"><a href="#configKeys" data-toggle="tab">Config Keys</a></li>
+ </ul>
+
+ <div class="tab-content">
+ <div id="configKeys"></div>
+ </div>
+
+ </div>
+
+ <script src="../../../style/js/underscore-min.js" type="text/javascript"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+ <script src="../common.js" type="text/javascript"></script>
+ <script src="../items.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ $(document).ready(function () {
+ var item = brooklyn.findItemOfType(items.enrichers, "brooklyn.enricher.DeltaEnricher");
+ $("#summary").html(brooklyn.typeSummary(item));
+ item.config.forEach(function (element) { $("#configKeys").append(brooklyn.configKeyCard(element)); });
+ });
+ </script>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.HttpLatencyDetector.html
----------------------------------------------------------------------
diff --git a/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.HttpLatencyDetector.html b/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.HttpLatencyDetector.html
new file mode 100644
index 0000000..47b3a54
--- /dev/null
+++ b/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.HttpLatencyDetector.html
@@ -0,0 +1,59 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+ <head>
+ <title>Brooklyn Enricher - HTTP Latency Detector</title>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../items.css" type="text/css" media="screen"/>
+ </head>
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="identity">
+ <a href="http://brooklyncentral.github.com/" rel="home">Brooklyn</a>
+ </div>
+ </div>
+
+ <div id="summary"></div>
+
+ <ul class="nav nav-tabs">
+ <li class="active"><a href="#configKeys" data-toggle="tab">Config Keys</a></li>
+ </ul>
+
+ <div class="tab-content">
+ <div id="configKeys"></div>
+ </div>
+
+ </div>
+
+ <script src="../../../style/js/underscore-min.js" type="text/javascript"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+ <script src="../common.js" type="text/javascript"></script>
+ <script src="../items.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ $(document).ready(function () {
+ var item = brooklyn.findItemOfType(items.enrichers, "brooklyn.enricher.HttpLatencyDetector");
+ $("#summary").html(brooklyn.typeSummary(item));
+ item.config.forEach(function (element) { $("#configKeys").append(brooklyn.configKeyCard(element)); });
+ });
+ </script>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/201818b0/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.RollingMeanEnricher.html
----------------------------------------------------------------------
diff --git a/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.RollingMeanEnricher.html b/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.RollingMeanEnricher.html
new file mode 100644
index 0000000..ba4c179
--- /dev/null
+++ b/docs/website/learnmore/catalog/enrichers/brooklyn.enricher.RollingMeanEnricher.html
@@ -0,0 +1,59 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+ <head>
+ <title>Brooklyn Enricher - Rolling Mean</title>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../items.css" type="text/css" media="screen"/>
+ </head>
+ <body>
+ <div id="container">
+ <div id="header">
+ <div id="identity">
+ <a href="http://brooklyncentral.github.com/" rel="home">Brooklyn</a>
+ </div>
+ </div>
+
+ <div id="summary"></div>
+
+ <ul class="nav nav-tabs">
+ <li class="active"><a href="#configKeys" data-toggle="tab">Config Keys</a></li>
+ </ul>
+
+ <div class="tab-content">
+ <div id="configKeys"></div>
+ </div>
+
+ </div>
+
+ <script src="../../../style/js/underscore-min.js" type="text/javascript"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" type="text/javascript"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+ <script src="../common.js" type="text/javascript"></script>
+ <script src="../items.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ $(document).ready(function () {
+ var item = brooklyn.findItemOfType(items.enrichers, "brooklyn.enricher.RollingMeanEnricher");
+ $("#summary").html(brooklyn.typeSummary(item));
+ item.config.forEach(function (element) { $("#configKeys").append(brooklyn.configKeyCard(element)); });
+ });
+ </script>
+ </body>
+</html>