From f94c2ae7c63b5170899c6c93587e22e709450140 Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Thu, 17 Jul 2014 12:40:58 -0400
Subject: [PATCH 1/7] tidies of Brooklyn node (warnings, logging)

---
 .../BrooklynNodeIntegrationTest.java          | 31 ++++++++++++++-----
 .../entity/brooklynnode/BrooklynNodeTest.java |  4 ---
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java
index fa0fda2aa2..ecc099faa4 100644
--- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java
+++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java
@@ -42,7 +42,6 @@
 import brooklyn.entity.brooklynnode.BrooklynNode.DeployBlueprintEffector;
 import brooklyn.entity.brooklynnode.BrooklynNode.ExistingFileBehaviour;
 import brooklyn.entity.proxying.EntitySpec;
-import brooklyn.event.feed.http.HttpValueFunctions;
 import brooklyn.event.feed.http.JsonFunctions;
 import brooklyn.location.Location;
 import brooklyn.location.LocationSpec;
@@ -53,8 +52,11 @@
 import brooklyn.test.entity.TestApplication;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.config.ConfigBag;
+import brooklyn.util.guava.Functionals;
 import brooklyn.util.http.HttpTool;
 import brooklyn.util.http.HttpToolResponse;
+import brooklyn.util.javalang.JavaClassNames;
+import brooklyn.util.os.Os;
 import brooklyn.util.text.Strings;
 import brooklyn.util.time.Time;
 
@@ -86,10 +88,10 @@ public class BrooklynNodeIntegrationTest {
 
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
-        pseudoBrooklynPropertiesFile = File.createTempFile("brooklynnode-test", ".properties");
+        pseudoBrooklynPropertiesFile = Os.newTempFile("brooklynnode-test", ".properties");
         pseudoBrooklynPropertiesFile.delete();
 
-        pseudoBrooklynCatalogFile = File.createTempFile("brooklynnode-test", ".catalog");
+        pseudoBrooklynCatalogFile = Os.newTempFile("brooklynnode-test", ".catalog");
         pseudoBrooklynCatalogFile.delete();
 
         app = ApplicationBuilder.newManagedApp(TestApplication.class);
@@ -109,6 +111,7 @@ public void testCanStartAndStop() throws Exception {
         BrooklynNode brooklynNode = app.createAndManageChild(EntitySpec.create(BrooklynNode.class)
                 .configure(BrooklynNode.WEB_CONSOLE_BIND_ADDRESS, "127.0.0.1"));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
         EntityTestUtils.assertAttributeEqualsEventually(brooklynNode, BrooklynNode.SERVICE_UP, true);
 
@@ -122,6 +125,7 @@ public void testCanStartAndStopWithoutAuthentication() throws Exception {
                 .configure(BrooklynNode.NO_WEB_CONSOLE_AUTHENTICATION, true)
                 .configure(BrooklynNode.MANAGEMENT_USER, (String)null));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
         EntityTestUtils.assertAttributeEqualsEventually(brooklynNode, BrooklynNode.SERVICE_UP, true);
 
@@ -137,6 +141,7 @@ public void testSetsGlobalBrooklynPropertiesFromContents() throws Exception {
                 .configure(BrooklynNode.BROOKLYN_GLOBAL_PROPERTIES_REMOTE_PATH, pseudoBrooklynPropertiesFile.getAbsolutePath())
                 .configure(BrooklynNode.BROOKLYN_GLOBAL_PROPERTIES_CONTENTS, "abc=def"));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
         assertEquals(Files.readLines(pseudoBrooklynPropertiesFile, Charsets.UTF_8), ImmutableList.of("abc=def"));
     }
@@ -148,6 +153,7 @@ public void testSetsLocalBrooklynPropertiesFromContents() throws Exception {
                 .configure(BrooklynNode.BROOKLYN_LOCAL_PROPERTIES_REMOTE_PATH, pseudoBrooklynPropertiesFile.getAbsolutePath())
                 .configure(BrooklynNode.BROOKLYN_LOCAL_PROPERTIES_CONTENTS, "abc=def"));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
         assertEquals(Files.readLines(pseudoBrooklynPropertiesFile, Charsets.UTF_8), ImmutableList.of("abc=def"));
     }
@@ -162,6 +168,7 @@ public void testSetsBrooklynPropertiesFromUri() throws Exception {
                 .configure(BrooklynNode.BROOKLYN_GLOBAL_PROPERTIES_REMOTE_PATH, pseudoBrooklynPropertiesFile.getAbsolutePath())
                 .configure(BrooklynNode.BROOKLYN_GLOBAL_PROPERTIES_URI, brooklynPropertiesSourceFile.toURI().toString()));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
         assertEquals(Files.readLines(pseudoBrooklynPropertiesFile, Charsets.UTF_8), ImmutableList.of("abc=def"));
     }
@@ -173,6 +180,7 @@ public void testSetsBrooklynCatalogFromContents() throws Exception {
                 .configure(BrooklynNode.BROOKLYN_CATALOG_REMOTE_PATH, pseudoBrooklynCatalogFile.getAbsolutePath())
                 .configure(BrooklynNode.BROOKLYN_CATALOG_CONTENTS, "<catalog/>"));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
         assertEquals(Files.readLines(pseudoBrooklynCatalogFile, Charsets.UTF_8), ImmutableList.of("<catalog/>"));
     }
@@ -187,6 +195,7 @@ public void testSetsBrooklynCatalogFromUri() throws Exception {
                 .configure(BrooklynNode.BROOKLYN_CATALOG_REMOTE_PATH, pseudoBrooklynCatalogFile.getAbsolutePath())
                 .configure(BrooklynNode.BROOKLYN_CATALOG_URI, brooklynCatalogSourceFile.toURI().toString()));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
         assertEquals(Files.readLines(pseudoBrooklynCatalogFile, Charsets.UTF_8), ImmutableList.of("abc=def"));
     }
@@ -204,6 +213,7 @@ public void testCopiesResources() throws Exception {
                     .configure(BrooklynNode.RUN_DIR, tempDir.getAbsolutePath())
                     .configure(BrooklynNode.COPY_TO_RUNDIR, ImmutableMap.of(sourceFile.getAbsolutePath(), "${RUN}/myfile.txt")));
             app.start(locs);
+            log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
             assertEquals(Files.readLines(expectedFile, Charsets.UTF_8), ImmutableList.of("abc=def"));
         } finally {
@@ -231,6 +241,7 @@ public void testCopiesClasspathEntriesInConfigKey() throws Exception {
                     .configure(BrooklynNode.CLASSPATH, ImmutableList.of(classpathEntry1.getAbsolutePath(), classpathEntry2.getAbsolutePath()))
                     );
             app.start(locs);
+            log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
             assertEquals(Files.readLines(expectedFile1, Charsets.UTF_8), ImmutableList.of(content));
             assertEquals(Files.readLines(expectedFile2, Charsets.UTF_8), ImmutableList.of(content));
@@ -261,9 +272,10 @@ public void testCopiesClasspathEntriesInBrooklynProperties() throws Exception {
     
             BrooklynNode brooklynNode = app.createAndManageChild(EntitySpec.create(BrooklynNode.class)
                     .configure(BrooklynNode.WEB_CONSOLE_BIND_ADDRESS, "127.0.0.1")
-                    .configure(BrooklynNode.SUGGESTED_RUN_DIR, tempDir.getAbsolutePath())
+                    .configure(BrooklynNode.RUN_DIR, tempDir.getAbsolutePath())
                     );
             app.start(locs);
+            log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
             assertEquals(Files.readLines(expectedFile1, Charsets.UTF_8), ImmutableList.of(content));
             assertEquals(Files.readLines(expectedFile2, Charsets.UTF_8), ImmutableList.of(content));
@@ -282,6 +294,7 @@ public void testSetsBrooklynWebConsolePort() throws Exception {
                 .configure(BrooklynNode.WEB_CONSOLE_BIND_ADDRESS, "127.0.0.1")
                 .configure(BrooklynNode.HTTP_PORT, PortRanges.fromString("45000+")));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
         Integer httpPort = brooklynNode.getAttribute(BrooklynNode.HTTP_PORT);
         URI webConsoleUri = brooklynNode.getAttribute(BrooklynNode.WEB_CONSOLE_URI);
@@ -296,6 +309,7 @@ public void testStartsAppOnStartup() throws Exception {
                 .configure(BrooklynNode.NO_WEB_CONSOLE_AUTHENTICATION, true)
                 .configure(BrooklynNode.APP, BasicApplicationImpl.class.getName()));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
         URI webConsoleUri = brooklynNode.getAttribute(BrooklynNode.WEB_CONSOLE_URI);
         String apps = HttpTestUtils.getContent(webConsoleUri.toString()+"/v1/applications");
@@ -308,6 +322,7 @@ public void testStartsAppViaEffector() throws Exception {
         BrooklynNode brooklynNode = app.createAndManageChild(EntitySpec.create(BrooklynNode.class)
                 .configure(BrooklynNode.NO_WEB_CONSOLE_AUTHENTICATION, true));
         app.start(locs);
+        log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
         
         final String id = brooklynNode.invoke(BrooklynNode.DEPLOY_BLUEPRINT, ConfigBag.newInstance()
             .configure(DeployBlueprintEffector.BLUEPRINT_TYPE, BasicApplication.class.getName())
@@ -342,6 +357,7 @@ public void testUsesLocation() throws Exception {
                     .configure(BrooklynNode.APP, BasicApplicationImpl.class.getName())
                     .configure(BrooklynNode.LOCATIONS, "named:mynamedloc"));
             app.start(locs);
+            log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
             URI webConsoleUri = brooklynNode.getAttribute(BrooklynNode.WEB_CONSOLE_URI);
 
@@ -388,6 +404,7 @@ public void testHttps() throws Exception {
                         //                .configure(BrooklynNode.HTTP_PORT, PortRanges.fromString("45000+"))
                 );
             app.start(locs);
+            log.info("started "+app+" containing "+brooklynNode+" for "+JavaClassNames.niceClassAndMethod());
 
             URI webConsoleUri = brooklynNode.getAttribute(BrooklynNode.WEB_CONSOLE_URI);
             Assert.assertTrue(webConsoleUri.toString().startsWith("https://"), "web console not https: "+webConsoleUri);
@@ -411,7 +428,7 @@ public void testHttps() throws Exception {
     }
 
     private <T> T parseJson(String json, List<String> elements, Class<T> clazz) {
-        Function<String, T> func = HttpValueFunctions.chain(
+        Function<String, T> func = Functionals.chain(
                 JsonFunctions.asJson(),
                 JsonFunctions.walk(elements),
                 JsonFunctions.cast(clazz));
@@ -419,9 +436,9 @@ private <T> T parseJson(String json, List<String> elements, Class<T> clazz) {
     }
 
     private <T> List<T> parseJsonList(String json, List<String> elements, Class<T> clazz) {
-        Function<String, List<T>> func = HttpValueFunctions.chain(
+        Function<String, List<T>> func = Functionals.chain(
                 JsonFunctions.asJson(),
-                JsonFunctions.forEach(HttpValueFunctions.chain(
+                JsonFunctions.forEach(Functionals.chain(
                         JsonFunctions.walk(elements),
                         JsonFunctions.cast(clazz))));
         return func.apply(json);
diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
index 7c9641620e..8f7d561fc1 100644
--- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
+++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
@@ -20,7 +20,6 @@
 
 import static org.testng.Assert.assertTrue;
 
-import java.io.File;
 import java.util.List;
 
 import org.testng.annotations.AfterMethod;
@@ -38,9 +37,6 @@ public class BrooklynNodeTest {
 
     // TODO Need test for copying/setting classpath
     
-    private static final File BROOKLYN_PROPERTIES_PATH = new File(System.getProperty("user.home")+"/.brooklyn/brooklyn.properties");
-    private static final File BROOKLYN_PROPERTIES_BAK_PATH = new File(BROOKLYN_PROPERTIES_PATH+".test.bak");
-    
     private TestApplication app;
     private SshMachineLocation loc;
 

From a4f7a4c0e3db5220e936bcffb5d52c3731b22175 Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Thu, 17 Jul 2014 23:29:12 -0400
Subject: [PATCH 2/7] promote snake-yaml dependency and Yamls utility to utils
 package, and use yaml parsing for map coercion to be much more flexible in
 terms of string-to-map coercion

---
 camp/camp-base/pom.xml                        |   5 -
 .../io/brooklyn/camp/spi/pdp/Artifact.java    |   3 +-
 .../camp/spi/pdp/ArtifactRequirement.java     |   3 +-
 .../io/brooklyn/camp/spi/pdp/Service.java     |   3 +-
 .../camp/spi/pdp/ServiceCharacteristic.java   |   3 +-
 .../camp/spi/resolve/PdpProcessor.java        |   2 +-
 .../java/io/brooklyn/util/yaml/Yamls.java     |  89 +-------------
 .../pdp/DeploymentPlanToyInterpreterTest.java |   2 +-
 .../brooklyn/util/flags/TypeCoercions.java    |  85 ++++++++-----
 .../util/internal/TypeCoercionsTest.java      |  72 +++++++++--
 usage/launcher/pom.xml                        |   7 ++
 utils/common/pom.xml                          |   5 +
 .../main/java/brooklyn/util/yaml/Yamls.java   | 115 ++++++++++++++++++
 13 files changed, 253 insertions(+), 141 deletions(-)
 create mode 100644 utils/common/src/main/java/brooklyn/util/yaml/Yamls.java

diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index b80ef0cdec..e8638b142d 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -57,11 +57,6 @@
             <artifactId>commons-compress</artifactId>
             <version>${commons-compress.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>${snakeyaml.version}</version>
-        </dependency>
         
             <!-- just for logging, not exported -->
             <!-- 
diff --git a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/Artifact.java b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/Artifact.java
index 72f356e35e..697a3baad8 100644
--- a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/Artifact.java
+++ b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/Artifact.java
@@ -18,8 +18,6 @@
  */
 package io.brooklyn.camp.spi.pdp;
 
-import io.brooklyn.util.yaml.Yamls;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -27,6 +25,7 @@
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import brooklyn.util.collections.MutableMap;
+import brooklyn.util.yaml.Yamls;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
diff --git a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/ArtifactRequirement.java b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/ArtifactRequirement.java
index 50f5335d93..da9936a364 100644
--- a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/ArtifactRequirement.java
+++ b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/ArtifactRequirement.java
@@ -18,13 +18,12 @@
  */
 package io.brooklyn.camp.spi.pdp;
 
-import io.brooklyn.util.yaml.Yamls;
-
 import java.util.Map;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import brooklyn.util.collections.MutableMap;
+import brooklyn.util.yaml.Yamls;
 
 import com.google.common.collect.ImmutableMap;
 
diff --git a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/Service.java b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/Service.java
index 241b80c2f7..592117687a 100644
--- a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/Service.java
+++ b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/Service.java
@@ -18,8 +18,6 @@
  */
 package io.brooklyn.camp.spi.pdp;
 
-import io.brooklyn.util.yaml.Yamls;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -27,6 +25,7 @@
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import brooklyn.util.collections.MutableMap;
+import brooklyn.util.yaml.Yamls;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
diff --git a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/ServiceCharacteristic.java b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/ServiceCharacteristic.java
index cc5227d2ee..8b27e2a63d 100644
--- a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/ServiceCharacteristic.java
+++ b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/pdp/ServiceCharacteristic.java
@@ -18,13 +18,12 @@
  */
 package io.brooklyn.camp.spi.pdp;
 
-import io.brooklyn.util.yaml.Yamls;
-
 import java.util.Map;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import brooklyn.util.collections.MutableMap;
+import brooklyn.util.yaml.Yamls;
 
 import com.google.common.collect.ImmutableMap;
 
diff --git a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/resolve/PdpProcessor.java b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/resolve/PdpProcessor.java
index 897ff23b13..3252aaf72b 100644
--- a/camp/camp-base/src/main/java/io/brooklyn/camp/spi/resolve/PdpProcessor.java
+++ b/camp/camp-base/src/main/java/io/brooklyn/camp/spi/resolve/PdpProcessor.java
@@ -27,7 +27,6 @@
 import io.brooklyn.camp.spi.pdp.Service;
 import io.brooklyn.camp.spi.resolve.interpret.PlanInterpretationContext;
 import io.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode;
-import io.brooklyn.util.yaml.Yamls;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -41,6 +40,7 @@
 import org.yaml.snakeyaml.error.YAMLException;
 
 import brooklyn.util.exceptions.Exceptions;
+import brooklyn.util.yaml.Yamls;
 
 import com.google.common.annotations.VisibleForTesting;
 
diff --git a/camp/camp-base/src/main/java/io/brooklyn/util/yaml/Yamls.java b/camp/camp-base/src/main/java/io/brooklyn/util/yaml/Yamls.java
index d275ce861b..44974f0c75 100644
--- a/camp/camp-base/src/main/java/io/brooklyn/util/yaml/Yamls.java
+++ b/camp/camp-base/src/main/java/io/brooklyn/util/yaml/Yamls.java
@@ -18,90 +18,7 @@
  */
 package io.brooklyn.util.yaml;
 
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Iterables;
-
-public class Yamls {
-
-    private static final Logger log = LoggerFactory.getLogger(Yamls.class);
-    
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> T getAs(Object x, Class<T> type) {
-        if (x==null) return null;
-        if (x instanceof Iterable || x instanceof Iterator) {
-            List result = new ArrayList();
-            Iterator xi;
-            if (Iterator.class.isAssignableFrom(x.getClass())) {
-                xi = (Iterator)x;
-            } else {
-                xi = ((Iterable)x).iterator();
-            }
-            while (xi.hasNext()) {
-                    result.add( xi.next() );
-            }
-            if (type.isAssignableFrom(Iterable.class)) return (T)result;
-            if (type.isAssignableFrom(Iterator.class)) return (T)result.iterator();
-            if (type.isAssignableFrom(List.class)) return (T)result;
-            x = Iterables.getOnlyElement(result);
-        }
-        // TODO more coercion?
-        return (T)x;
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static void dump(int depth, Object r) {
-        if (r instanceof Iterable) {
-            for (Object ri : ((Iterable)r))
-                dump(depth+1, ri);
-        } else if (r instanceof Map) {
-            for (Object re: ((Map)r).entrySet()) {
-                for (int i=0; i<depth; i++) System.out.print(" ");
-                System.out.println(((Entry)re).getKey()+":");
-                dump(depth+1, ((Entry)re).getValue());
-            }
-        } else {
-            for (int i=0; i<depth; i++) System.out.print(" ");
-            if (r==null) System.out.println("<null>");
-            else System.out.println("<"+r.getClass().getSimpleName()+">"+" "+r);
-        }
-    }
-
-    /** simplifies new Yaml().loadAll, and converts to list to prevent single-use iterable bug in yaml */
-    @SuppressWarnings("unchecked")
-    public static Iterable<Object> parseAll(String yaml) {
-        Iterable<Object> result = new org.yaml.snakeyaml.Yaml().loadAll(yaml);
-        return (List<Object>) getAs(result, List.class);
-    }
-
-    /** as {@link #parseAll(String)} */
-    @SuppressWarnings("unchecked")
-    public static Iterable<Object> parseAll(Reader yaml) {
-        Iterable<Object> result = new org.yaml.snakeyaml.Yaml().loadAll(yaml);
-        return (List<Object>) getAs(result, List.class);
-    }
-
-    public static Object removeMultinameAttribute(Map<String,Object> obj, String ...equivalentNames) {
-        Object result = null;
-        for (String name: equivalentNames) {
-            Object candidate = obj.remove(name);
-            if (candidate!=null) {
-                if (result==null) result = candidate;
-                else if (!result.equals(candidate)) {
-                    log.warn("Different values for attributes "+Arrays.toString(equivalentNames)+"; " +
-                    		"preferring '"+result+"' to '"+candidate+"'");
-                }
-            }
-        }
-        return result;
-    }
+/** @deprecated since 0.7.0 use {@link brooklyn.util.yaml.Yamls} */
+@Deprecated
+public class Yamls extends brooklyn.util.yaml.Yamls {
 }
diff --git a/camp/camp-base/src/test/java/io/brooklyn/camp/spi/pdp/DeploymentPlanToyInterpreterTest.java b/camp/camp-base/src/test/java/io/brooklyn/camp/spi/pdp/DeploymentPlanToyInterpreterTest.java
index de922a1022..29f8abfdd3 100644
--- a/camp/camp-base/src/test/java/io/brooklyn/camp/spi/pdp/DeploymentPlanToyInterpreterTest.java
+++ b/camp/camp-base/src/test/java/io/brooklyn/camp/spi/pdp/DeploymentPlanToyInterpreterTest.java
@@ -21,7 +21,6 @@
 import io.brooklyn.camp.BasicCampPlatform;
 import io.brooklyn.camp.spi.resolve.PlanInterpreter.PlanInterpreterAdapter;
 import io.brooklyn.camp.spi.resolve.interpret.PlanInterpretationNode;
-import io.brooklyn.util.yaml.Yamls;
 
 import java.util.Map;
 
@@ -32,6 +31,7 @@
 
 import brooklyn.util.stream.Streams;
 import brooklyn.util.text.Strings;
+import brooklyn.util.yaml.Yamls;
 
 @Test
 public class DeploymentPlanToyInterpreterTest {
diff --git a/core/src/main/java/brooklyn/util/flags/TypeCoercions.java b/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
index 1ee45aef18..7e92ed5734 100644
--- a/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
+++ b/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
@@ -18,7 +18,9 @@
  */
 package brooklyn.util.flags;
 
-import java.io.IOException;
+import groovy.lang.Closure;
+import groovy.time.TimeDuration;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -39,23 +41,9 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
 
-import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.base.Splitter;
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Table;
-import com.google.common.net.HostAndPort;
-import com.google.common.primitives.Primitives;
-import com.google.common.reflect.TypeToken;
-
 import brooklyn.entity.basic.ClosureEntityFactory;
 import brooklyn.entity.basic.ConfigurableEntityFactory;
 import brooklyn.entity.basic.ConfigurableEntityFactoryFromEntityFactory;
@@ -70,10 +58,23 @@
 import brooklyn.util.net.Networking;
 import brooklyn.util.net.UserAndHostAndPort;
 import brooklyn.util.text.StringEscapes.JavaStringEscapes;
+import brooklyn.util.text.Strings;
 import brooklyn.util.time.Duration;
-import groovy.lang.Closure;
-import groovy.time.TimeDuration;
+import brooklyn.util.yaml.Yamls;
 
+import com.google.common.base.CaseFormat;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Table;
+import com.google.common.net.HostAndPort;
+import com.google.common.primitives.Primitives;
+import com.google.common.reflect.TypeToken;
+
+@SuppressWarnings("rawtypes")
 public class TypeCoercions {
 
     private static final Logger log = LoggerFactory.getLogger(TypeCoercions.class);
@@ -103,7 +104,7 @@ public static <T> T coerce(Object value, Class<T> targetType) {
     }
 
     /** @see #coerce(Object, Class) */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({ "unchecked" })
     public static <T> T coerce(Object value, TypeToken<T> targetTypeToken) {
         if (value==null) return null;
         // does not actually cast generified contents; that is left to the caller
@@ -433,12 +434,14 @@ public String apply(byte[] input) {
             }
         });
         registerAdapter(Collection.class, Set.class, new Function<Collection,Set>() {
+            @SuppressWarnings("unchecked")
             @Override
             public Set apply(Collection input) {
                 return new LinkedHashSet(input);
             }
         });
         registerAdapter(Collection.class, List.class, new Function<Collection,List>() {
+            @SuppressWarnings("unchecked")
             @Override
             public List apply(Collection input) {
                 return new ArrayList(input);
@@ -485,12 +488,14 @@ public URI apply(String input) {
             }
         });
         registerAdapter(Closure.class, ConfigurableEntityFactory.class, new Function<Closure,ConfigurableEntityFactory>() {
+            @SuppressWarnings("unchecked")
             @Override
             public ConfigurableEntityFactory apply(Closure input) {
                 return new ClosureEntityFactory(input);
             }
         });
         registerAdapter(EntityFactory.class, ConfigurableEntityFactory.class, new Function<EntityFactory,ConfigurableEntityFactory>() {
+            @SuppressWarnings("unchecked")
             @Override
             public ConfigurableEntityFactory apply(EntityFactory input) {
                 if (input instanceof ConfigurableEntityFactory) return (ConfigurableEntityFactory)input;
@@ -498,6 +503,7 @@ public ConfigurableEntityFactory apply(EntityFactory input) {
             }
         });
         registerAdapter(Closure.class, EntityFactory.class, new Function<Closure,EntityFactory>() {
+            @SuppressWarnings("unchecked")
             @Override
             public EntityFactory apply(Closure input) {
                 return new ClosureEntityFactory(input);
@@ -530,6 +536,7 @@ public Duration apply(final Object input) {
             }
         });
         registerAdapter(Object.class, TimeDuration.class, new Function<Object,TimeDuration>() {
+            @SuppressWarnings("deprecation")
             @Override
             public TimeDuration apply(final Object input) {
                 log.warn("deprecated automatic coercion of Object to TimeDuration (set breakpoint in TypeCoercions to inspect, convert to Duration)");
@@ -627,20 +634,40 @@ public List<String> apply(final String input) {
         registerAdapter(String.class, Map.class, new Function<String,Map>() {
             @Override
             public Map apply(final String input) {
-                // Auto-detect JSON. This allows complex data structures to be received over the REST API.
+                Exception error = null;
+                
+                // first try wrapping in braces if needed
+                if (!input.trim().startsWith("{")) {
+                    try {
+                        return apply("{ "+input+" }");
+                    } catch (Exception e) {
+                        Exceptions.propagateIfFatal(e);
+                        // prefer this error
+                        error = e;
+                        // fall back to parsing without braces, e.g. if it's multiline
+                    }
+                }
+
                 try {
-                    if (!input.isEmpty() && input.charAt(0) == '{') {
-                        return new ObjectMapper().readValue(input, Map.class);
+                    return Yamls.getAs( Yamls.parseAll(input), Map.class );
+                } catch (Exception e) {
+                    Exceptions.propagateIfFatal(e);
+                    if (error!=null && input.indexOf('\n')==-1) {
+                        // prefer the original error if it wasn't braced and wasn't multiline
+                        e = error;
                     }
-                } catch (IOException e) {
-                    // just fall through to the map parsing
+                    throw new IllegalArgumentException("Cannot parse string as map with flexible YAML parsing; "+
+                        (e instanceof ClassCastException ? "yaml treats it as a string" : 
+                        (e instanceof IllegalArgumentException && Strings.isNonEmpty(e.getMessage())) ? e.getMessage() :
+                        ""+e) );
                 }
-                
-                // TODO would be nice to accept YAML for complex data structures too, but it's not as simple as JSON to auto-detect.
-                
-                // Simple map parsing - supports "key1=value1,key2=value2" style input
-                // TODO we should respect quoted strings etc
-                return ImmutableMap.copyOf(Splitter.on(",").trimResults().omitEmptyStrings().withKeyValueSeparator("=").split(input));
+
+                // NB: previously we supported this also, when we did json above;
+                // yaml support is better as it supports quotes (and better than json because it allows dropping quotes)
+                // snake-yaml, our parser, also accepts key=value -- although i'm not sure this is strictly yaml compliant;
+                // our tests will catch it if snake behaviour changes, and we can reinstate this
+                // (but note it doesn't do quotes; see http://code.google.com/p/guava-libraries/issues/detail?id=412 for that):
+//                return ImmutableMap.copyOf(Splitter.on(",").trimResults().omitEmptyStrings().withKeyValueSeparator("=").split(input));
             }
         });
     }
diff --git a/core/src/test/java/brooklyn/util/internal/TypeCoercionsTest.java b/core/src/test/java/brooklyn/util/internal/TypeCoercionsTest.java
index 05b4c72d93..6efffa2f53 100644
--- a/core/src/test/java/brooklyn/util/internal/TypeCoercionsTest.java
+++ b/core/src/test/java/brooklyn/util/internal/TypeCoercionsTest.java
@@ -32,17 +32,17 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import brooklyn.entity.basic.Lifecycle;
+import brooklyn.util.flags.ClassCoercionException;
+import brooklyn.util.flags.TypeCoercions;
+import brooklyn.util.text.StringPredicates;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.reflect.TypeToken;
 
-import brooklyn.entity.basic.Lifecycle;
-import brooklyn.util.flags.ClassCoercionException;
-import brooklyn.util.flags.TypeCoercions;
-import brooklyn.util.text.StringPredicates;
-
 public class TypeCoercionsTest {
 
     private static final Logger log = LoggerFactory.getLogger(TypeCoercionsTest.class);
@@ -191,15 +191,65 @@ public void testStringToListCoercion() {
     }
 
     @Test
-    public void testStringToMapCoercion() {
-        Map<?,?> s = TypeCoercions.coerce("a=1,b=2,c=3", Map.class);
-        Assert.assertEquals(s, ImmutableMap.of("a", "1", "b", "2", "c", "3"));
+    public void testJsonStringToMapCoercion() {
+        Map<?,?> s = TypeCoercions.coerce("{ \"a\" : \"1\", b : 2 }", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", "1", "b", 2));
     }
 
     @Test
-    public void testJsonStringToMapCoercion() {
-        Map<?,?> s = TypeCoercions.coerce("{ \"a\" : \"1\", \"b\" : \"2\", \"c\" : \"3\" }", Map.class);
-        Assert.assertEquals(s, ImmutableMap.of("a", "1", "b", "2", "c", "3"));
+    public void testJsonStringWithoutQuotesToMapCoercion() {
+        Map<?,?> s = TypeCoercions.coerce("{ a : 1 }", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", 1));
+    }
+
+    @Test
+    public void testJsonComplexTypesToMapCoercion() {
+        Map<?,?> s = TypeCoercions.coerce("{ a : [1, \"2\", '\"3\"'], b: { c: d, 'e': \"f\" } }", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", ImmutableList.<Object>of(1, "2", "\"3\""), 
+            "b", ImmutableMap.of("c", "d", "e", "f")));
+    }
+
+    @Test
+    public void testJsonStringWithoutBracesToMapCoercion() {
+        Map<?,?> s = TypeCoercions.coerce("a : 1", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", 1));
+    }
+
+    @Test
+    public void testJsonStringWithoutBracesWithMultipleToMapCoercion() {
+        Map<?,?> s = TypeCoercions.coerce("a : 1, b : 2", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", 1, "b", 2));
+    }
+
+    @Test
+    public void testKeyEqualsValueStringToMapCoercion() {
+        Map<?,?> s = TypeCoercions.coerce("a=1,b=2", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", "1", "b", "2"));
+    }
+
+    @Test(expectedExceptions=IllegalArgumentException.class)
+    public void testJsonStringWithoutBracesOrSpaceDisallowedAsMapCoercion() {
+        // yaml requires spaces after the colon
+        Map<?,?> s = TypeCoercions.coerce("a:1,b:2", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", 1, "b", 2));
+    }
+    
+    @Test
+    public void testEqualsInBracesMapCoercion() {
+        Map<?,?> s = TypeCoercions.coerce("{ a = 1, b = '2' }", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", 1, "b", "2"));
+    }
+
+    @Test
+    public void testKeyEqualsOrColonValueWithBracesStringToMapCoercion() {
+        Map<?,?> s = TypeCoercions.coerce("{ a=1, b: 2 }", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", "1", "b", 2));
+    }
+
+    @Test
+    public void testKeyEqualsOrColonValueWithoutBracesStringToMapCoercion() {
+        Map<?,?> s = TypeCoercions.coerce("a=1, b: 2", Map.class);
+        Assert.assertEquals(s, ImmutableMap.of("a", "1", "b", 2));
     }
 
     @Test
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index 57d3e24a87..1fb4fcdcbc 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -84,6 +84,13 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.brooklyn</groupId>
+            <artifactId>brooklyn-software-base</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.brooklyn</groupId>
             <artifactId>brooklyn-software-webapp</artifactId>
diff --git a/utils/common/pom.xml b/utils/common/pom.xml
index 24dec9fa25..54de72a434 100644
--- a/utils/common/pom.xml
+++ b/utils/common/pom.xml
@@ -56,6 +56,11 @@
             <artifactId>commons-io</artifactId>
             <version>${commons-io.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
+        </dependency>
         
         <dependency>
             <groupId>org.testng</groupId>
diff --git a/utils/common/src/main/java/brooklyn/util/yaml/Yamls.java b/utils/common/src/main/java/brooklyn/util/yaml/Yamls.java
new file mode 100644
index 0000000000..a22432f8ed
--- /dev/null
+++ b/utils/common/src/main/java/brooklyn/util/yaml/Yamls.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package brooklyn.util.yaml;
+
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Iterables;
+
+public class Yamls {
+
+    private static final Logger log = LoggerFactory.getLogger(Yamls.class);
+
+    /** returns the given yaml object (map or list or primitive) as the given yaml-supperted type 
+     * (map or list or primitive e.g. string, number, boolean).
+     * <p>
+     * if the object is an iterable containing a single element, and the type is not an iterable,
+     * this will attempt to unwrap it.
+     * 
+     * @throws IllegalArgumentException if the input is an iterable not containing a single element,
+     *   and the cast is requested to a non-iterable type 
+     * @throws ClassCastException if cannot be casted */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public static <T> T getAs(Object x, Class<T> type) {
+        if (x==null) return null;
+        if (x instanceof Iterable || x instanceof Iterator) {
+            List result = new ArrayList();
+            Iterator xi;
+            if (Iterator.class.isAssignableFrom(x.getClass())) {
+                xi = (Iterator)x;
+            } else {
+                xi = ((Iterable)x).iterator();
+            }
+            while (xi.hasNext()) {
+                result.add( xi.next() );
+            }
+            if (type.isAssignableFrom(Iterable.class)) return (T)result;
+            if (type.isAssignableFrom(Iterator.class)) return (T)result.iterator();
+            if (type.isAssignableFrom(List.class)) return (T)result;
+            x = Iterables.getOnlyElement(result);
+        }
+        return (T)x;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public static void dump(int depth, Object r) {
+        if (r instanceof Iterable) {
+            for (Object ri : ((Iterable)r))
+                dump(depth+1, ri);
+        } else if (r instanceof Map) {
+            for (Object re: ((Map)r).entrySet()) {
+                for (int i=0; i<depth; i++) System.out.print(" ");
+                System.out.println(((Entry)re).getKey()+":");
+                dump(depth+1, ((Entry)re).getValue());
+            }
+        } else {
+            for (int i=0; i<depth; i++) System.out.print(" ");
+            if (r==null) System.out.println("<null>");
+            else System.out.println("<"+r.getClass().getSimpleName()+">"+" "+r);
+        }
+    }
+
+    /** simplifies new Yaml().loadAll, and converts to list to prevent single-use iterable bug in yaml */
+    @SuppressWarnings("unchecked")
+    public static Iterable<Object> parseAll(String yaml) {
+        Iterable<Object> result = new org.yaml.snakeyaml.Yaml().loadAll(yaml);
+        return (List<Object>) getAs(result, List.class);
+    }
+
+    /** as {@link #parseAll(String)} */
+    @SuppressWarnings("unchecked")
+    public static Iterable<Object> parseAll(Reader yaml) {
+        Iterable<Object> result = new org.yaml.snakeyaml.Yaml().loadAll(yaml);
+        return (List<Object>) getAs(result, List.class);
+    }
+
+    public static Object removeMultinameAttribute(Map<String,Object> obj, String ...equivalentNames) {
+        Object result = null;
+        for (String name: equivalentNames) {
+            Object candidate = obj.remove(name);
+            if (candidate!=null) {
+                if (result==null) result = candidate;
+                else if (!result.equals(candidate)) {
+                    log.warn("Different values for attributes "+Arrays.toString(equivalentNames)+"; " +
+                    		"preferring '"+result+"' to '"+candidate+"'");
+                }
+            }
+        }
+        return result;
+    }
+}

From 78da216ceb8897ec6378bd11a5ee5ea7e0c1a28a Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Thu, 17 Jul 2014 23:32:55 -0400
Subject: [PATCH 3/7] remove dead code and tidy warnings in camp code

---
 .../brooklyn/spi/creation/BrooklynComponentTemplateResolver.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index 155342a8f6..8a0f459de7 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@ -241,6 +241,7 @@ private <T extends Entity> EntitySpec<T> createSpec() {
         } else {
             // If this is a concrete class, particularly for an Application class, we want the proxy
             // to expose all interfaces it implements.
+            @SuppressWarnings("rawtypes")
             Class interfaceclazz = (Application.class.isAssignableFrom(type)) ? Application.class : Entity.class;
             List<Class<?>> additionalInterfaceClazzes = Reflections.getAllInterfaces(type);
             spec = EntitySpec.create(interfaceclazz).impl(type).additionalInterfaces(additionalInterfaceClazzes);

From 1a294f76a1e955582c5dc4d7c99526b60afef421 Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Fri, 18 Jul 2014 12:25:48 -0400
Subject: [PATCH 4/7] add an initializer for adding tags, with a test

---
 .../entity/basic/EntityInitializers.java      | 30 +++++++++++++++++++
 .../brooklyn/entity/basic/EntitiesTest.java   |  6 ++--
 .../test/java/brooklyn/util/net/UrlsTest.java |  5 ++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 core/src/main/java/brooklyn/entity/basic/EntityInitializers.java

diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java b/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java
new file mode 100644
index 0000000000..62db62e47e
--- /dev/null
+++ b/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java
@@ -0,0 +1,30 @@
+package brooklyn.entity.basic;
+
+import java.util.List;
+
+import brooklyn.entity.proxying.EntityInitializer;
+
+import com.google.common.collect.ImmutableList;
+
+public class EntityInitializers {
+
+    public static class AddTags implements EntityInitializer {
+        public final List<Object> tags;
+        
+        public AddTags(Object... tags) {
+            this.tags = ImmutableList.copyOf(tags);
+        }
+        
+        @Override
+        public void apply(EntityLocal entity) {
+            for (Object tag: tags)
+                entity.addTag(tag);
+        }
+    }
+
+    
+    public static EntityInitializer addingTags(Object... tags) {
+        return new AddTags(tags);
+    }
+    
+}
diff --git a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
index 3f72388ca3..8acdf7291c 100644
--- a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
+++ b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
@@ -106,7 +106,9 @@ public void testAttributeSupplierWhenReady() throws Exception {
     
     @Test
     public void testCreateGetContainsAndRemoveTags() throws Exception {
-        entity.addTag("foo");
+        entity = app.createAndManageChild(EntitySpec.create(TestEntity.class)
+            .addInitializer(EntityInitializers.addingTags("foo")));
+        
         entity.addTag(app);
         
         Assert.assertTrue(entity.containsTag("foo"));
@@ -122,5 +124,5 @@ public void testCreateGetContainsAndRemoveTags() throws Exception {
         
         Assert.assertEquals(entity.getTags(), MutableSet.of(app));
     }
-
+    
 }
diff --git a/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java b/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
index 017ad3db12..d0a615c23b 100644
--- a/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
@@ -42,6 +42,11 @@ public void testMergePaths() throws Exception {
         assertEquals(Urls.mergePaths("/","a","b","/"), "/a/b/");
     }
 
+    @Test
+    public void testPathEncode() throws Exception {
+        assertEquals(Urls.encode("name_with/%!"), "name_with%2F%25%21");
+    }
+
     @Test
     public void testIsUrlWithProtocol() {
         Assert.assertTrue(Urls.isUrlWithProtocol("http://localhost/"));

From 8569120c909e782b5ca2f90525795822f3e9395b Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Thu, 17 Jul 2014 23:50:20 -0400
Subject: [PATCH 5/7] more tests for BrooklynNode, including test which uses
 REST API of local instance (and new "SameBrooklynNodeImpl" semi-mock); and
 adds BrooklynEntityMirror with test

---
 .../brooklyn/config/BrooklynServerConfig.java |   6 +
 .../config/BrooklynServiceAttributes.java     |   2 +-
 .../brooklynnode/BrooklynEntityMirror.java    |  52 ++++++
 .../BrooklynEntityMirrorImpl.java             | 169 ++++++++++++++++++
 .../entity/brooklynnode/BrooklynNode.java     |   3 +
 .../entity/brooklynnode/BrooklynNodeImpl.java |   8 +-
 .../entity/brooklynnode/BrooklynNodeTest.java |  18 ++
 .../brooklynnode/SameBrooklynNodeImpl.java    |  86 +++++++++
 .../camp/BrooklynCampPlatformLauncher.java    |   7 +-
 .../entity/basic/VanillaSoftwareYamlTest.java |   5 +-
 .../brooklynnode/BrooklynNodeRestTest.java    |  92 ++++++++++
 .../launcher/BrooklynWebServerTest.java       |   1 -
 .../launcher/SimpleYamlLauncherForTests.java  |  31 ++++
 .../brooklyn/util/collections/Jsonya.java     |   8 +
 14 files changed, 480 insertions(+), 8 deletions(-)
 create mode 100644 software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java
 create mode 100644 software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java
 create mode 100644 software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java
 create mode 100644 usage/launcher/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java
 create mode 100644 usage/launcher/src/test/java/brooklyn/launcher/SimpleYamlLauncherForTests.java

diff --git a/core/src/main/java/brooklyn/config/BrooklynServerConfig.java b/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
index fccba641a6..adc41be9c1 100644
--- a/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
+++ b/core/src/main/java/brooklyn/config/BrooklynServerConfig.java
@@ -22,6 +22,7 @@
 import io.brooklyn.camp.CampPlatform;
 
 import java.io.File;
+import java.net.URI;
 import java.util.Map;
 
 import org.apache.commons.io.FileUtils;
@@ -164,4 +165,9 @@ public static Maybe<CampPlatform> getCampPlatform(ManagementContext mgmt) {
         return Maybe.absent("No CAMP Platform is registered with this Brooklyn management context.");
     }
 
+    /** Returns {@link ManagementContext#getManagementNodeUri()}, located in this utility class for convenience. */
+    public static Maybe<URI> getBrooklynWebUri(ManagementContext mgmt) {
+        return mgmt.getManagementNodeUri();
+    }
+    
 }
diff --git a/core/src/main/java/brooklyn/config/BrooklynServiceAttributes.java b/core/src/main/java/brooklyn/config/BrooklynServiceAttributes.java
index 2eac234102..840bf59ab8 100644
--- a/core/src/main/java/brooklyn/config/BrooklynServiceAttributes.java
+++ b/core/src/main/java/brooklyn/config/BrooklynServiceAttributes.java
@@ -38,7 +38,7 @@ public class BrooklynServiceAttributes {
 	
     /** used to hold the instance of ManagementContext which should be used */
     public static final String BROOKLYN_MANAGEMENT_CONTEXT = ManagementContext.class.getName();
-
+    
     /** poor-man's security, to specify a user to be automatically logged in
      * (e.g. to bypass security, during dev/test); 'admin' is usually a sensible choice.
      * if not specified (the default) username+password is required. 
diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java
new file mode 100644
index 0000000000..2773793e95
--- /dev/null
+++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package brooklyn.entity.brooklynnode;
+
+import brooklyn.config.ConfigKey;
+import brooklyn.entity.Entity;
+import brooklyn.entity.basic.ConfigKeys;
+import brooklyn.entity.brooklynnode.BrooklynNode;
+import brooklyn.entity.proxying.ImplementedBy;
+import brooklyn.event.AttributeSensor;
+import brooklyn.event.basic.Sensors;
+import brooklyn.util.time.Duration;
+
+/** Provides an entity which can sit in one brooklyn domain and reflect the status of an entity 
+ * via the REST API of another domain */
+@ImplementedBy(BrooklynEntityMirrorImpl.class)
+public interface BrooklynEntityMirror extends Entity {
+
+    // caller must specify this:
+    public static final ConfigKey<String> MIRRORED_ENTITY_URL = ConfigKeys.newStringConfigKey("brooklyn.mirror.entity_url",
+        "URL for the entity in the remote Brooklyn mgmt endpoint");
+    
+    // caller may specify this for reference:
+    public static final ConfigKey<String> MIRRORED_ENTITY_ID = ConfigKeys.newStringConfigKey("brooklyn.mirror.entity_id",
+        "Brooklyn ID of the entity being mirrored");
+    
+    // must be specified if required (could be inherited if parent/config is available at init time, but it's not currently)
+    public static final ConfigKey<String> MANAGEMENT_USER = BrooklynNode.MANAGEMENT_USER;
+    public static final ConfigKey<String> MANAGEMENT_PASSWORD = BrooklynNode.MANAGEMENT_PASSWORD;
+    
+    public static final ConfigKey<Duration> POLL_PERIOD = ConfigKeys.newConfigKey(Duration.class, "brooklyn.mirror.poll_period",
+        "Frequency to poll for client sensors", Duration.FIVE_SECONDS);
+    
+    public static final AttributeSensor<String> MIRROR_STATUS = Sensors.newStringSensor("brooklyn.mirror.monitoring_status");
+
+}
diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java
new file mode 100644
index 0000000000..8407708f11
--- /dev/null
+++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package brooklyn.entity.brooklynnode;
+
+import java.net.URI;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.HttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import brooklyn.entity.basic.AbstractEntity;
+import brooklyn.entity.basic.Attributes;
+import brooklyn.entity.basic.BrooklynTaskTags;
+import brooklyn.entity.basic.Entities;
+import brooklyn.entity.basic.EntityFunctions;
+import brooklyn.entity.basic.Lifecycle;
+import brooklyn.entity.effector.EffectorBody;
+import brooklyn.event.AttributeSensor;
+import brooklyn.event.basic.Sensors;
+import brooklyn.event.feed.http.HttpFeed;
+import brooklyn.event.feed.http.HttpPollConfig;
+import brooklyn.util.collections.Jsonya;
+import brooklyn.util.collections.MutableMap;
+import brooklyn.util.config.ConfigBag;
+import brooklyn.util.exceptions.Exceptions;
+import brooklyn.util.http.HttpTool;
+import brooklyn.util.http.HttpTool.HttpClientBuilder;
+import brooklyn.util.http.HttpToolResponse;
+import brooklyn.util.net.Urls;
+import brooklyn.util.stream.Streams;
+import brooklyn.util.task.Tasks;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.gson.Gson;
+
+public class BrooklynEntityMirrorImpl extends AbstractEntity implements BrooklynEntityMirror {
+
+    private static final Logger log = LoggerFactory.getLogger(BrooklynEntityMirrorImpl.class);
+    
+    private HttpFeed mirror;
+    
+    @Override
+    public void init() {
+        super.init();
+        connectSensors();
+    }
+
+    protected void connectSensors() {
+        Function<HttpToolResponse, Void> mirrorSensors = new Function<HttpToolResponse,Void>() {
+            @SuppressWarnings("rawtypes")
+            @Override
+            public Void apply(HttpToolResponse input) {
+                Map sensors = new Gson().fromJson(input.getContentAsString(), Map.class);
+                for (Object kv: sensors.entrySet())
+                    setAttribute(Sensors.newSensor(Object.class, ""+((Map.Entry)kv).getKey()), ((Map.Entry)kv).getValue());
+                setAttribute(MIRROR_STATUS, "normal");
+                return null;
+            }
+        };
+        
+        String sensorsUri = Urls.mergePaths(
+            Preconditions.checkNotNull(getConfig(MIRRORED_ENTITY_URL), "Required config: "+MIRRORED_ENTITY_URL),
+            "sensors/current-state");
+        
+        mirror = HttpFeed.builder().entity(this)
+            .baseUri(sensorsUri)
+            .credentialsIfNotNull(getConfig(BrooklynNode.MANAGEMENT_USER), getConfig(BrooklynNode.MANAGEMENT_PASSWORD))
+            .period(getConfig(POLL_PERIOD))
+            .poll(HttpPollConfig.forMultiple()
+                .onSuccess(mirrorSensors)
+                .onFailureOrException(EntityFunctions.settingSensorsConstantFunction(this, MutableMap.<AttributeSensor<?>,Object>of(
+                    Attributes.SERVICE_STATE, Lifecycle.ON_FIRE,
+                    MIRROR_STATUS, "error contacting service"
+                    ))) )
+            .build();
+    }
+
+    protected void disconnectSensors() {
+        if (mirror != null) mirror.stop();
+    }
+
+    @Override
+    public void destroy() {
+        disconnectSensors();
+    }
+
+    public static class RemoteEffector<T> extends EffectorBody<T> {
+        public final String remoteEffectorName;
+        public final Function<byte[], T> resultParser;
+        
+        /** creates an effector implementation which POSTs to a remote effector endpoint, optionally converting
+         * the byte[] response (if resultParser is null then null is returned) */
+        public RemoteEffector(String remoteEffectorName, @Nullable Function<byte[],T> resultParser) {
+            this.remoteEffectorName = remoteEffectorName;
+            this.resultParser = resultParser;
+        }
+
+        @Override
+        public T call(ConfigBag parameters) {
+            String baseUri = Preconditions.checkNotNull(entity().getConfig(MIRRORED_ENTITY_URL), "Cannot be invoked without an entity URL");
+            HttpClientBuilder builder = HttpTool.httpClientBuilder()
+                .trustAll()
+                .laxRedirect(true)
+                .uri(baseUri);
+            if (entity().getConfig(MANAGEMENT_USER)!=null)
+                builder.credentials(new UsernamePasswordCredentials(entity().getConfig(MANAGEMENT_USER), entity().getConfig(MANAGEMENT_PASSWORD)));
+            HttpClient client = builder.build();
+            
+            byte[] result = submit(client, URI.create(Urls.mergePaths(baseUri, "effectors", Urls.encode(remoteEffectorName))), parameters.getAllConfig());
+            if (resultParser!=null) return resultParser.apply(result);
+            else return null;
+        }
+
+        @VisibleForTesting
+        public static byte[] submit(HttpClient client, URI uri, Map<String,Object> args) {
+            HttpToolResponse result = null;
+            byte[] content;
+            try {
+                result = HttpTool.httpPost(client, uri, MutableMap.of(com.google.common.net.HttpHeaders.CONTENT_TYPE, "application/json"), 
+                    Jsonya.of(args).toString().getBytes());
+                content = result.getContent();
+            } catch (Exception e) {
+                Exceptions.propagateIfFatal(e);
+                throw new IllegalStateException("Invalid response invoking "+uri+": "+e, e);
+            }
+            Tasks.addTagDynamically(BrooklynTaskTags.tagForStream("http_response", Streams.byteArray(content)));
+            if (!HttpTool.isStatusCodeHealthy(result.getResponseCode())) {
+                log.warn("Invalid response invoking "+uri+": response code "+result.getResponseCode()+"\n"+result+": "+new String(content));
+                throw new IllegalStateException("Invalid response invoking "+uri+": response code "+result.getResponseCode());
+            }
+            return content;
+        }
+
+    }
+
+    public static class StopAndExpungeEffector extends RemoteEffector<Void> {
+        public StopAndExpungeEffector() {
+            super("stop", null);
+        }
+        @Override
+        public Void call(ConfigBag parameters) {
+            super.call(parameters);
+            Entities.unmanage(entity());
+            return null;
+        }
+    }
+}
diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
index e61fd25ce6..75523e3d13 100644
--- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
+++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
@@ -166,6 +166,7 @@ static enum ExistingFileBehaviour {
     public static final ConfigKey<String> BROOKLYN_CATALOG_CONTENTS = ConfigKeys.newStringConfigKey(
             "brooklynnode.brooklyncatalog.contents", "Contents for the brooklyn catalog.xml file (to upload to ~/.brooklyn/catalog.xml", null);
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SetFromFlag("enabledHttpProtocols")
     public static final BasicAttributeSensorAndConfigKey<List<String>> ENABLED_HTTP_PROTOCOLS = new BasicAttributeSensorAndConfigKey(
             List.class, "brooklynnode.webconsole.enabledHttpProtocols", "List of enabled protocols (e.g. http, https)", ImmutableList.of("http"));
@@ -186,10 +187,12 @@ static enum ExistingFileBehaviour {
     public static final BasicAttributeSensorAndConfigKey<String> WEB_CONSOLE_BIND_ADDRESS = new BasicAttributeSensorAndConfigKey<String>(
             String.class, "brooklynnode.webconsole.bindAddress", "Specifies the IP address of the NIC to bind the Brooklyn Management Console to", null);
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SetFromFlag("classpath")
     public static final BasicAttributeSensorAndConfigKey<List<String>> CLASSPATH = new BasicAttributeSensorAndConfigKey(
             List.class, "brooklynnode.classpath", "classpath to use, as list of URL entries", Lists.newArrayList());
 
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     @SetFromFlag("portMapper")
     public static final ConfigKey<Function<? super Integer, ? extends Integer>> PORT_MAPPER = (ConfigKey) ConfigKeys.newConfigKey(Function.class,
             "brooklynnode.webconsole.portMapper", "Function for mapping private to public ports, for use in inferring the brooklyn URI", Functions.<Integer>identity());
diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
index 983cce5895..5c29980f06 100644
--- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
+++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
@@ -75,7 +75,7 @@ public BrooklynNodeImpl(Entity parent) {
     }
     
     @Override
-    public Class getDriverInterface() {
+    public Class<?> getDriverInterface() {
         return BrooklynNodeDriver.class;
     }
 
@@ -90,6 +90,7 @@ public static class DeployBlueprintEffectorBody extends EffectorBody<String> imp
         
         // TODO support YAML parsing
         // TODO define a new type YamlMap for the config key which supports coercing from string and from map
+        @SuppressWarnings("unchecked")
         public static Map<String,Object> asMap(ConfigBag parameters, ConfigKey<?> key) {
             Object v = parameters.getStringKey(key.getName());
             if (v==null || (v instanceof String && Strings.isBlank((String)v)))
@@ -121,8 +122,9 @@ protected String extractPlanYamlString(ConfigBag parameters) {
                 throw new IllegalArgumentException("Must supply plan or url");
             
             Map<String, Object> config = asMap(parameters, BLUEPRINT_CONFIG);
+            
             if (planRaw==null) {
-                planRaw = Jsonya.at("services").list().put("serviceType", url).put(config).getRootMap();
+                planRaw = Jsonya.at("services").list().put("serviceType", url).putIfNotNull("brooklyn.config", config).getRootMap();
             } else { 
                 if (config!=null)
                     throw new IllegalArgumentException("Cannot supply plan with config");
@@ -130,7 +132,7 @@ protected String extractPlanYamlString(ConfigBag parameters) {
             
             // planRaw might be a yaml string, or a map; if a map, convert to string
             if (planRaw instanceof Map)
-                planRaw = Jsonya.of((Map)planRaw).toString();
+                planRaw = Jsonya.of((Map<?,?>)planRaw).toString();
             if (!(planRaw instanceof String))
                 throw new IllegalArgumentException("Invalid "+JavaClassNames.simpleClassName(planRaw)+" value for CAMP plan: "+planRaw);
             
diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
index 8f7d561fc1..9752ec1a65 100644
--- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
+++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
@@ -22,16 +22,21 @@
 
 import java.util.List;
 
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.Entities;
 import brooklyn.entity.drivers.downloads.DownloadResolver;
+import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.event.feed.ConfigToAttributes;
+import brooklyn.location.Location;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.test.entity.TestApplication;
 import brooklyn.util.collections.MutableMap;
+import brooklyn.util.collections.MutableSet;
 
 public class BrooklynNodeTest {
 
@@ -79,4 +84,17 @@ private void runTestGeneratesCorrectDownloadUrl(String version, String expectedU
         System.out.println("urls="+urls);
         assertTrue(urls.contains(expectedUrl), "urls="+urls);
     }
+    
+    @Test
+    public void testCanStartSameNode() throws Exception {
+        // not very interesting as done not have REST when run in this project
+        // but test BrooklynNodeRestTest in downstream project does
+        BrooklynNode bn = app.createAndManageChild(EntitySpec.create(BrooklynNode.class, SameBrooklynNodeImpl.class));
+        bn.start(MutableSet.<Location>of());
+        
+        Assert.assertEquals(bn.getAttribute(Attributes.SERVICE_UP), (Boolean)true);
+        // no URI
+        Assert.assertNull(bn.getAttribute(BrooklynNode.WEB_CONSOLE_URI));
+    }
+
 }
diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java
new file mode 100644
index 0000000000..76e918ceef
--- /dev/null
+++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/SameBrooklynNodeImpl.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package brooklyn.entity.brooklynnode;
+
+import java.net.URI;
+import java.util.Collection;
+
+import brooklyn.entity.basic.AbstractEntity;
+import brooklyn.entity.brooklynnode.BrooklynNodeImpl.DeployBlueprintEffectorBody;
+import brooklyn.event.feed.http.HttpFeed;
+import brooklyn.event.feed.http.HttpPollConfig;
+import brooklyn.event.feed.http.HttpValueFunctions;
+import brooklyn.location.Location;
+
+/** Implementation of BrooklynNode which just presents the node where this is running, for convenience;
+ * 
+ *  start/stop/restart have no effect; 
+ *  sensors are connected;
+ *  deploy blueprint assumes that a REST endpoint is available */
+public class SameBrooklynNodeImpl extends AbstractEntity implements BrooklynNode {
+    
+    private HttpFeed httpFeed;
+
+    @Override
+    public void start(Collection<? extends Location> locations) {
+        connectSensors();
+    }
+
+    @Override
+    public void stop() {
+        disconnectSensors();
+    }
+
+    @Override
+    public void restart() {
+        return;
+    }
+
+    
+    @Override
+    public void init() {
+        super.init();
+        getMutableEntityType().addEffector(DeployBlueprintEffectorBody.DEPLOY_BLUEPRINT);
+    }
+    
+    protected void connectSensors() {
+        URI webConsoleUri = getManagementContext().getManagementNodeUri().orNull();
+        setAttribute(WEB_CONSOLE_URI, webConsoleUri);
+
+        if (webConsoleUri != null) {
+            httpFeed = HttpFeed.builder()
+                    .entity(this)
+                    .period(200)
+                    .baseUri(webConsoleUri)
+                    .credentialsIfNotNull(getConfig(MANAGEMENT_USER), getConfig(MANAGEMENT_PASSWORD))
+                    .poll(new HttpPollConfig<Boolean>(SERVICE_UP)
+                            .onSuccess(HttpValueFunctions.responseCodeEquals(200))
+                            .setOnFailureOrException(false))
+                    .build();
+
+        } else {
+            setAttribute(SERVICE_UP, true);
+        }
+    }
+    
+    protected void disconnectSensors() {
+        if (httpFeed != null) httpFeed.stop();
+    }
+
+}
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java b/usage/launcher/src/main/java/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java
index c05c94fe51..c8e7df42a0 100644
--- a/usage/launcher/src/main/java/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java
+++ b/usage/launcher/src/main/java/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java
@@ -24,6 +24,7 @@
 import io.brooklyn.camp.spi.PlatformRootSummary;
 import brooklyn.entity.basic.BrooklynShutdownHooks;
 import brooklyn.launcher.BrooklynLauncher;
+import brooklyn.management.ManagementContext;
 import brooklyn.management.internal.LocalManagementContext;
 
 import com.google.common.annotations.Beta;
@@ -39,7 +40,7 @@ public class BrooklynCampPlatformLauncher extends BrooklynCampPlatformLauncherAb
     public BrooklynCampPlatformLauncher launch() {
         assert platform == null;
 
-        mgmt = new LocalManagementContext();
+        mgmt = newManagementContext();
         
         // We created the management context, so we are responsible for terminating it
         BrooklynShutdownHooks.invokeTerminateOnShutdown(mgmt);
@@ -54,6 +55,10 @@ public BrooklynCampPlatformLauncher launch() {
         return this;
     }
     
+    protected ManagementContext newManagementContext() {
+        return new LocalManagementContext();
+    }
+
     public static void main(String[] args) {
         new BrooklynCampPlatformLauncher().launch();
     }
diff --git a/usage/launcher/src/test/java/brooklyn/entity/basic/VanillaSoftwareYamlTest.java b/usage/launcher/src/test/java/brooklyn/entity/basic/VanillaSoftwareYamlTest.java
index 5ef622e987..8fbca642f6 100644
--- a/usage/launcher/src/test/java/brooklyn/entity/basic/VanillaSoftwareYamlTest.java
+++ b/usage/launcher/src/test/java/brooklyn/entity/basic/VanillaSoftwareYamlTest.java
@@ -26,6 +26,7 @@
 import brooklyn.entity.Application;
 import brooklyn.entity.Entity;
 import brooklyn.entity.trait.Startable;
+import brooklyn.launcher.SimpleYamlLauncherForTests;
 import brooklyn.launcher.camp.SimpleYamlLauncher;
 import brooklyn.test.Asserts;
 import brooklyn.util.ResourceUtils;
@@ -40,7 +41,7 @@ public class VanillaSoftwareYamlTest {
     
     @Test(groups="Integration")
     public void testVanillaSoftwareYaml() {
-        SimpleYamlLauncher l = new SimpleYamlLauncher();
+        SimpleYamlLauncher l = new SimpleYamlLauncherForTests();
         try {
             Application app = l.launchAppYaml("vanilla-software-blueprint.yaml");
             log.info("started "+app);
@@ -76,7 +77,7 @@ public void run() {
     /** yaml variant of VanillaSoftwareProcessAndChildrenIntegrationTest */
     @Test(groups="Integration")
     public void testVanillaSoftwareYamlWithChildStartedAfter() {
-        SimpleYamlLauncher l = new SimpleYamlLauncher();
+        SimpleYamlLauncher l = new SimpleYamlLauncherForTests();
         try {
             Application app = l.launchAppYaml("vanilla-software-with-child-blueprint.yaml");
             log.info("started "+app);
diff --git a/usage/launcher/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java b/usage/launcher/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java
new file mode 100644
index 0000000000..2cd97f0c7c
--- /dev/null
+++ b/usage/launcher/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java
@@ -0,0 +1,92 @@
+package brooklyn.entity.brooklynnode;
+
+import java.net.URI;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import brooklyn.entity.Application;
+import brooklyn.entity.basic.ApplicationBuilder;
+import brooklyn.entity.basic.Attributes;
+import brooklyn.entity.basic.Entities;
+import brooklyn.entity.basic.EntityInternal;
+import brooklyn.entity.proxying.EntitySpec;
+import brooklyn.event.basic.BasicConfigKey;
+import brooklyn.launcher.SimpleYamlLauncherForTests;
+import brooklyn.launcher.camp.SimpleYamlLauncher;
+import brooklyn.location.Location;
+import brooklyn.management.Task;
+import brooklyn.test.EntityTestUtils;
+import brooklyn.test.entity.TestApplication;
+import brooklyn.test.entity.TestEntity;
+import brooklyn.util.collections.MutableMap;
+import brooklyn.util.collections.MutableSet;
+import brooklyn.util.config.ConfigBag;
+import brooklyn.util.net.Urls;
+import brooklyn.util.time.Duration;
+
+import com.google.common.collect.Iterables;
+
+/** REST-accessible extension of {@link BrooklynNodeTest} */
+public class BrooklynNodeRestTest {
+
+    private static final Logger log = LoggerFactory.getLogger(BrooklynNodeRestTest.class);
+    
+    // takes a while when run on its own, because initializing war and making some requests;
+    // but there are no waits (beyond 10ms), the delay is all classloading;
+    // and this tests a lot of things, REST API, Brooklyn Node, yaml deployment,
+    // so feels worth it to have as a unit test
+    @Test
+    public void testBrooklynNodeRestDeployAndMirror() {
+        SimpleYamlLauncher l = new SimpleYamlLauncherForTests();
+        try {
+            TestApplication app = ApplicationBuilder.newManagedApp(TestApplication.class, l.getManagementContext());
+
+            BrooklynNode bn = app.createAndManageChild(EntitySpec.create(BrooklynNode.class, SameBrooklynNodeImpl.class));
+            bn.start(MutableSet.<Location>of());
+            
+            URI uri = bn.getAttribute(BrooklynNode.WEB_CONSOLE_URI);
+            Assert.assertNotNull(uri);
+            EntityTestUtils.assertAttributeEqualsEventually(bn, Attributes.SERVICE_UP, true);
+            log.info("Created BrooklynNode: "+bn);
+
+            // deploy
+            Task<?> t = bn.invoke(BrooklynNode.DEPLOY_BLUEPRINT, ConfigBag.newInstance()
+                .configure(BrooklynNode.DeployBlueprintEffector.BLUEPRINT_TYPE, TestApplication.class.getName())
+                .configure(BrooklynNode.DeployBlueprintEffector.BLUEPRINT_CONFIG, MutableMap.<String,Object>of("x", 1, "y", "Y"))
+                .getAllConfig());
+            log.info("Deployment result: "+t.getUnchecked());
+            
+            MutableSet<Application> apps = MutableSet.copyOf( l.getManagementContext().getApplications() );
+            Assert.assertEquals(apps.size(), 2);
+            apps.remove(app);
+            
+            Application newApp = Iterables.getOnlyElement(apps);
+            Entities.dumpInfo(newApp);
+            
+            Assert.assertEquals(newApp.getConfig(new BasicConfigKey<Integer>(Integer.class, "x")), (Integer)1);
+            
+            // check mirror
+            String newAppId = newApp.getId();
+            BrooklynEntityMirror mirror = app.createAndManageChild(EntitySpec.create(BrooklynEntityMirror.class)
+                .configure(BrooklynEntityMirror.MIRRORED_ENTITY_URL, 
+                    Urls.mergePaths(uri.toString(), "/v1/applications/"+newAppId+"/entities/"+newAppId))
+                .configure(BrooklynEntityMirror.MIRRORED_ENTITY_ID, newAppId)
+                .configure(BrooklynEntityMirror.POLL_PERIOD, Duration.millis(10)));
+            
+            Entities.dumpInfo(mirror);
+            
+            EntityTestUtils.assertAttributeEqualsEventually(mirror, Attributes.SERVICE_UP, true);
+            
+            ((EntityInternal)newApp).setAttribute(TestEntity.NAME, "foo");
+            EntityTestUtils.assertAttributeEqualsEventually(mirror, TestEntity.NAME, "foo");
+            log.info("Mirror successfully validated");
+            
+        } finally {
+            l.destroyAll();
+        }
+        log.info("DONE");
+    }
+}
diff --git a/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java b/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java
index db9b986355..ac37889d88 100644
--- a/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java
+++ b/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java
@@ -32,7 +32,6 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
diff --git a/usage/launcher/src/test/java/brooklyn/launcher/SimpleYamlLauncherForTests.java b/usage/launcher/src/test/java/brooklyn/launcher/SimpleYamlLauncherForTests.java
new file mode 100644
index 0000000000..9ab8131835
--- /dev/null
+++ b/usage/launcher/src/test/java/brooklyn/launcher/SimpleYamlLauncherForTests.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package brooklyn.launcher;
+
+import brooklyn.launcher.camp.SimpleYamlLauncher;
+import brooklyn.management.ManagementContext;
+import brooklyn.test.entity.LocalManagementContextForTests;
+
+public class SimpleYamlLauncherForTests extends SimpleYamlLauncher {
+
+    protected ManagementContext newManagementContext() {
+        return new LocalManagementContextForTests();
+    }
+
+}
diff --git a/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java b/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java
index 2060dac8ed..383b926520 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java
@@ -264,6 +264,14 @@ public Navigator<T> put(Object k1, Object v1, Object ...kvOthers) {
             return this;
         }
         
+        public Navigator<T> putIfNotNull(Object k1, Object v1) {
+            if (v1!=null) {
+                map();
+                putInternal((Map)focus, k1, v1);
+            }
+            return this;
+        }
+        
         protected void putInternal(Map target, Object k1, Object v1, Object ...kvOthers) {
             assert (kvOthers.length % 2) == 0 : "even number of arguments required for put";
             target.put(translateKey(k1), translate(v1));

From cefcda3b862fbbc0ff0008daadf988f8c361522a Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Fri, 18 Jul 2014 00:39:24 -0400
Subject: [PATCH 6/7] support effector parameters which are maps (@sjcorbett
 just did this also; now this commit simply adds a test for this)

---
 .../brooklynnode/BrooklynNodeRestTest.java    | 55 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/usage/launcher/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java b/usage/launcher/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java
index 2cd97f0c7c..2a3816ba0d 100644
--- a/usage/launcher/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java
+++ b/usage/launcher/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java
@@ -1,7 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package brooklyn.entity.brooklynnode;
 
 import java.net.URI;
+import java.util.concurrent.Callable;
 
+import org.apache.http.client.HttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -19,12 +39,17 @@
 import brooklyn.location.Location;
 import brooklyn.management.Task;
 import brooklyn.test.EntityTestUtils;
+import brooklyn.test.HttpTestUtils;
 import brooklyn.test.entity.TestApplication;
 import brooklyn.test.entity.TestEntity;
+import brooklyn.util.collections.Jsonya;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.collections.MutableSet;
 import brooklyn.util.config.ConfigBag;
+import brooklyn.util.http.HttpTool;
+import brooklyn.util.http.HttpToolResponse;
 import brooklyn.util.net.Urls;
+import brooklyn.util.repeat.Repeater;
 import brooklyn.util.time.Duration;
 
 import com.google.common.collect.Iterables;
@@ -40,7 +65,7 @@ public class BrooklynNodeRestTest {
     // so feels worth it to have as a unit test
     @Test
     public void testBrooklynNodeRestDeployAndMirror() {
-        SimpleYamlLauncher l = new SimpleYamlLauncherForTests();
+        final SimpleYamlLauncher l = new SimpleYamlLauncherForTests();
         try {
             TestApplication app = ApplicationBuilder.newManagedApp(TestApplication.class, l.getManagementContext());
 
@@ -84,6 +109,34 @@ public void testBrooklynNodeRestDeployAndMirror() {
             EntityTestUtils.assertAttributeEqualsEventually(mirror, TestEntity.NAME, "foo");
             log.info("Mirror successfully validated");
             
+            // also try deploying by invoking deploy through json
+            // (catch issues when effector params are map)
+            HttpClient client = HttpTool.httpClientBuilder().build();
+            HttpToolResponse result = HttpTool.httpPost(client, URI.create(Urls.mergePaths(uri.toString(), "/v1/applications/"+app.getId()+"/entities/"+bn.getId()
+                    +"/effectors/deployBlueprint")), 
+                MutableMap.of(com.google.common.net.HttpHeaders.CONTENT_TYPE, "application/json"), 
+                Jsonya.newInstance()
+                    .put("blueprintType", TestApplication.class.getName())
+                    .put("blueprintConfig", MutableMap.of(TestEntity.CONF_NAME.getName(), "foo"))
+                .toString().getBytes());
+            log.info("Deploy effector invoked, result: "+result);
+            HttpTestUtils.assertHealthyStatusCode( result.getResponseCode() );
+            
+            Repeater.create().every(Duration.millis(10)).until(new Callable<Boolean>() {
+                @Override
+                public Boolean call() throws Exception {
+                    return l.getManagementContext().getApplications().size() == 3;
+                }
+            }).limitTimeTo(Duration.TEN_SECONDS);
+            
+            apps = MutableSet.copyOf( l.getManagementContext().getApplications() );
+            apps.removeAll( MutableSet.of(app, newApp) );
+            Application newApp2 = Iterables.getOnlyElement(apps);
+            Entities.dumpInfo(newApp2);
+            
+            EntityTestUtils.assertAttributeEqualsEventually(newApp2, Attributes.SERVICE_UP, true);
+            Assert.assertEquals(newApp2.getConfig(TestEntity.CONF_NAME), "foo");
+            
         } finally {
             l.destroyAll();
         }

From ebfec154ae569ba5a7e9257e7415a928857b933c Mon Sep 17 00:00:00 2001
From: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date: Fri, 18 Jul 2014 09:51:15 -0400
Subject: [PATCH 7/7] fix intermittent failing test by ensuring we wait for
 persistence to complete

---
 ...rooklynMementoPersisterInMemorySizeIntegrationTest.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java
index 1d82962c20..d2638cf75a 100644
--- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java
@@ -49,6 +49,10 @@ protected ManagementContext newPersistingManagementContext() {
     public void testPersistenceVolumeFast() throws IOException, TimeoutException, InterruptedException {
         doTestPersistenceVolume(50*1000, false);
     }
+    @Test(groups="Integration",invocationCount=20)
+    public void testPersistenceVolumeFastManyTimes() throws IOException, TimeoutException, InterruptedException {
+        doTestPersistenceVolume(50*1000, false);
+    }
     @Test(groups="Integration")
     public void testPersistenceVolumeWaiting() throws IOException, TimeoutException, InterruptedException {
         // by waiting we ensure there aren't extra writes going on
@@ -58,6 +62,7 @@ public void testPersistenceVolumeWaiting() throws IOException, TimeoutException,
     protected void doTestPersistenceVolume(int bigBlockSize, boolean forceDelay) throws IOException, TimeoutException, InterruptedException {
         if (forceDelay) Time.sleep(Duration.FIVE_SECONDS);
         else recorder.blockUntilDataWrittenExceeds(512, Duration.FIVE_SECONDS);
+        localManagementContext.getRebindManager().waitForPendingComplete(Duration.FIVE_SECONDS);
         
         long out1 = recorder.getBytesOut();
         int filesOut1 = recorder.getCountDataOut();
@@ -68,6 +73,7 @@ protected void doTestPersistenceVolume(int bigBlockSize, boolean forceDelay) thr
         ((EntityInternal)app).setAttribute(TestEntity.NAME, "hello world");
         if (forceDelay) Time.sleep(Duration.FIVE_SECONDS);
         else recorder.blockUntilDataWrittenExceeds(out1+10, Duration.FIVE_SECONDS);
+        localManagementContext.getRebindManager().waitForPendingComplete(Duration.FIVE_SECONDS);
         
         long out2 = recorder.getBytesOut();
         Assert.assertTrue(out2-out1>10, "should have written more data");
@@ -80,6 +86,7 @@ protected void doTestPersistenceVolume(int bigBlockSize, boolean forceDelay) thr
         ((EntityInternal)entity).setAttribute(TestEntity.NAME, Identifiers.makeRandomId(bigBlockSize));
         if (forceDelay) Time.sleep(Duration.FIVE_SECONDS);
         else recorder.blockUntilDataWrittenExceeds(out2+bigBlockSize, Duration.FIVE_SECONDS);
+        localManagementContext.getRebindManager().waitForPendingComplete(Duration.FIVE_SECONDS);
 
         long out3 = recorder.getBytesOut();
         Assert.assertTrue(out3-out2 > bigBlockSize, "should have written 50k more data, only wrote "+out3+" compared with "+out2);