brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From drigod...@apache.org
Subject [1/3] brooklyn-docs git commit: Enforce the use of `brooklyn.config` in yaml as @SetFromFlag annotation is getting deprecated
Date Mon, 29 May 2017 15:14:00 GMT
Repository: brooklyn-docs
Updated Branches:
  refs/heads/master af3b17e1e -> c20b7474a


Enforce the use of `brooklyn.config` in yaml as @SetFromFlag annotation is getting deprecated


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

Branch: refs/heads/master
Commit: e7b87ec91a06f47f2212a21e8b3509b949b61568
Parents: ea94440
Author: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Authored: Fri May 12 14:46:00 2017 +0100
Committer: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Committed: Fri May 12 14:46:00 2017 +0100

----------------------------------------------------------------------
 .../chef/advanced-chef-integration.md           | 15 ++--
 .../chef/example_yaml/mysql-chef-1.yaml         | 43 +++++------
 .../chef/example_yaml/mysql-chef-2.yaml         | 47 ++++++------
 guide/blueprints/enrichers.md                   | 47 ++----------
 .../appserver-configured-in-config.yaml         |  6 --
 .../example_yaml/appserver-configured.yaml      |  5 +-
 .../example_yaml/appserver-w-policy.yaml        | 10 +--
 .../example_yaml/enricher-aggregator.yaml       |  7 ++
 .../example_yaml/enricher-joiner.yaml           |  6 ++
 .../example_yaml/enricher-propagator.yaml       |  8 ++
 .../enricher-time-weighted-delta.yaml           |  6 ++
 .../example_yaml/enricher-transformer.yaml      |  6 ++
 guide/blueprints/example_yaml/simple-vm.yaml    |  9 ++-
 ...est-app-with-enrichers-slightly-simpler.yaml | 10 +--
 .../vanilla-bash-netcat-catalog.bom             | 15 ++--
 .../vanilla-bash-netcat-cluster.yaml            |  2 +-
 .../example_yaml/vanilla-bash-netcat-env.yaml   | 16 ++--
 .../example_yaml/vanilla-bash-netcat-file.yaml  |  3 +-
 .../vanilla-bash-netcat-more-commands.yaml      | 19 ++---
 .../vanilla-bash-netcat-port-parameter.yaml     | 15 ++--
 .../example_yaml/vanilla-bash-netcat-port.yaml  |  7 +-
 .../vanilla-bash-netcat-restarter.yaml          |  7 +-
 .../vanilla-bash-netcat-w-client.yaml           | 28 +++----
 .../example_yaml/vanilla-bash-netcat.yaml       |  7 +-
 guide/blueprints/multiple-services.md           | 11 ---
 guide/blueprints/policies.md                    | 12 +--
 .../entities/loopovergroupmembers-entity.yaml   | 11 +--
 .../entities/testeffector-entity.yaml           | 13 ++--
 .../entities/testhttpcall-entity.yaml           | 11 +--
 .../entities/testsensor-entity.yaml             | 11 +--
 .../entities/testsshcommand-entity.yaml         | 34 +++++----
 .../testcases/effector-test-snippet.yaml        | 41 ++++++-----
 .../testcases/getting-started-test-example.yaml | 77 +++++++++++---------
 .../testcases/http-test-snippet.yaml            | 34 +++++----
 .../testcases/sensor-test-snippet.yaml          | 11 +--
 guide/ops/gui/_my-web-cluster.yaml              |  2 +-
 guide/ops/gui/_my-web-cluster2.yaml             | 16 ++--
 guide/start/_my-web-cluster.yaml                |  2 +-
 guide/start/_my-web-cluster2.yaml               | 16 ++--
 guide/start/example_yaml/mycluster.yaml         | 14 ++--
 guide/start/policies.md                         | 14 ++--
 41 files changed, 343 insertions(+), 331 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/chef/advanced-chef-integration.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/chef/advanced-chef-integration.md b/guide/blueprints/chef/advanced-chef-integration.md
index 0d65286..5c28e0d 100644
--- a/guide/blueprints/chef/advanced-chef-integration.md
+++ b/guide/blueprints/chef/advanced-chef-integration.md
@@ -32,13 +32,14 @@ A general schema for the supported YAML is below:
 
 {% highlight yaml %}
 - type: chef:cookbook_name
-  cookbook_urls:
-    cookbook_name: url://for/cookbook.tgz
-    dependency1: url://for/dependency1.tgz
-  launch_run_list: [ "cookbook_name::start" ]
-  launch_attributes: # map of arguments to set in the chef node
-  service_name: cookbook_service
-  pid_file: /var/run/cookbook.pid
+  brooklyn.config:
+    brooklyn.chef.cookbooksUrls:
+      cookbook_name: url://for/cookbook.tgz
+      dependency1: url://for/dependency1.tgz
+    brooklyn.chef.runList: [ "cookbook_name::start" ]
+    brooklyn.chef.launch.attributes: # map of arguments to set in the chef node
+    brooklyn.chef.lifecycle.serviceName: cookbook_service
+    brooklyn.chef.lifecycle.pidFile: /var/run/cookbook.pid
 {% endhighlight %}
 
 If you are interested in exploring the Java code for creating blueprints,

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml b/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml
index bdac530..94b521f 100644
--- a/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml
+++ b/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml
@@ -1,24 +1,25 @@
 name: chef-mysql-sample
 services:
 - type: chef:mysql
-  
-  cookbook_urls:
-    # only needed for chef solo; URL can be local to brooklyn, or github, etc...
-    mysql: https://github.com/opscode-cookbooks/mysql/archive/v4.0.12.tar.gz
-    openssl: https://github.com/opscode-cookbooks/openssl/archive/v1.1.0.tar.gz
-    build-essential: https://github.com/opscode-cookbooks/build-essential/archive/v1.4.4.tar.gz
-  
-  launch_run_list: [ "mysql::server" ]
-  launch_attributes:
-    mysql:
-      # these attrs are required by the mysql cookbook under node['mysql']
-      server_root_password: p4ssw0rd
-      server_repl_password: p4ssw0rd
-      server_debian_password: p4ssw0rd
-      # many others are attrs are supported by the cookbook and can be passed here...
-      
-  # how to determine if the process is running and how to kill it
-  # (supported options are `service_name` and `pid_file`; normally you should just pick one.
-  # here we use the pid_file because the service_name varies, mysql on centos, mysqld on ubuntu!)
-  #service_name: mysqld
-  pid_file: /var/run/mysqld/mysqld.pid
+
+  brooklyn.config:
+    brooklyn.chef.cookbooksUrls:
+      # only needed for chef solo; URL can be local to brooklyn, or github, etc...
+      mysql: https://github.com/opscode-cookbooks/mysql/archive/v4.0.12.tar.gz
+      openssl: https://github.com/opscode-cookbooks/openssl/archive/v1.1.0.tar.gz
+      build-essential: https://github.com/opscode-cookbooks/build-essential/archive/v1.4.4.tar.gz
+
+    brooklyn.chef.runList: [ "mysql::server" ]
+    brooklyn.chef.launch.attributes:
+      mysql:
+        # these attrs are required by the mysql cookbook under node['mysql']
+        server_root_password: p4ssw0rd
+        server_repl_password: p4ssw0rd
+        server_debian_password: p4ssw0rd
+        # many others are attrs are supported by the cookbook and can be passed here...
+
+    # how to determine if the process is running and how to kill it
+    # (supported options are `service_name` and `pid_file`; normally you should just pick one.
+    # here we use the pid_file because the service_name varies, mysql on centos, mysqld on ubuntu!)
+    #service_name: mysqld
+    brooklyn.chef.lifecycle.pidFile: /var/run/mysqld/mysqld.pid

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml b/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml
index 9e9de9b..10d1628 100644
--- a/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml
+++ b/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml
@@ -2,27 +2,26 @@ name: chef-mysql-sample
 services:
 - type: chef:mysql
   id: db
-  
-  cookbook_urls:
-    # only needed for chef solo; URL can be local to brooklyn, or github, etc...
-    mysql: https://github.com/opscode-cookbooks/mysql/archive/v4.0.12.tar.gz
-    openssl: https://github.com/opscode-cookbooks/openssl/archive/v1.1.0.tar.gz
-    build-essential: https://github.com/opscode-cookbooks/build-essential/archive/v1.4.4.tar.gz
-  
-  launch_run_list: [ "mysql::server" ]
-  launch_attributes:
-    mysql:
-      # these attrs are required by the mysql cookbook under node['mysql']
-      server_root_password: $brooklyn:entity("db").config("mysql.password")
-      server_repl_password: $brooklyn:entity("db").config("mysql.password")
-      server_debian_password: $brooklyn:entity("db").config("mysql.password")
-      # many others are attrs are supported by the cookbook and can be passed here...
-      
-  # how to determine if the process is running and how to kill it
-  # (supported options are `service_name` and `pid_file`; normally you should just pick one.
-  # here we use the pid_file because the service_name varies, mysql on centos, mysqld on ubuntu!)
-  #service_name: mysqld
-  pid_file: /var/run/mysqld/mysqld.pid
-    
-brooklyn.config:
-  mysql.password: p4ssw0rd
+
+  brooklyn.config:
+    brooklyn.chef.cookbooksUrls:
+      # only needed for chef solo; URL can be local to brooklyn, or github, etc...
+      mysql: https://github.com/opscode-cookbooks/mysql/archive/v4.0.12.tar.gz
+      openssl: https://github.com/opscode-cookbooks/openssl/archive/v1.1.0.tar.gz
+      build-essential: https://github.com/opscode-cookbooks/build-essential/archive/v1.4.4.tar.gz
+
+    brooklyn.chef.runList: [ "mysql::server" ]
+    brooklyn.chef.launch.attributes:
+      mysql:
+        # these attrs are required by the mysql cookbook under node['mysql']
+        server_root_password: $brooklyn:entity("db").config("mysql.password")
+        server_repl_password: $brooklyn:entity("db").config("mysql.password")
+        server_debian_password: $brooklyn:entity("db").config("mysql.password")
+        # many others are attrs are supported by the cookbook and can be passed here...
+
+    # how to determine if the process is running and how to kill it
+    # (supported options are `service_name` and `pid_file`; normally you should just pick one.
+    # here we use the pid_file because the service_name varies, mysql on centos, mysqld on ubuntu!)
+    #service_name: mysqld
+    brooklyn.chef.lifecycle.pidFile: /var/run/mysqld/mysqld.pid
+    mysql.password: p4ssw0rd

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/enrichers.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/enrichers.md b/guide/blueprints/enrichers.md
index 436a423..788fb52 100644
--- a/guide/blueprints/enrichers.md
+++ b/guide/blueprints/enrichers.md
@@ -15,12 +15,7 @@ See below for documentation of the stock enrichers available in Apache Brooklyn.
 Takes a source sensor and modifies it in some way before publishing the result in a new sensor. See below an example using `$brooklyn:formatString`.
 
 {% highlight yaml %}
-brooklyn.enrichers:
-- type: org.apache.brooklyn.enricher.stock.Transformer
-  brooklyn.config:
-    enricher.sourceSensor: $brooklyn:sensor("urls.tcp.string")
-    enricher.targetSensor: $brooklyn:sensor("urls.tcp.withBrackets")
-    enricher.targetValue: $brooklyn:formatString("[%s]", $brooklyn:attributeWhenReady("urls.tcp.string"))
+{% readj example_yaml/enricher-transformer.yaml %}
 {% endhighlight %}
 
 #### Propagator
@@ -32,14 +27,7 @@ The other use of Propagator is where you specify a producer (using `$brooklyn:en
 from which to take sensors; in that mode you can specify `propagate` as a list of sensors whose names are unchanged, instead of (or in addition to) this map.
 
 {% highlight yaml %}
-brooklyn.enrichers:
-- type: org.apache.brooklyn.enricher.stock.Propagator
-  brooklyn.config:
-    producer: $brooklyn:entity("cluster")
-- type: org.apache.brooklyn.enricher.stock.Propagator
-  brooklyn.config:
-    sensorMapping:
-      $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
+{% readj example_yaml/enricher-propagator.yaml %}
 {% endhighlight %}
 
 #### Custom Aggregating
@@ -49,13 +37,7 @@ brooklyn.enrichers:
 Aggregates multiple sensor values (usually across a tier, esp. a cluster) and performs a supplied aggregation method to them to return an aggregate figure, e.g. sum, mean, median, etc.
 
 {% highlight yaml %}
-brooklyn.enrichers:
-- type: org.apache.brooklyn.enricher.stock.Aggregator
-  brooklyn.config:
-    enricher.sourceSensor: $brooklyn:sensor("webapp.reqs.perSec.windowed")
-    enricher.targetSensor: $brooklyn:sensor("webapp.reqs.perSec.perNode")
-    enricher.aggregating.fromMembers: true
-    transformation: average
+{% readj example_yaml/enricher-aggregator.yaml %}
 {% endhighlight %}
 
 There are a number of additional configuration keys available for the Aggregators:
@@ -73,12 +55,7 @@ There are a number of additional configuration keys available for the Aggregator
 Joins a sensor whose output is a list into a single item joined by a separator.
 
 {% highlight yaml %}
-brooklyn.enrichers:
-- type: org.apache.brooklyn.enricher.stock.Joiner
-  brooklyn.config:
-    enricher.sourceSensor: $brooklyn:sensor("urls.tcp.list")
-    enricher.targetSensor: $brooklyn:sensor("urls.tcp.string")
-    uniqueTag: urls.quoted.string
+{% readj example_yaml/enricher-joiner.yaml %}
 {% endhighlight %}
 
 There are a number of additional configuration keys available for the joiner:
@@ -105,12 +82,7 @@ Converts an absolute sensor into a delta sensor (i.e. the difference between the
 Converts absolute sensor values into a difference over time. The `enricher.delta.period` indicates the measurement interval.
 
 {% highlight yaml %}
-brooklyn.enrichers:
-- type: org.apache.brooklyn.enricher.stock.YamlTimeWeightedDeltaEnricher
-  brooklyn.config:
-    enricher.sourceSensor: reqs.count
-    enricher.targetSensor: reqs.per_sec
-    enricher.delta.period: 1s
+{% readj example_yaml/enricher-time-weighted-delta.yaml %}
 {% endhighlight %}
 
 ####	Rolling Mean
@@ -159,14 +131,7 @@ is actually a sensor on a different entity called `load.balancer`. In this case,
 `enricher.producer` value.
 
 {% highlight yaml %}
-brooklyn.enrichers:
-- type: org.apache.brooklyn.enricher.stock.Transformer
-  brooklyn.config:
-    enricher.producer: $brooklyn:entity("load.balancer")
-    enricher.sourceSensor: $brooklyn:sensor("urls.tcp.string")
-    enricher.targetSensor: $brooklyn:sensor("urls.tcp.withBrackets")
-    enricher.targetValue: |
-      $brooklyn:formatString("[%s]", $brooklyn:attributeWhenReady("urls.tcp.string"))
+{% readj example_yaml/enricher-transformer.yaml %}
 {% endhighlight %}
 
 It is important to note that the value supplied to `enricher.producer` must be immediately resolvable. While it would be valid

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/appserver-configured-in-config.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-configured-in-config.yaml b/guide/blueprints/example_yaml/appserver-configured-in-config.yaml
deleted file mode 100644
index 765a8c2..0000000
--- a/guide/blueprints/example_yaml/appserver-configured-in-config.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: appserver-configured-in-config
-services:
-- type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
-  brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
-    http.port: 8080

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/appserver-configured.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-configured.yaml b/guide/blueprints/example_yaml/appserver-configured.yaml
index 51bf3ca..5d85edd 100644
--- a/guide/blueprints/example_yaml/appserver-configured.yaml
+++ b/guide/blueprints/example_yaml/appserver-configured.yaml
@@ -1,5 +1,6 @@
 name: appserver-configured
 services:
 - type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
-  war: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
-  httpPort: 8080
+  brooklyn.config:
+    wars.root: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
+    http.port: 8080

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/appserver-w-policy.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-w-policy.yaml b/guide/blueprints/example_yaml/appserver-w-policy.yaml
index 4b10f59..dc13dad 100644
--- a/guide/blueprints/example_yaml/appserver-w-policy.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-policy.yaml
@@ -15,11 +15,11 @@ services:
   brooklyn.policies:
   - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
     brooklyn.config:
-      metric: $brooklyn:sensor("brooklyn.entity.webapp.DynamicWebAppCluster", "webapp.reqs.perSec.windowed.perNode")
-      metricLowerBound: 10
-      metricUpperBound: 100
-      minPoolSize: 1
-      maxPoolSize: 5
+      autoscaler.metric: $brooklyn:sensor("brooklyn.entity.webapp.DynamicWebAppCluster", "webapp.reqs.perSec.windowed.perNode")
+      autoscaler.metricLowerBound: 10
+      autoscaler.metricUpperBound: 100
+      autoscaler.minPoolSize: 1
+      autoscaler.maxPoolSize: 5
 - type: org.apache.brooklyn.entity.database.mysql.MySqlNode
   id: db
   name: DB HelloWorld Visitors

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/enricher-aggregator.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/enricher-aggregator.yaml b/guide/blueprints/example_yaml/enricher-aggregator.yaml
new file mode 100644
index 0000000..0538bb1
--- /dev/null
+++ b/guide/blueprints/example_yaml/enricher-aggregator.yaml
@@ -0,0 +1,7 @@
+brooklyn.enrichers:
+- type: org.apache.brooklyn.enricher.stock.Aggregator
+  brooklyn.config:
+    enricher.sourceSensor: $brooklyn:sensor("webapp.reqs.perSec.windowed")
+    enricher.targetSensor: $brooklyn:sensor("webapp.reqs.perSec.perNode")
+    enricher.aggregating.fromMembers: true
+    enricher.transformation.untyped: average
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/enricher-joiner.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/enricher-joiner.yaml b/guide/blueprints/example_yaml/enricher-joiner.yaml
new file mode 100644
index 0000000..670d4f2
--- /dev/null
+++ b/guide/blueprints/example_yaml/enricher-joiner.yaml
@@ -0,0 +1,6 @@
+brooklyn.enrichers:
+- type: org.apache.brooklyn.enricher.stock.Joiner
+  brooklyn.config:
+    enricher.sourceSensor: $brooklyn:sensor("urls.tcp.list")
+    enricher.targetSensor: $brooklyn:sensor("urls.tcp.string")
+    uniqueTag: urls.quoted.string
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/enricher-propagator.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/enricher-propagator.yaml b/guide/blueprints/example_yaml/enricher-propagator.yaml
new file mode 100644
index 0000000..4ef1f4f
--- /dev/null
+++ b/guide/blueprints/example_yaml/enricher-propagator.yaml
@@ -0,0 +1,8 @@
+brooklyn.enrichers:
+- type: org.apache.brooklyn.enricher.stock.Propagator
+  brooklyn.config:
+    enricher.producer: $brooklyn:entity("cluster")
+- type: org.apache.brooklyn.enricher.stock.Propagator
+  brooklyn.config:
+    enricher.propagating.sensorMapping:
+      $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/enricher-time-weighted-delta.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/enricher-time-weighted-delta.yaml b/guide/blueprints/example_yaml/enricher-time-weighted-delta.yaml
new file mode 100644
index 0000000..2c38dee
--- /dev/null
+++ b/guide/blueprints/example_yaml/enricher-time-weighted-delta.yaml
@@ -0,0 +1,6 @@
+brooklyn.enrichers:
+- type: org.apache.brooklyn.enricher.stock.YamlTimeWeightedDeltaEnricher
+  brooklyn.config:
+    enricher.sourceSensor: reqs.count
+    enricher.targetSensor: reqs.per_sec
+    enricher.delta.period: 1s
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/enricher-transformer.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/enricher-transformer.yaml b/guide/blueprints/example_yaml/enricher-transformer.yaml
new file mode 100644
index 0000000..06e5a67
--- /dev/null
+++ b/guide/blueprints/example_yaml/enricher-transformer.yaml
@@ -0,0 +1,6 @@
+brooklyn.enrichers:
+- type: org.apache.brooklyn.enricher.stock.Transformer
+  brooklyn.config:
+    enricher.sourceSensor: $brooklyn:sensor("urls.tcp.string")
+    enricher.targetSensor: $brooklyn:sensor("urls.tcp.withBrackets")
+    enricher.targetValue: $brooklyn:formatString("[%s]", $brooklyn:attributeWhenReady("urls.tcp.string"))
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/simple-vm.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/simple-vm.yaml b/guide/blueprints/example_yaml/simple-vm.yaml
index 8f6447c..141c7e8 100644
--- a/guide/blueprints/example_yaml/simple-vm.yaml
+++ b/guide/blueprints/example_yaml/simple-vm.yaml
@@ -2,7 +2,8 @@ name: simple-vm
 services:
 - type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess
   name: VM
-  provisioning.properties:
-    minRam: 8192mb
-    minCores: 4
-    minDisk: 100gb
+  brooklyn.config:
+    provisioning.properties:
+      minRam: 8192mb
+      minCores: 4
+      minDisk: 100gb

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml b/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
index 93b6795..f73578e 100644
--- a/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
+++ b/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
@@ -26,7 +26,7 @@ services:
           # from which to take sensors; in that mode you can specify `propagate` as a list of sensors whose names are unchanged,
           # instead of (or in addition to) this map
           brooklyn.config:
-            sensorMapping:
+            enricher.propagating.sensorMapping:
               $brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
   brooklyn.enrichers:
   - type: org.apache.brooklyn.enricher.stock.Aggregator
@@ -40,7 +40,7 @@ services:
     brooklyn.config:
       enricher.sourceSensor: $brooklyn:sensor("urls.list")
       enricher.targetSensor: $brooklyn:sensor("urls.list.comma_separated.max_2")
-      maximum: 2
+      enricher.joiner.maximum: 2
       # TODO infer uniqueTag, name etc
       uniqueTag: urls.list.comma_separated.max_2
   - type: org.apache.brooklyn.enricher.stock.Joiner
@@ -48,11 +48,11 @@ services:
     brooklyn.config:
       enricher.sourceSensor: $brooklyn:sensor("urls.list")
       enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
-      quote: false
-      maximum: 1
+      enricher.joiner.quote: false
+      enricher.joiner.maximum: 1
 brooklyn.enrichers:
 - type: org.apache.brooklyn.enricher.stock.Propagator
   # if nothing specified for `propagating` or `sensorMapping` then 
   # Propagator will do all but the usual lifecycle defaults, handy at the root!
   brooklyn.config:
-    producer: $brooklyn:entity("cluster")
+    enricher.producer: $brooklyn:entity("cluster")

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat-catalog.bom
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-catalog.bom b/guide/blueprints/example_yaml/vanilla-bash-netcat-catalog.bom
index 6416ab7..1dfcc34 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-catalog.bom
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-catalog.bom
@@ -6,13 +6,14 @@ brooklyn.catalog:
     type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
     name: Simple Netcat Server
 
-    launch.command: |
-      echo $MESSAGE | nc -l $NETCAT_PORT &
-      echo $! > $PID_FILE
-        
-    env:
-      MESSAGE: $brooklyn:config("message")
-      NETCAT_PORT: $brooklyn:attributeWhenReady("netcat.port")
+    brooklyn.config:
+      launch.command: |
+        echo $MESSAGE | nc -l $NETCAT_PORT &
+        echo $! > $PID_FILE
+
+      shell.env:
+        MESSAGE: $brooklyn:config("message")
+        NETCAT_PORT: $brooklyn:attributeWhenReady("netcat.port")
       
     brooklyn.parameters:
     - name: message

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat-cluster.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-cluster.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-cluster.yaml
index 813445f..1686f29 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-cluster.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-cluster.yaml
@@ -9,4 +9,4 @@ services:
         message: hello from cluster member
         netcat.port: 8000+
     cluster.initial.size: 3
-    restartMode: parallel
+    dynamiccluster.restartMode: parallel

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat-env.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-env.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-env.yaml
index 061d31b..3f04a3b 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-env.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-env.yaml
@@ -3,10 +3,12 @@ location: localhost
 services:
 - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
   name: Simple Netcat Server
-  launch.command: |
-    echo $MESSAGE | nc -l $NETCAT_PORT &
-    echo $! > $PID_FILE
-    
-  env:
-    MESSAGE: hello
-    NETCAT_PORT: 4321
+
+  brooklyn.config:
+    launch.command: |
+      echo $MESSAGE | nc -l $NETCAT_PORT &
+      echo $! > $PID_FILE
+
+    shell.env:
+      MESSAGE: hello
+      NETCAT_PORT: 4321

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml
index d768739..86bc2b8 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml
@@ -3,4 +3,5 @@ location: localhost
 services:
 - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
   name: Simple Netcat Server
-  download.url: file:///tmp/netcat-server.tgz
+  brooklyn.config:
+    download.url: file:///tmp/netcat-server.tgz

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat-more-commands.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-more-commands.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-more-commands.yaml
index f4e894f..66096a8 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-more-commands.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-more-commands.yaml
@@ -3,14 +3,15 @@ location: localhost
 services:
 - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
   name: Simple Netcat Server
-  launch.command: |
-    echo hello | nc -l 4321 &
-    echo $! > $PID_FILE
+  brooklyn.config:
+    launch.command: |
+      echo hello | nc -l 4321 &
+      echo $! > $PID_FILE
 
-  # The following overrides demonstrate the use of a custom shell environment as well as
-  # check-running and stop commands. These are optional; default behavior will "do the
-  # right thing" with the pid file automatically.
+    # The following overrides demonstrate the use of a custom shell environment as well as
+    # check-running and stop commands. These are optional; default behavior will "do the
+    # right thing" with the pid file automatically.
 
-  env:                  { CHECK_MARKER: "checkRunning", STOP_MARKER: "stop" }
-  checkRunning.command: echo $CHECK_MARKER >> DATE && test -f "$PID_FILE" && ps -p `cat $PID_FILE` >/dev/null
-  stop.command:         echo $STOP_MARKER  >> DATE && test -f "$PID_FILE" && { kill -9 `cat $PID_FILE`; rm /tmp/vanilla.pid; }
+    shell.env:            { CHECK_MARKER: "checkRunning", STOP_MARKER: "stop" }
+    checkRunning.command: echo $CHECK_MARKER >> DATE && test -f "$PID_FILE" && ps -p `cat $PID_FILE` >/dev/null
+    stop.command:         echo $STOP_MARKER  >> DATE && test -f "$PID_FILE" && { kill -9 `cat $PID_FILE`; rm /tmp/vanilla.pid; }

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat-port-parameter.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-port-parameter.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-port-parameter.yaml
index 90f83b4..d7a999d 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-port-parameter.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-port-parameter.yaml
@@ -3,13 +3,14 @@ location: localhost
 services:
 - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
   name: Simple Netcat Server
-  launch.command: |
-    echo $MESSAGE | nc -l $NETCAT_PORT &
-    echo $! > $PID_FILE
-    
-  env:
-    MESSAGE: $brooklyn:config("message")
-    NETCAT_PORT: $brooklyn:attributeWhenReady("netcat.port")
+  brooklyn.config:
+    launch.command: |
+      echo $MESSAGE | nc -l $NETCAT_PORT &
+      echo $! > $PID_FILE
+
+    shell.env:
+      MESSAGE: $brooklyn:config("message")
+      NETCAT_PORT: $brooklyn:attributeWhenReady("netcat.port")
   
   brooklyn.parameters:
   - name: message

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat-port.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-port.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-port.yaml
index 3ec0212..822f509 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-port.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-port.yaml
@@ -3,11 +3,12 @@ location: localhost
 services:
 - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
   name: Simple Netcat Server
-  launch.command: |
-    echo hello | nc -l 4321 &
-    echo $! > $PID_FILE
     
   brooklyn.config:
     # matching the regex `.*\.port` will cause the port to be opened
     # if in a cloud where configurable security groups are available
     netcat.port: 4321
+
+    launch.command: |
+      echo hello | nc -l 4321 &
+      echo $! > $PID_FILE

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat-restarter.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-restarter.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-restarter.yaml
index 47e54ab..9acbf54 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-restarter.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-restarter.yaml
@@ -4,9 +4,10 @@ services:
 - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
   id: netcat-server
   name: Simple Netcat Server
-  launch.command: |
-    echo hello | nc -l 4321 &
-    echo $! > $PID_FILE
+  brooklyn.config:
+    launch.command: |
+      echo hello | nc -l 4321 &
+      echo $! > $PID_FILE
   brooklyn.enrichers:
   - type: org.apache.brooklyn.policy.ha.ServiceFailureDetector
     brooklyn.config:

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
index 75d2b79..64377b2 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
@@ -8,9 +8,10 @@ services:
 - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
   id: netcat-server
   name: Simple Netcat Server
-  launch.command: |
-    echo hello | nc -l 4321 >> server-input &
-    echo $! > $PID_FILE
+  brooklyn.config:
+    launch.command: |
+      echo hello | nc -l 4321 >> server-input &
+      echo $! > $PID_FILE
 
   # a failure detector and a service restarter work together
   brooklyn.enrichers:
@@ -44,17 +45,18 @@ services:
 # a client to hit netcat
 - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
   name: Simple Pinger
-  
-  # set the hostname of the netcat instance as an env var for the scripts 
-  env:
-    TARGET_HOSTNAME: 
-      $brooklyn:entity("netcat-server").
-        attributeWhenReady("host.name")
+
+  brooklyn.config:
+    # set the hostname of the netcat instance as an env var for the scripts
+    shell.env:
+      TARGET_HOSTNAME:
+        $brooklyn:entity("netcat-server").
+          attributeWhenReady("host.name")
     
-  # start/check/stop are no-op
-  launch.command: ""
-  checkRunning.command: ""
-  stop.command: ""
+    # start/check/stop are no-op
+    launch.command: ""
+    checkRunning.command: ""
+    stop.command: ""
   
   brooklyn.initializers:
   # but there is a sample effector which runs nc in client mode

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/example_yaml/vanilla-bash-netcat.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat.yaml
index df616af..011d45e 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat.yaml
@@ -3,6 +3,7 @@ location: localhost
 services:
 - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
   name: Simple Netcat Server
-  launch.command: |
-    echo hello | nc -l 4321 &
-    echo $! > $PID_FILE
+  brooklyn.config:
+    launch.command: |
+      echo hello | nc -l 4321 &
+      echo $! > $PID_FILE

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/multiple-services.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/multiple-services.md b/guide/blueprints/multiple-services.md
index 81ddf07..518b64c 100644
--- a/guide/blueprints/multiple-services.md
+++ b/guide/blueprints/multiple-services.md
@@ -25,17 +25,6 @@ running on port 8080.
 **Tip**:  If port 8080 might be in use, you can specify `8080+` to take the first available port >= 8080;
 the actual port will be reported as a sensor by Brooklyn.
 
-It's also worth indicating an alternate, more formal syntax.
-Not all configuration on entities is supported at the top level of the service specification
-(only those which are defined as "flags" in the underlying blueprint,
-e.g. the `@SetFromFlag("war")` in the `WebAppServiceConstants` parent of `JBoss7Server`).
-All configuration has a formal qualified name, and this can be supplied even where flags or config keys are not
-explicitly defined, by placing it into a `brooklyn.config` section:
-
-{% highlight yaml %}
-{% readj example_yaml/appserver-configured-in-config.yaml %}
-{% endhighlight %}
-
 
 ### Multiple Services
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/policies.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/policies.md b/guide/blueprints/policies.md
index e5f7dde..98cd873 100644
--- a/guide/blueprints/policies.md
+++ b/guide/blueprints/policies.md
@@ -44,12 +44,12 @@ e.g. if the average request per second across a cluster of Tomcat servers goes o
 brooklyn.policies:
 - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
   brooklyn.config:
-    metric: webapp.reqs.perSec.perNode
-    metricUpperBound: 3
-    metricLowerBound: 1
-    resizeUpStabilizationDelay: 2s
-    resizeDownStabilizationDelay: 1m
-    maxPoolSize: 3
+    autoscaler.metric: webapp.reqs.perSec.perNode
+    autoscaler.metricUpperBound: 3
+    autoscaler.metricLowerBound: 1
+    autoscaler.resizeUpStabilizationDelay: 2s
+    autoscaler.resizeDownStabilizationDelay: 1m
+    autoscaler.maxPoolSize: 3
 
 {% endhighlight %}
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/test/example_yaml/entities/loopovergroupmembers-entity.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/entities/loopovergroupmembers-entity.yaml b/guide/blueprints/test/example_yaml/entities/loopovergroupmembers-entity.yaml
index 713ffbc..542a56e 100644
--- a/guide/blueprints/test/example_yaml/entities/loopovergroupmembers-entity.yaml
+++ b/guide/blueprints/test/example_yaml/entities/loopovergroupmembers-entity.yaml
@@ -1,6 +1,7 @@
 - type: org.apache.brooklyn.test.framework.LoopOverGroupMembersTestCase
-  target: $brooklyn:entity("infrastructure").component("child", "DockerHosts")
-  testSpec:
-    $brooklyn:entitySpec:
-      type: org.apache.brooklyn.test.framework.TestSensor
-      ...
\ No newline at end of file
+  brooklyn.config:
+    target: $brooklyn:entity("infrastructure").component("child", "DockerHosts")
+    test.spec:
+      $brooklyn:entitySpec:
+        type: org.apache.brooklyn.test.framework.TestSensor
+        ...
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/test/example_yaml/entities/testeffector-entity.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/entities/testeffector-entity.yaml b/guide/blueprints/test/example_yaml/entities/testeffector-entity.yaml
index e9d570e..2905806 100644
--- a/guide/blueprints/test/example_yaml/entities/testeffector-entity.yaml
+++ b/guide/blueprints/test/example_yaml/entities/testeffector-entity.yaml
@@ -1,8 +1,9 @@
 - type: org.apache.brooklyn.test.framework.TestEffector
   name: Invoke Deploy Effector
-  target: $brooklyn:entity("tomcat")
-  effector: deploy
-  timeout: 5m
-  params:
-    url: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
-    targetName: newcontext
\ No newline at end of file
+  brooklyn.config:
+    target: $brooklyn:entity("tomcat")
+    effector: deploy
+    timeout: 5m
+    params:
+      url: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
+      targetName: newcontext
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/test/example_yaml/entities/testhttpcall-entity.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/entities/testhttpcall-entity.yaml b/guide/blueprints/test/example_yaml/entities/testhttpcall-entity.yaml
index e719b82..ce41b86 100644
--- a/guide/blueprints/test/example_yaml/entities/testhttpcall-entity.yaml
+++ b/guide/blueprints/test/example_yaml/entities/testhttpcall-entity.yaml
@@ -1,7 +1,8 @@
 - type: org.apache.brooklyn.test.framework.TestHttpCall
   name: Check HTTP Response Status Code
-  url: $brooklyn:entity("tomcat").attributeWhenReady("webapp.url")
-  timeout: 60s
-  applyAssertionTo: status
-  assert:
-  - isEqualTo: 200
\ No newline at end of file
+  brooklyn.config:
+    url: $brooklyn:entity("tomcat").attributeWhenReady("webapp.url")
+    timeout: 60s
+    applyAssertionTo: status
+    assert:
+    - isEqualTo: 200
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/test/example_yaml/entities/testsensor-entity.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/entities/testsensor-entity.yaml b/guide/blueprints/test/example_yaml/entities/testsensor-entity.yaml
index 91f55a5..40a8f15 100644
--- a/guide/blueprints/test/example_yaml/entities/testsensor-entity.yaml
+++ b/guide/blueprints/test/example_yaml/entities/testsensor-entity.yaml
@@ -1,7 +1,8 @@
 - type: org.apache.brooklyn.test.framework.TestSensor
   name: Check tomcat isUp
-  target: $brooklyn:entity("tomcat")
-  sensor: service.isUp
-  timeout: 10m
-  assert:
-  - equals: true
\ No newline at end of file
+  brooklyn.config:
+    target: $brooklyn:entity("tomcat")
+    sensor: service.isUp
+    timeout: 10m
+    assert:
+    - equals: true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/test/example_yaml/entities/testsshcommand-entity.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/entities/testsshcommand-entity.yaml b/guide/blueprints/test/example_yaml/entities/testsshcommand-entity.yaml
index bcf39cf..0917d7f 100644
--- a/guide/blueprints/test/example_yaml/entities/testsshcommand-entity.yaml
+++ b/guide/blueprints/test/example_yaml/entities/testsshcommand-entity.yaml
@@ -7,22 +7,24 @@ services:
 
     - type: org.apache.brooklyn.test.framework.TestSshCommand
       name: Check tomcat process running with ps
-      targetId: testprocess
-      command: ps -ef
-      assertStatus:
-        equals: 0
-      assertOut:
-        contains: tomcat
-      assertErr: 
-        isEmpty: true
+      brooklyn.config:
+        targetId: testprocess
+        command: ps -ef
+        assert.status:
+          equals: 0
+        assert.out:
+          contains: tomcat
+        assert.err:
+          isEmpty: true
 
     - type: org.apache.brooklyn.test.framework.TestSshCommand
       name: Check hello world script
-      targetId: testprocess
-      downloadUrl: https://github.com/apache/brooklyn-docs/raw/master/guide/blueprints/test/example_yaml/entities/script1.sh
-      assertStatus:
-        equals: 0
-      assertOut: 
-        equals: hello world
-      assertErr: 
-        isEmpty: true
+      brooklyn.config:
+        targetId: testprocess
+        download.url: https://github.com/apache/brooklyn-docs/raw/master/guide/blueprints/test/example_yaml/entities/script1.sh
+        assert.status:
+          equals: 0
+        assert.out:
+          equals: hello world
+        assert.err:
+          isEmpty: true

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/test/example_yaml/testcases/effector-test-snippet.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/testcases/effector-test-snippet.yaml b/guide/blueprints/test/example_yaml/testcases/effector-test-snippet.yaml
index 2e01ba5..ad8659a 100644
--- a/guide/blueprints/test/example_yaml/testcases/effector-test-snippet.yaml
+++ b/guide/blueprints/test/example_yaml/testcases/effector-test-snippet.yaml
@@ -3,26 +3,29 @@
   brooklyn.children:
   - type: org.apache.brooklyn.test.framework.TestSensor
     name: Check webappcluster isUp
-    targetId: webappcluster
-    sensor: service.isUp
-    timeout: 10m
-    assert:
-    - equals: true
+    brooklyn.config:
+      targetId: webappcluster
+      sensor: service.isUp
+      timeout: 10m
+      assert:
+      - equals: true
   - type: org.apache.brooklyn.test.framework.TestEffector
     name: Invoke Deploy Effector
-    targetId: webappcluster
-    effector: deploy
-    timeout: 5m
-    params:
-      url: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
-      targetName: newcontext
+    brooklyn.config:
+      targetId: webappcluster
+      effector: deploy
+      timeout: 5m
+      params:
+        url: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
+        targetName: newcontext
   - type: org.apache.brooklyn.test.framework.TestHttpCall
     name: Check Deployed Webapp Status Code
-    timeout: 5m
-    url: >
-      $brooklyn:formatString("http://%s:%s/newcontext/",
-      $brooklyn:entity("webappcluster").attributeWhenReady("host.address"),
-      $brooklyn:entity("webappcluster").attributeWhenReady("proxy.http.port"))
-    applyAssertionTo: status
-    assert:
-    - isEqualTo: 200
\ No newline at end of file
+    brooklyn.config:
+      timeout: 5m
+      url: >
+        $brooklyn:formatString("http://%s:%s/newcontext/",
+        $brooklyn:entity("webappcluster").attributeWhenReady("host.address"),
+        $brooklyn:entity("webappcluster").attributeWhenReady("proxy.http.port"))
+      applyAssertionTo: status
+      assert:
+      - isEqualTo: 200
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml b/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml
index d6740ec..339f121 100644
--- a/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml
+++ b/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml
@@ -20,52 +20,57 @@ services:
   id: db
   name: My DB
   brooklyn.config:
-    creationScriptUrl: https://bit.ly/brooklyn-visitors-creation-script
+    datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script
 - type: org.apache.brooklyn.test.framework.TestHttpCall
   name: Check HTTP Response Status Code
-  url: >
-    $brooklyn:formatString("http://%s:%s",
-    $brooklyn:entity("webappcluster").attributeWhenReady("host.address"),
-    $brooklyn:entity("webappcluster").attributeWhenReady("proxy.http.port"))
-  timeout: 10m
-  applyAssertionTo: status
-  assert:
-  - isEqualTo: 200
+  brooklyn.config:
+    url: >
+      $brooklyn:formatString("http://%s:%s",
+      $brooklyn:entity("webappcluster").attributeWhenReady("host.address"),
+      $brooklyn:entity("webappcluster").attributeWhenReady("proxy.http.port"))
+    timeout: 10m
+    applyAssertionTo: status
+    assert:
+    - isEqualTo: 200
 - type: org.apache.brooklyn.test.framework.TestHttpCall
   name: Check HTTP Response Body
-  url: >
-    $brooklyn:formatString("http://%s:%s",
-    $brooklyn:entity("webappcluster").attributeWhenReady("host.address"),
-    $brooklyn:entity("webappcluster").attributeWhenReady("proxy.http.port"))
-  timeout: 10m
-  applyAssertionTo: body
-  assert:
-  - matches: "(?s).*Br[o]{2}klyn Deployed.*"
+  brooklyn.config:
+    url: >
+      $brooklyn:formatString("http://%s:%s",
+      $brooklyn:entity("webappcluster").attributeWhenReady("host.address"),
+      $brooklyn:entity("webappcluster").attributeWhenReady("proxy.http.port"))
+    timeout: 10m
+    applyAssertionTo: body
+    assert:
+    - matches: "(?s).*Br[o]{2}klyn Deployed.*"
 - type: org.apache.brooklyn.test.framework.TestCase
   name: Check Deploy Effector
   brooklyn.children:
   - type: org.apache.brooklyn.test.framework.TestSensor
     name: Check webappcluster isUp
-    targetId: webappcluster
-    sensor: service.isUp
-    timeout: 10m
-    assert:
-    - equals: true
+    brooklyn.config:
+      targetId: webappcluster
+      sensor: service.isUp
+      timeout: 10m
+      assert:
+      - equals: true
   - type: org.apache.brooklyn.test.framework.TestEffector
     name: Invoke Deploy Effector
-    targetId: webappcluster
-    effector: deploy
-    timeout: 5m
-    params:
-      url: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
-      targetName: newcontext
+    brooklyn.config:
+      targetId: webappcluster
+      effector: deploy
+      timeout: 5m
+      params:
+        url: http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war
+        targetName: newcontext
   - type: org.apache.brooklyn.test.framework.TestHttpCall
     name: Check Deployed Webapp Status Code
-    timeout: 5m
-    url: >
-      $brooklyn:formatString("http://%s:%s/newcontext/",
-      $brooklyn:entity("webappcluster").attributeWhenReady("host.address"),
-      $brooklyn:entity("webappcluster").attributeWhenReady("proxy.http.port"))
-    applyAssertionTo: status
-    assert:
-    - isEqualTo: 200
\ No newline at end of file
+    brooklyn.config:
+      timeout: 5m
+      url: >
+        $brooklyn:formatString("http://%s:%s/newcontext/",
+        $brooklyn:entity("webappcluster").attributeWhenReady("host.address"),
+        $brooklyn:entity("webappcluster").attributeWhenReady("proxy.http.port"))
+      applyAssertionTo: status
+      assert:
+      - isEqualTo: 200
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/test/example_yaml/testcases/http-test-snippet.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/testcases/http-test-snippet.yaml b/guide/blueprints/test/example_yaml/testcases/http-test-snippet.yaml
index 0a7a953..324730f 100644
--- a/guide/blueprints/test/example_yaml/testcases/http-test-snippet.yaml
+++ b/guide/blueprints/test/example_yaml/testcases/http-test-snippet.yaml
@@ -1,20 +1,22 @@
 - type: org.apache.brooklyn.test.framework.TestHttpCall
   name: Check HTTP Response Status Code
-  url: >
-    $brooklyn:formatString("http://%s:%s/newcontext/",
-    $brooklyn:component("webappcluster").attributeWhenReady("host.address"),
-    $brooklyn:component("webappcluster").attributeWhenReady("proxy.http.port"))
-  timeout: 10m
-  applyAssertionTo: status
-  assert:
-  - equals: 200
+  brooklyn.config:
+    url: >
+      $brooklyn:formatString("http://%s:%s/newcontext/",
+      $brooklyn:component("webappcluster").attributeWhenReady("host.address"),
+      $brooklyn:component("webappcluster").attributeWhenReady("proxy.http.port"))
+    timeout: 10m
+    applyAssertionTo: status
+    assert:
+    - equals: 200
 - type: org.apache.brooklyn.test.framework.TestHttpCall
   name: Check HTTP Response Body
-  url: >
-    $brooklyn:formatString("http://%s:%s/newcontext/",
-    $brooklyn:component("webappcluster").attributeWhenReady("host.address"),
-    $brooklyn:component("webappcluster").attributeWhenReady("proxy.http.port"))
-  timeout: 10m
-  applyAssertionTo: body
-  assert:
-  - matches: "(?s).*Br[o]{2}klyn Deployed.*"
\ No newline at end of file
+  brooklyn.config:
+    url: >
+      $brooklyn:formatString("http://%s:%s/newcontext/",
+      $brooklyn:component("webappcluster").attributeWhenReady("host.address"),
+      $brooklyn:component("webappcluster").attributeWhenReady("proxy.http.port"))
+    timeout: 10m
+    applyAssertionTo: body
+    assert:
+    - matches: "(?s).*Br[o]{2}klyn Deployed.*"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/blueprints/test/example_yaml/testcases/sensor-test-snippet.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/testcases/sensor-test-snippet.yaml b/guide/blueprints/test/example_yaml/testcases/sensor-test-snippet.yaml
index da58cd1..4677403 100644
--- a/guide/blueprints/test/example_yaml/testcases/sensor-test-snippet.yaml
+++ b/guide/blueprints/test/example_yaml/testcases/sensor-test-snippet.yaml
@@ -1,7 +1,8 @@
 - type: org.apache.brooklyn.test.framework.TestSensor
   name: Check webappcluster isUp
-  targetId: webappcluster
-  sensor: service.isUp
-  timeout: 10m
-  assert:
-  - equals: true
\ No newline at end of file
+  brooklyn.config:
+    targetId: webappcluster
+    sensor: service.isUp
+    timeout: 10m
+    assert:
+    - equals: true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/ops/gui/_my-web-cluster.yaml
----------------------------------------------------------------------
diff --git a/guide/ops/gui/_my-web-cluster.yaml b/guide/ops/gui/_my-web-cluster.yaml
index 220dc09..c92da48 100644
--- a/guide/ops/gui/_my-web-cluster.yaml
+++ b/guide/ops/gui/_my-web-cluster.yaml
@@ -20,4 +20,4 @@ services:
   name: My DB
   id: db
   brooklyn.config:
-    creationScriptUrl: https://bit.ly/brooklyn-visitors-creation-script
\ No newline at end of file
+    datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/ops/gui/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/ops/gui/_my-web-cluster2.yaml b/guide/ops/gui/_my-web-cluster2.yaml
index 2e4310f..b20d21a 100644
--- a/guide/ops/gui/_my-web-cluster2.yaml
+++ b/guide/ops/gui/_my-web-cluster2.yaml
@@ -16,16 +16,16 @@ services:
   brooklyn.policies:
   - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
     brooklyn.config:
-      metric: webapp.reqs.perSec.windowed.perNode
-      metricLowerBound: 0.1
-      metricUpperBound: 10
-      minPoolSize: 1
-      maxPoolSize: 4
-      resizeUpStabilizationDelay: 10s
-      resizeDownStabilizationDelay: 1m
+      autoscaler.metric: webapp.reqs.perSec.windowed.perNode
+      autoscaler.metricLowerBound: 0.1
+      autoscaler.metricUpperBound: 10
+      autoscaler.minPoolSize: 1
+      autoscaler.maxPoolSize: 4
+      autoscaler.resizeUpStabilizationDelay: 10s
+      autoscaler.resizeDownStabilizationDelay: 1m
 
 - type: org.apache.brooklyn.entity.database.mysql.MySqlNode
   id: db
   name: My DB
   brooklyn.config:
-    creationScriptUrl: https://bit.ly/brooklyn-visitors-creation-script
+    datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/start/_my-web-cluster.yaml
----------------------------------------------------------------------
diff --git a/guide/start/_my-web-cluster.yaml b/guide/start/_my-web-cluster.yaml
index 220dc09..c92da48 100644
--- a/guide/start/_my-web-cluster.yaml
+++ b/guide/start/_my-web-cluster.yaml
@@ -20,4 +20,4 @@ services:
   name: My DB
   id: db
   brooklyn.config:
-    creationScriptUrl: https://bit.ly/brooklyn-visitors-creation-script
\ No newline at end of file
+    datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/start/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/start/_my-web-cluster2.yaml b/guide/start/_my-web-cluster2.yaml
index 2e4310f..b20d21a 100644
--- a/guide/start/_my-web-cluster2.yaml
+++ b/guide/start/_my-web-cluster2.yaml
@@ -16,16 +16,16 @@ services:
   brooklyn.policies:
   - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
     brooklyn.config:
-      metric: webapp.reqs.perSec.windowed.perNode
-      metricLowerBound: 0.1
-      metricUpperBound: 10
-      minPoolSize: 1
-      maxPoolSize: 4
-      resizeUpStabilizationDelay: 10s
-      resizeDownStabilizationDelay: 1m
+      autoscaler.metric: webapp.reqs.perSec.windowed.perNode
+      autoscaler.metricLowerBound: 0.1
+      autoscaler.metricUpperBound: 10
+      autoscaler.minPoolSize: 1
+      autoscaler.maxPoolSize: 4
+      autoscaler.resizeUpStabilizationDelay: 10s
+      autoscaler.resizeDownStabilizationDelay: 1m
 
 - type: org.apache.brooklyn.entity.database.mysql.MySqlNode
   id: db
   name: My DB
   brooklyn.config:
-    creationScriptUrl: https://bit.ly/brooklyn-visitors-creation-script
+    datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/start/example_yaml/mycluster.yaml
----------------------------------------------------------------------
diff --git a/guide/start/example_yaml/mycluster.yaml b/guide/start/example_yaml/mycluster.yaml
index 35641be..f2c0359 100644
--- a/guide/start/example_yaml/mycluster.yaml
+++ b/guide/start/example_yaml/mycluster.yaml
@@ -37,12 +37,12 @@ services:
  
   - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
     brooklyn.config:
-      metric: webapp.reqs.perSec.perNode
-      metricUpperBound: 3
-      metricLowerBound: 1
-      resizeUpStabilizationDelay: 2s
-      resizeDownStabilizationDelay: 1m
-      maxPoolSize: 3
+      autoscaler.metric: webapp.reqs.perSec.perNode
+      autoscaler.metricUpperBound: 3
+      autoscaler.metricLowerBound: 1
+      autoscaler.resizeUpStabilizationDelay: 2s
+      autoscaler.resizeDownStabilizationDelay: 1m
+      autoscaler.maxPoolSize: 3
 
   brooklyn.enrichers:
   - type: org.apache.brooklyn.enricher.stock.Aggregator
@@ -50,7 +50,7 @@ services:
       enricher.sourceSensor: $brooklyn:sensor("webapp.reqs.perSec.windowed")
       enricher.targetSensor: $brooklyn:sensor("webapp.reqs.perSec.perNode")
       enricher.aggregating.fromMembers: true
-      transformation: average
+      enricher.transformation.untyped: average
 
 - type: org.apache.brooklyn.entity.proxy.nginx.NginxController
   name: Load Balancer (nginx)

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e7b87ec9/guide/start/policies.md
----------------------------------------------------------------------
diff --git a/guide/start/policies.md b/guide/start/policies.md
index f26b4e5..4f33697 100644
--- a/guide/start/policies.md
+++ b/guide/start/policies.md
@@ -57,12 +57,12 @@ services:
  
   - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
     brooklyn.config:
-      metric: webapp.reqs.perSec.perNode
-      metricUpperBound: 3
-      metricLowerBound: 1
-      resizeUpStabilizationDelay: 2s
-      resizeDownStabilizationDelay: 1m
-      maxPoolSize: 3
+      autoscaler.metric: webapp.reqs.perSec.perNode
+      autoscaler.metricUpperBound: 3
+      autoscaler.metricLowerBound: 1
+      autoscaler.resizeUpStabilizationDelay: 2s
+      autoscaler.resizeDownStabilizationDelay: 1m
+      autoscaler.maxPoolSize: 3
 
   brooklyn.enrichers:
   - type: org.apache.brooklyn.enricher.stock.Aggregator
@@ -70,7 +70,7 @@ services:
       enricher.sourceSensor: $brooklyn:sensor("webapp.reqs.perSec.windowed")
       enricher.targetSensor: $brooklyn:sensor("webapp.reqs.perSec.perNode")
       enricher.aggregating.fromMembers: true
-      transformation: average
+      enricher.transformation.untyped: average
 
 - type: org.apache.brooklyn.entity.proxy.nginx.NginxController
   name: Load Balancer (nginx)


Mime
View raw message