You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2019/04/10 20:36:16 UTC

svn commit: r1857283 [2/2] - in /brooklyn/site: ./ developers/ developers/code/ developers/committers/ developers/committers/release-process/ download/ learnmore/features/ meta/ node_modules/ style/js/catalog/

Modified: brooklyn/site/style/js/catalog/items.js
URL: http://svn.apache.org/viewvc/brooklyn/site/style/js/catalog/items.js?rev=1857283&r1=1857282&r2=1857283&view=diff
==============================================================================
--- brooklyn/site/style/js/catalog/items.js (original)
+++ brooklyn/site/style/js/catalog/items.js Wed Apr 10 20:36:16 2019
@@ -109,28 +109,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -184,7 +184,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -192,7 +192,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -433,7 +433,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -441,7 +441,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -465,7 +465,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -534,7 +534,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -542,28 +542,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -877,28 +877,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -1057,7 +1057,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -1065,7 +1065,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -1081,7 +1081,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -1150,7 +1150,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -1158,28 +1158,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -1312,14 +1312,14 @@ var items = {
     "iconUrl" : "classpath:///cassandra-logo.jpeg",
     "config" : [ {
       "name" : "cassandra.fabric.datacenter.namer",
-      "type" : "com.google.common.base.Function",
+      "type" : "com.google.common.base.Function<org.apache.brooklyn.api.location.Location, java.lang.String>",
       "description" : "Function used to provide the cassandra.replication.datacenterName for a given location",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "dynamicfabric.customChildFlags",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Additional flags to be passed to children when they are being created",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -1341,14 +1341,14 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamicfabric.firstmemberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "Entity spec for the first member",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "dynamicfabric.memberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "Entity spec for creating new members (one per location)",
       "reconfigurable" : false,
       "label" : "Member spec",
@@ -1526,7 +1526,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "cassandra.cluster.seedSupplier",
-      "type" : "com.google.common.base.Supplier",
+      "type" : "com.google.common.base.Supplier<java.util.Set<org.apache.brooklyn.api.entity.Entity>>",
       "description" : "For determining the seed nodes",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -1541,7 +1541,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "cassandra.cluster.tokenGenerator.class",
-      "type" : "java.lang.Class",
+      "type" : "java.lang.Class<? extends org.apache.brooklyn.entity.nosql.cassandra.TokenGenerator>",
       "description" : "For determining the tokens of nodes",
       "defaultValue" : "class org.apache.brooklyn.entity.nosql.cassandra.TokenGenerators$PosNeg63TokenGenerator",
       "reconfigurable" : false,
@@ -1606,7 +1606,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.availabilityZones",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.String>",
       "description" : "availability zones to use (if non-null, overrides other configuration)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -1621,7 +1621,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.firstmemberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating the first member of the cluster (if unset, will use the member spec for all)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -1636,7 +1636,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.memberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating new cluster members",
       "reconfigurable" : false,
       "label" : "Member spec",
@@ -1661,14 +1661,14 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.quarantineFilter",
-      "type" : "com.google.common.base.Predicate",
+      "type" : "com.google.common.base.Predicate<? super java.lang.Throwable>",
       "description" : "Quarantine the failed nodes that pass this filter (given the exception thrown by the node). Default is those that did not fail with NoMachinesAvailableException (Config ignored if quarantineFailedEntities is false)",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "dynamiccluster.removalstrategy",
-      "type" : "com.google.common.base.Function",
+      "type" : "com.google.common.base.Function<java.util.Collection<org.apache.brooklyn.api.entity.Entity>, org.apache.brooklyn.api.entity.Entity>",
       "description" : "strategy for deciding what to remove when down-sizing",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -2172,7 +2172,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "cassandra.tokens",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.math.BigInteger>",
       "description" : "Cassandra Tokens",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -2274,28 +2274,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -2357,7 +2357,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -2365,7 +2365,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -2596,7 +2596,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -2604,7 +2604,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -2628,7 +2628,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -2697,7 +2697,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -2705,28 +2705,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -3176,28 +3176,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -3259,7 +3259,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -3267,7 +3267,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -3521,7 +3521,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -3529,7 +3529,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -3553,7 +3553,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -3622,7 +3622,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -3630,28 +3630,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -3938,28 +3938,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -4029,7 +4029,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -4037,7 +4037,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -4268,7 +4268,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -4276,7 +4276,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -4300,7 +4300,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -4361,7 +4361,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "solr.core.config",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Map of core names to core configuration archive URL",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -4401,7 +4401,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -4409,28 +4409,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -4705,7 +4705,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "bind.entity.filter",
-      "type" : "com.google.common.base.Predicate",
+      "type" : "com.google.common.base.Predicate<? super org.apache.brooklyn.api.entity.Entity>",
       "description" : "Filter for entities which will use the BIND DNS service for name resolution.Default is all instances of SoftwareProcess in the application.",
       "defaultValue" : "Predicates.instanceOf(org.apache.brooklyn.entity.software.base.SoftwareProcess)",
       "reconfigurable" : false,
@@ -4736,14 +4736,14 @@ var items = {
       "links" : { }
     }, {
       "name" : "bind.sensor.address",
-      "type" : "org.apache.brooklyn.api.sensor.AttributeSensor",
+      "type" : "org.apache.brooklyn.api.sensor.AttributeSensor<java.lang.String>",
       "description" : "Sensor on managed entities that reports the address to register; host.address or host.subnet.address are common choices; blank (deprecated default behaviour) will inspect machines attached to entities but for legacy compatibility only; blueprints should set this",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "bind.sensor.hostname",
-      "type" : "org.apache.brooklyn.api.sensor.AttributeSensor",
+      "type" : "org.apache.brooklyn.api.sensor.AttributeSensor<java.lang.String>",
       "description" : "Sensor on managed entities that reports the basename for the hostname",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -4859,28 +4859,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -5039,7 +5039,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -5047,7 +5047,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -5063,7 +5063,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -5132,7 +5132,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -5140,28 +5140,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -5476,7 +5476,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "brooklynnode.copytorundir",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "URLs of resources to be copied across to the server, giving the path they are to be copied to",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -5696,28 +5696,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -5771,7 +5771,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -5779,7 +5779,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -5909,7 +5909,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -5917,7 +5917,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -5933,7 +5933,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -6002,7 +6002,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -6010,28 +6010,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -6188,13 +6188,13 @@ var items = {
         "shouldSanitize" : false
       }, {
         "name" : "blueprintConfig",
-        "type" : "java.util.Map",
+        "type" : "java.util.Map<java.lang.String, java.lang.Object>",
         "description" : "blueprintConfig",
         "defaultValue" : null,
         "shouldSanitize" : false
       }, {
         "name" : "blueprintPlan",
-        "type" : "java.util.Map",
+        "type" : "java.util.Map<java.lang.String, java.lang.Object>",
         "description" : "CAMP plan for the blueprint to be deployed; currently only supports Java map or JSON string (not yet YAML)",
         "defaultValue" : null,
         "shouldSanitize" : false
@@ -6360,7 +6360,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamicgroup.entityfilter",
-      "type" : "com.google.common.base.Predicate",
+      "type" : "com.google.common.base.Predicate<? super org.apache.brooklyn.api.entity.Entity>",
       "description" : "Filter for entities which will automatically be in the group",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -6423,7 +6423,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -6431,7 +6431,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -6776,7 +6776,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "couchbase.cluster.createBuckets",
-      "type" : "java.util.List",
+      "type" : "java.util.List<java.util.Map<java.lang.String, java.lang.Object>>",
       "description" : "a list of all dedicated port buckets to be created on the couchbase cluster",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -6814,14 +6814,14 @@ var items = {
       "links" : { }
     }, {
       "name" : "couchbase.cluster.replicationConfiguration",
-      "type" : "java.util.List",
+      "type" : "java.util.List<java.util.Map<java.lang.String, java.lang.Object>>",
       "description" : "List of replication rules to configure, each rule including target (id of another cluster) and mode (unidirectional or bidirectional)",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "dynamiccluster.availabilityZones",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.String>",
       "description" : "availability zones to use (if non-null, overrides other configuration)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -6836,7 +6836,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.firstmemberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating the first member of the cluster (if unset, will use the member spec for all)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -6851,7 +6851,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.memberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating new cluster members",
       "reconfigurable" : false,
       "label" : "Member spec",
@@ -6876,14 +6876,14 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.quarantineFilter",
-      "type" : "com.google.common.base.Predicate",
+      "type" : "com.google.common.base.Predicate<? super java.lang.Throwable>",
       "description" : "Quarantine the failed nodes that pass this filter (given the exception thrown by the node). Default is those that did not fail with NoMachinesAvailableException (Config ignored if quarantineFailedEntities is false)",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "dynamiccluster.removalstrategy",
-      "type" : "com.google.common.base.Function",
+      "type" : "com.google.common.base.Function<java.util.Collection<org.apache.brooklyn.api.entity.Entity>, org.apache.brooklyn.api.entity.Entity>",
       "description" : "strategy for deciding what to remove when down-sizing",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -7389,28 +7389,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -7570,7 +7570,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -7578,7 +7578,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -7594,7 +7594,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -7663,7 +7663,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -7671,28 +7671,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -8046,7 +8046,7 @@ var items = {
     } ]
   }, {
     "type" : "org.apache.brooklyn.entity.nosql.couchdb.CouchDBNode",
-    "defaultVersion" : "1.6.1",
+    "defaultVersion" : "1.7.2",
     "name" : "CouchDB Node",
     "description" : "Apache CouchDB is a database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API",
     "iconUrl" : "classpath:///couchdb-logo.png",
@@ -8162,28 +8162,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -8239,7 +8239,7 @@ var items = {
       "name" : "install.version",
       "type" : "java.lang.String",
       "description" : "The suggested version of the software to be installed",
-      "defaultValue" : "1.6.1",
+      "defaultValue" : "1.7.2",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
@@ -8359,7 +8359,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -8367,7 +8367,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -8383,7 +8383,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -8452,7 +8452,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -8460,28 +8460,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -8741,7 +8741,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.availabilityZones",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.String>",
       "description" : "availability zones to use (if non-null, overrides other configuration)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -8756,7 +8756,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.firstmemberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating the first member of the cluster (if unset, will use the member spec for all)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -8771,7 +8771,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.memberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating new cluster members",
       "reconfigurable" : false,
       "label" : "Member spec",
@@ -8796,14 +8796,14 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.quarantineFilter",
-      "type" : "com.google.common.base.Predicate",
+      "type" : "com.google.common.base.Predicate<? super java.lang.Throwable>",
       "description" : "Quarantine the failed nodes that pass this filter (given the exception thrown by the node). Default is those that did not fail with NoMachinesAvailableException (Config ignored if quarantineFailedEntities is false)",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "dynamiccluster.removalstrategy",
-      "type" : "com.google.common.base.Function",
+      "type" : "com.google.common.base.Function<java.util.Collection<org.apache.brooklyn.api.entity.Entity>, org.apache.brooklyn.api.entity.Entity>",
       "description" : "strategy for deciding what to remove when down-sizing",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -8896,7 +8896,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -8904,7 +8904,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -9271,7 +9271,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.availabilityZones",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.String>",
       "description" : "availability zones to use (if non-null, overrides other configuration)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -9286,7 +9286,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.firstmemberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating the first member of the cluster (if unset, will use the member spec for all)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -9301,7 +9301,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.memberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating new cluster members",
       "reconfigurable" : false,
       "label" : "Member spec",
@@ -9326,14 +9326,14 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.quarantineFilter",
-      "type" : "com.google.common.base.Predicate",
+      "type" : "com.google.common.base.Predicate<? super java.lang.Throwable>",
       "description" : "Quarantine the failed nodes that pass this filter (given the exception thrown by the node). Default is those that did not fail with NoMachinesAvailableException (Config ignored if quarantineFailedEntities is false)",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "dynamiccluster.removalstrategy",
-      "type" : "com.google.common.base.Function",
+      "type" : "com.google.common.base.Function<java.util.Collection<org.apache.brooklyn.api.entity.Entity>, org.apache.brooklyn.api.entity.Entity>",
       "description" : "strategy for deciding what to remove when down-sizing",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -9663,7 +9663,9 @@ var items = {
       "type" : "java.lang.String",
       "description" : "URL where the elasticsearch configuration file (in freemarker format) can be found",
       "reconfigurable" : false,
-      "constraints" : [ "Predicates.or(isBlank(),ResourcePredicates.exists())" ],
+      "constraints" : [ {
+        "any" : [ "isBlank", "urlExists" ]
+      } ],
       "links" : { }
     }, {
       "name" : "expandedinstall.dir",
@@ -9674,28 +9676,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -9765,7 +9767,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -9773,7 +9775,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -9903,7 +9905,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -9911,7 +9913,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -9927,7 +9929,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -9996,7 +9998,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -10004,28 +10006,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -10230,7 +10232,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.availabilityZones",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.String>",
       "description" : "availability zones to use (if non-null, overrides other configuration)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -10245,7 +10247,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.firstmemberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating the first member of the cluster (if unset, will use the member spec for all)",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -10260,7 +10262,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.memberspec",
-      "type" : "org.apache.brooklyn.api.entity.EntitySpec",
+      "type" : "org.apache.brooklyn.api.entity.EntitySpec<?>",
       "description" : "entity spec for creating new cluster members",
       "reconfigurable" : false,
       "label" : "Member spec",
@@ -10285,14 +10287,14 @@ var items = {
       "links" : { }
     }, {
       "name" : "dynamiccluster.quarantineFilter",
-      "type" : "com.google.common.base.Predicate",
+      "type" : "com.google.common.base.Predicate<? super java.lang.Throwable>",
       "description" : "Quarantine the failed nodes that pass this filter (given the exception thrown by the node). Default is those that did not fail with NoMachinesAvailableException (Config ignored if quarantineFailedEntities is false)",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "dynamiccluster.removalstrategy",
-      "type" : "com.google.common.base.Function",
+      "type" : "com.google.common.base.Function<java.util.Collection<org.apache.brooklyn.api.entity.Entity>, org.apache.brooklyn.api.entity.Entity>",
       "description" : "strategy for deciding what to remove when down-sizing",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -10595,28 +10597,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -10733,7 +10735,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -10741,7 +10743,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -10972,7 +10974,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -10980,7 +10982,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -11004,7 +11006,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -11073,7 +11075,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -11081,28 +11083,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -11272,6 +11274,7 @@ var items = {
     "name" : "JBoss Application Server 6",
     "description" : "AS6: an open source Java application server from JBoss",
     "iconUrl" : "classpath:///jboss-logo.png",
+    "deprecated" : true,
     "config" : [ {
       "name" : "archive.nameFormat",
       "type" : "java.lang.String",
@@ -11344,28 +11347,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -11435,7 +11438,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -11443,7 +11446,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -11698,7 +11701,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -11706,7 +11709,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -11730,7 +11733,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -11799,7 +11802,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -11807,28 +11810,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -12141,6 +12144,7 @@ var items = {
     "name" : "JBoss Application Server 7",
     "description" : "AS7: an open source Java application server from JBoss",
     "iconUrl" : "classpath:///jboss-logo.png",
+    "deprecated" : true,
     "config" : [ {
       "name" : "archive.nameFormat",
       "type" : "java.lang.String",
@@ -12213,28 +12217,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -12312,7 +12316,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",
       "description" : "Java command line options",
       "defaultValue" : [ ],
       "reconfigurable" : false,
@@ -12320,7 +12324,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.sysprops",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Java command line system properties (converted automatically into the format '-Dkey=value')",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -12458,7 +12462,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "provisioning.properties",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Custom properties to be passed in to the location when provisioning a new machine",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -12466,7 +12470,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "requiredOpenLoginPorts",
-      "type" : "java.util.Collection",
+      "type" : "java.util.Collection<java.lang.Integer>",
       "description" : "The port(s) to be opened (also see 'inboundPorts.autoInfer')",
       "defaultValue" : [ 22 ],
       "reconfigurable" : false,
@@ -12482,7 +12486,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "shell.env",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of environment variables to pass to the runtime shell. Non-string values are serialized to json before passed to the shell.",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -12551,7 +12555,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "template.substitutions",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.Object>",
       "description" : "Map of values to be substituted for the keys in any templated files used by the entity",
       "defaultValue" : { },
       "reconfigurable" : false,
@@ -12559,28 +12563,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "templates.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "templates.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Templated files to be filled in and copied before launch (and before pre-launch); mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -12682,7 +12686,7 @@ var items = {
       "description" : "Template file (in freemarker format) for the standalone.xml file",
       "defaultValue" : "classpath://org/apache/brooklyn/entity/webapp/jboss/jboss7-standalone.xml",
       "reconfigurable" : false,
-      "constraints" : [ "ResourcePredicates.exists()" ],
+      "constraints" : [ "urlExists" ],
       "links" : { }
     } ],
     "sensors" : [ {
@@ -13013,28 +13017,28 @@ var items = {
       "links" : { }
     }, {
       "name" : "files.customize",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before customize; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.install",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.preinstall",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before pre-install; mapping from resource to the destination name relative to installDir",
       "reconfigurable" : false,
       "constraints" : [ ],
       "links" : { }
     }, {
       "name" : "files.runtime",
-      "type" : "java.util.Map",
+      "type" : "java.util.Map<java.lang.String, java.lang.String>",
       "description" : "Files to be copied before launch (and before pre-launch); mapping from resource to the destination name relative to runDir",
       "reconfigurable" : false,
       "constraints" : [ ],
@@ -13104,7 +13108,7 @@ var items = {
       "links" : { }
     }, {
       "name" : "java.opts",
-      "type" : "java.util.Set",
+      "type" : "java.util.Set<java.lang.String>",

[... 4548 lines stripped ...]