[2/2] incubator-brooklyn git commit: This closes #1125

2016-01-14 Thread aledsage 
This closes #1125


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

Branch: refs/heads/master
Commit: ed289eceb18a480d4d729aad0bcd924594eb3550
Parents: a2fde1a 4f4c4a5
Author: Aled Sage 
Authored: Thu Jan 14 16:46:42 2016 +
Committer: Aled Sage 
Committed: Thu Jan 14 16:46:42 2016 +

--
 brooklyn-server/pom.xml | 2 +-
 brooklyn-server/utils/rest-swagger/pom.xml  | 4 
 .../org/apache/brooklyn/rest/apidoc/ApiListingResource.java | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)
--

[22/24] incubator-brooklyn git commit: This closes #1149

2016-01-14 Thread heneveld 
This closes #1149


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

Branch: refs/heads/master
Commit: c34106a74dfad491912915f6a77d264612bbdedb
Parents: d376516 75245a6
Author: Alex Heneveld 
Authored: Thu Jan 14 23:48:07 2016 +
Committer: Alex Heneveld 
Committed: Thu Jan 14 23:48:07 2016 +

--
 .../server-cli/src/main/resources/brooklyn/default.catalog.bom | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c34106a7/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom
--

[10/24] incubator-brooklyn git commit: moved new QA classes to correct location

2016-01-14 Thread heneveld 
moved new QA classes to correct location


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

Branch: refs/heads/master
Commit: be6612cf409bc498e67c734397520e5c8d4d812f
Parents: e2392c3
Author: Graeme-Miller 
Authored: Thu Jan 14 13:44:51 2016 +
Committer: Graeme-Miller 
Committed: Thu Jan 14 13:44:51 2016 +

--
 ...infrastructuredeploymenttestcase-entity.yaml |  11 +
 .../entities/loopovergroupmembers-entity.yaml   |   6 +
 .../InfrastructureDeploymentTestCaseTest.java   | 267 +
 .../LoopOverGroupMembersTestCaseTest.java   | 286 +++
 .../framework/entity/TestInfrastructure.java|  31 ++
 .../entity/TestInfrastructureImpl.java  |  46 +++
 ...infrastructuredeploymenttestcase-entity.yaml |  11 -
 .../entities/loopovergroupmembers-entity.yaml   |   6 -
 .../InfrastructureDeploymentTestCaseTest.java   | 267 -
 .../LoopOverGroupMembersTestCaseTest.java   | 286 ---
 .../framework/entity/TestInfrastructure.java|  31 --
 .../entity/TestInfrastructureImpl.java  |  46 ---
 12 files changed, 647 insertions(+), 647 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be6612cf/brooklyn-docs/guide/yaml/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
--
diff --git 
a/brooklyn-docs/guide/yaml/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
 
b/brooklyn-docs/guide/yaml/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
new file mode 100644
index 000..6b344da
--- /dev/null
+++ 
b/brooklyn-docs/guide/yaml/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
@@ -0,0 +1,11 @@
+- type: org.apache.brooklyn.test.framework.InfrastructureDeploymentTestCase
+  brooklyn.config:
+infrastructure.deployment.location.sensor: entity.dynamicLocation
+infrastructure.deployment.spec:
+  $brooklyn:entitySpec:
+- type: docker-cloud-calico
+  ...
+infrastructure.deployment.entity.specs:
+  - $brooklyn:entitySpec:
+  type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
+  ...
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be6612cf/brooklyn-docs/guide/yaml/example_yaml/entities/loopovergroupmembers-entity.yaml
--
diff --git 
a/brooklyn-docs/guide/yaml/example_yaml/entities/loopovergroupmembers-entity.yaml
 
b/brooklyn-docs/guide/yaml/example_yaml/entities/loopovergroupmembers-entity.yaml
new file mode 100644
index 000..e97ab4c
--- /dev/null
+++ 
b/brooklyn-docs/guide/yaml/example_yaml/entities/loopovergroupmembers-entity.yaml
@@ -0,0 +1,6 @@
+- type: org.apache.brooklyn.test.framework.LoopOverGroupMembersTestCase
+  target: $brooklyn:component("infrastructure").component("child", 
"DockerHosts")
+  testSpec:
+$brooklyn:entitySpec:
+  type: org.apache.brooklyn.test.framework.TestSensor
+  ...
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be6612cf/brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java
--
diff --git 
a/brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java
 
b/brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java
new file mode 100644
index 000..fa0e864
--- /dev/null
+++ 
b/brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java
@@ -0,0 +1,267 @@
+/*
+ * 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

[11/24] incubator-brooklyn git commit: better logging and rendering of errors

2016-01-14 Thread heneveld 
better logging and rendering of errors


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

Branch: refs/heads/master
Commit: 01833f20621a34bf5437d0a4dff8a775823fcbb8
Parents: 649a08d
Author: Alex Heneveld 
Authored: Thu Jan 14 11:45:20 2016 +
Committer: Alex Heneveld 
Committed: Thu Jan 14 14:43:00 2016 +

--
 .../camp/brooklyn/spi/creation/CampResolver.java |  2 +-
 .../catalog/internal/BasicBrooklynCatalog.java   |  6 --
 .../brooklyn/rest/resources/CatalogResource.java |  7 ++-
 .../rest/util/DefaultExceptionMapper.java|  5 -
 .../brooklyn/util/exceptions/Exceptions.java | 19 ++-
 5 files changed, 33 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/01833f20/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
--
diff --git 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
index 5615592..7523343 100644
--- 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
+++ 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
@@ -139,7 +139,7 @@ class CampResolver {
 return appSpec;
 
 } else {
-throw new IllegalStateException("Unable to instantiate YAML; 
incompatible instantiator "+instantiator+" for "+at);
+throw new IllegalStateException("Unable to instantiate YAML; 
invalid type or parameters in plan:\n"+plan);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/01833f20/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
--
diff --git 
a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
 
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
index 96cf452..4ecc1fd 100644
--- 
a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
+++ 
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
@@ -463,8 +463,10 @@ public class BasicBrooklynCatalog implements 
BrooklynCatalog {
 PlanInterpreterGuessingType planInterpreter = new 
PlanInterpreterGuessingType(null, item, sourceYaml, itemType, libraryBundles, 
result).reconstruct();
 if (!planInterpreter.isResolved()) {
 throw Exceptions.create("Could not resolve item"
-+ (Strings.isNonBlank(id) ? " "+id : 
Strings.isNonBlank(symbolicName) ? " "+symbolicName : Strings.isNonBlank(name) 
? name : "")
-// better not to show yaml, takes up lots of space, and with 
multiple plan transformers there might be multiple errors 
++ (Strings.isNonBlank(id) ? " '"+id+"'" : 
Strings.isNonBlank(symbolicName) ? " '"+symbolicName+"'" : 
Strings.isNonBlank(name) ? " '"+name+"'" : "")
+// better not to show yaml, takes up lots of space, and with 
multiple plan transformers there might be multiple errors; 
+// some of the errors themselves may reproduce it
+// (ideally in future we'll be able to return typed errors 
with caret position of error)
 //+ ":\n"+sourceYaml
 , planInterpreter.getErrors());
 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/01833f20/brooklyn-server/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
--
diff --git 
a/brooklyn-server/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
 
b/brooklyn-server/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
index 01bf992..82bac22 100644
--- 
a/brooklyn-server/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
+++ 
b/brooklyn-server/rest/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
@@ -124,7 +124,12 @@ public

[04/24] incubator-brooklyn git commit: Merge branch 'master' into blueprint-for-app-spec

2016-01-14 Thread heneveld 
Merge branch 'master' into blueprint-for-app-spec

Conflicts:

brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
 -- tests added


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

Branch: refs/heads/master
Commit: 9fac9c454f59821b37ade208bfcb581eba38009f
Parents: 09351a6 c97ccaf
Author: Alex Heneveld 
Authored: Wed Jan 13 16:40:06 2016 +
Committer: Alex Heneveld 
Committed: Wed Jan 13 16:40:06 2016 +

--
 .../BrooklynAssemblyTemplateInstantiator.java   |  11 ++
 .../BrooklynComponentTemplateResolver.java  |  25 +++-
 .../spi/dsl/BrooklynDslDeferredSupplier.java|  40 +-
 .../DependentConfigPollingYamlTest.java | 117 ++
 .../catalog/CatalogYamlTemplateTest.java| 123 ++-
 .../location/geo/LocalhostExternalIpLoader.java |  73 +++
 .../geo/external-ip-address-resolvers.txt   |   1 -
 brooklyn-server/karaf/feature.xml   |  51 
 brooklyn-server/karaf/features/pom.xml  |   4 -
 .../features/src/main/history/dependencies.xml  | 103 
 10 files changed, 363 insertions(+), 185 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9fac9c45/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
--
diff --cc 
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
index c5ea96f,304ba8b..7954369
--- 
a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
+++ 
b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
@@@ -18,23 -18,21 +18,30 @@@
   */
  package org.apache.brooklyn.camp.brooklyn.catalog;
  
+ import static org.testng.Assert.assertEquals;
+ import static org.testng.Assert.assertTrue;
+ 
 +import java.util.List;
 +
 +import org.apache.brooklyn.api.entity.Application;
+ import org.apache.brooklyn.api.entity.Entity;
 +import org.apache.brooklyn.api.entity.EntitySpec;
  import org.apache.brooklyn.api.typereg.RegisteredType;
  import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest;
+ import org.apache.brooklyn.core.entity.Entities;
 +import org.apache.brooklyn.core.mgmt.BrooklynTags;
 +import org.apache.brooklyn.core.mgmt.BrooklynTags.NamedStringTag;
 +import org.apache.brooklyn.core.mgmt.EntityManagementUtils;
  import org.apache.brooklyn.core.mgmt.osgi.OsgiStandaloneTest;
+ import org.apache.brooklyn.core.test.entity.TestEntity;
  import org.apache.brooklyn.core.typereg.RegisteredTypePredicates;
  import org.apache.brooklyn.core.typereg.RegisteredTypes;
+ import org.apache.brooklyn.entity.group.DynamicCluster;
+ import org.apache.brooklyn.entity.stock.BasicApplication;
 +import org.apache.brooklyn.test.Asserts;
- import org.apache.brooklyn.test.TestUtils;
  import org.apache.brooklyn.test.support.TestResourceUnavailableException;
  import org.apache.brooklyn.util.osgi.OsgiTestResources;
 +import org.python.google.common.collect.Iterables;
  import org.testng.Assert;
  import org.testng.TestListenerAdapter;
  import org.testng.TestNG;
@@@ -73,18 -73,119 +80,130 @@@ public class CatalogYamlTemplateTest ex
  deleteCatalogEntity("t1");
  }
  
 -@Test
+ public void testServiceTypeEntityOfTypeCatalogTemplateNotWrapped() throws 
Exception {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ "  id: t1",
+ "  item_type: template",
+ "  name: myT1",
+ "  item:",
+ "services:",
+ "- type: " + TestEntity.class.getName());
+ addCatalogItems(
+ "brooklyn.catalog:",
+ "  id: t2",
+ "  item_type: template",
+ "  name: myT2",
+ "  item:",
+ "services:",
+ "- type: t1",
+ "- type: t1");
+ 
+ Entity app = createAndStartApplication(
+ "services:",
+ "- type: t2");
+ waitForApplicationTasks(app);
+ 
+ Entities.dumpInfo(app);
+ Entity t1a = Iterables.get(app.getChildren(), 0);
+ Entity t1b = Iterables.get(app.getChildren(), 1);
+

[19/24] incubator-brooklyn git commit: fix transformation of values which are Sets

2016-01-14 Thread heneveld 
fix transformation of values which are Sets

fixing test failure introduced, and expand test coverage;
the problem was not introduced here, but i think it was hidden
because we weren't transforming values in some cases.
presumably now we are transforming better+more,
and with this we're also transforming Set instances correctly.


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

Branch: refs/heads/master
Commit: 50b3c22c00f0741b01ec720961308105df89d337
Parents: a8644cd
Author: Alex Heneveld 
Authored: Thu Jan 14 22:00:09 2016 +
Committer: Alex Heneveld 
Committed: Thu Jan 14 22:20:14 2016 +

--
 .../BrooklynComponentTemplateResolver.java  |  2 +-
 .../camp/brooklyn/EntitiesYamlTest.java | 27 +---
 .../core/mgmt/EntityManagementUtils.java|  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/50b3c22c/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
--
diff --git 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index 06c2b86..fdc2559 100644
--- 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@ -333,7 +333,7 @@ public class BrooklynComponentTemplateResolver {
 if (input instanceof Map)
 return transformSpecialFlags((Map)input);
 else if (input instanceof Set)
-return 
MutableSet.of(transformSpecialFlags((Iterable)input));
+return 
MutableSet.copyOf(transformSpecialFlags((Iterable)input));
 else if (input instanceof List)
 return 
MutableList.copyOf(transformSpecialFlags((Iterable)input));
 else if (input instanceof Iterable)

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/50b3c22c/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
--
diff --git 
a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
 
b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
index 5872995..af2faf9 100644
--- 
a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
+++ 
b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
@@ -102,7 +102,6 @@ public class EntitiesYamlTest extends AbstractYamlTest {
 setupAndCheckTestEntityInBasicYamlWith();
 }
 
-@SuppressWarnings("unchecked")
 @Test
 public void testBrooklynConfig() throws Exception {
 Entity testEntity = setupAndCheckTestEntityInBasicYamlWith( 
@@ -115,6 +114,17 @@ public class EntitiesYamlTest extends AbstractYamlTest {
 "  - dogs",
 "  - cats",
 "  - badgers",
+"test.confSetPlain: !!set",
+"  ? square",
+"  ? circle",
+"  ? triangle",
+"test.confMapThing:",
+"  foo: bar",
+"  baz: qux",
+"test.confListThing:",
+"  - dogs",
+"  - cats",
+"  - badgers",
 "test.confSetThing: !!set",
 "  ? square",
 "  ? circle",
@@ -122,14 +132,13 @@ public class EntitiesYamlTest extends AbstractYamlTest {
 "test.confObject: 5");
 
 Assert.assertEquals(testEntity.getConfig(TestEntity.CONF_NAME), "Test 
Entity Name");
-List list = testEntity.getConfig(TestEntity.CONF_LIST_PLAIN);
-Assert.assertEquals(list, ImmutableList.of("dogs", "cats", "badgers"));
-Map map = 
testEntity.getConfig(TestEntity.CONF_MAP_PLAIN);
-Assert.assertEquals(map, ImmutableMap.of("foo", "bar", "baz", "qux"));
-Set

[20/24] incubator-brooklyn git commit: turn off sticky sessions to allow easy balancing validation

2016-01-14 Thread heneveld 
turn off sticky sessions to allow easy balancing validation


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

Branch: refs/heads/master
Commit: 75245a6daa52c1a0bd6570bf6e6d62a3ce8a7c95
Parents: ed289ec
Author: John McCabe 
Authored: Thu Jan 14 22:58:57 2016 +
Committer: John McCabe 
Committed: Thu Jan 14 22:58:57 2016 +

--
 .../server-cli/src/main/resources/brooklyn/default.catalog.bom | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/75245a6d/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom
--
diff --git 
a/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom 
b/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom
index 483f04d..2826141 100644
--- a/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom
+++ b/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom
@@ -332,6 +332,8 @@ brooklyn.catalog:
   # point this load balancer at the cluster, specifying port to 
forward to
   loadbalancer.serverpool:  $brooklyn:entity("my-web-cluster")
   member.sensor.portNumber: app.port
+  # disable sticky sessions to allow easy validation of balancing via 
browser refresh
+  nginx.sticky: false
   
   brooklyn.enrichers:
   # publish a few useful info sensors and KPI's to the root of the app

[15/24] incubator-brooklyn git commit: WIP - change semantics of parameter addition

2016-01-14 Thread heneveld 
WIP - change semantics of parameter addition

api EntitySpec.parameters(...)  should *add* parameters, like the other methods;
since parameters have just been introduced it is fine to do this

also comments and tidy of other merges


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

Branch: refs/heads/master
Commit: aa9a2d7be6686319fe05079ddad97d19a457
Parents: 73f7e73
Author: Alex Heneveld 
Authored: Wed Jan 13 23:08:29 2016 +
Committer: Alex Heneveld 
Committed: Thu Jan 14 15:51:24 2016 +

--
 .../api/internal/AbstractBrooklynObjectSpec.java|  9 -
 .../brooklyn/core/mgmt/EntityManagementUtils.java   | 16 
 2 files changed, 16 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aa9a2d7b/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
--
diff --git 
a/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
 
b/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
index ab046d5..d03eec1 100644
--- 
a/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
+++ 
b/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
@@ -107,8 +108,14 @@ public abstract class AbstractBrooklynObjectSpec parameters) {
-this.parameters = ImmutableList.copyOf(checkNotNull(parameters, 
"parameters"));
+// parameters follows immutable pattern, unlike the other fields
+Builder result = 
ImmutableList.builder();
+if (this.parameters!=null)
+result.addAll(this.parameters);
+result.addAll( checkNotNull(parameters, "parameters") );
+this.parameters = result.build();
 return self();
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aa9a2d7b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java
--
diff --git 
a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java
 
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java
index d0f5b14..7dcd9a2 100644
--- 
a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java
+++ 
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java
@@ -248,18 +248,18 @@ public class EntityManagementUtils {
 if (Strings.isNonEmpty(wrapperParent.getDisplayName())) {
 wrappedChild.displayName(wrapperParent.getDisplayName());
 }
-if (!wrapperParent.getLocations().isEmpty()) {
-wrappedChild.locations(wrapperParent.getLocations());
-}
-if (!wrapperParent.getParameters().isEmpty()) {
-wrappedChild.parameters(wrapperParent.getParameters());
-}
+
+wrappedChild.locations(wrapperParent.getLocations());
+
+wrappedChild.parameters(wrapperParent.getParameters());
+
 if (wrappedChild.getCatalogItemId()==null) {
 wrappedChild.catalogItemId(wrapperParent.getCatalogItemId());
 }
 
-// NB: this clobbers child config; might prefer to deeply merge maps 
etc
-// (but this should not be surprising, as unwrapping is often 
parameterising the nested blueprint, so outer config should dominate) 
+// NB: this clobber's child config; might prefer to deeply merge maps 
etc
+// (or maybe even prevent the merge in these cases; 
+// not sure there is a compelling reason to have config on a 
pure-wrapper parent)
 Map configWithoutWrapperMarker = 
Maps.filterKeys(wrapperParent.getConfig(),

[03/24] incubator-brooklyn git commit: This closes #1138

2016-01-14 Thread heneveld 
This closes #1138


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

Branch: refs/heads/master
Commit: c97ccaf94bcd94fadd61a19aaf87b94893e9a23e
Parents: 58337c4 e3a1661
Author: Alex Heneveld 
Authored: Wed Jan 13 11:29:26 2016 +
Committer: Alex Heneveld 
Committed: Wed Jan 13 11:29:26 2016 +

--
 .../BrooklynAssemblyTemplateInstantiator.java   |  11 ++
 .../BrooklynComponentTemplateResolver.java  |  25 +++-
 .../catalog/CatalogYamlTemplateTest.java| 123 +++
 3 files changed, 158 insertions(+), 1 deletion(-)
--

[05/24] incubator-brooklyn git commit: tidy up of entity/app unwrapping

2016-01-14 Thread heneveld 
tidy up of entity/app unwrapping


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

Branch: refs/heads/master
Commit: b35188c684575eff3422f0acd06356c5dc824a94
Parents: 9fac9c4
Author: Alex Heneveld 
Authored: Wed Jan 13 16:40:24 2016 +
Committer: Alex Heneveld 
Committed: Wed Jan 13 16:40:24 2016 +

--
 .../BrooklynAssemblyTemplateInstantiator.java   |  23 ++--
 .../BrooklynComponentTemplateResolver.java  |  23 +---
 .../brooklyn/spi/creation/CampResolver.java |   8 +-
 .../core/mgmt/EntityManagementUtils.java| 108 +++
 4 files changed, 72 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b35188c6/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
--
diff --git 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
index 4d2ca82..931c2e7 100644
--- 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
+++ 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
@@ -40,7 +40,6 @@ import org.apache.brooklyn.util.core.flags.TypeCoercions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 public class BrooklynAssemblyTemplateInstantiator implements 
AssemblyTemplateSpecInstantiator {
@@ -90,30 +89,20 @@ public class BrooklynAssemblyTemplateInstantiator 
implements AssemblyTemplateSpe
 // first build the children into an empty shell app
 List childSpecs = createServiceSpecs(template, 
platform, loader, encounteredTypeSymbolicNames);
 for (EntitySpec childSpec : childSpecs) {
-
-if (Application.class.isAssignableFrom(childSpec.getType())) {
-EntitySpec appSpec = (EntitySpec) childSpec;
-if 
(EntityManagementUtils.canPromoteChildrenInWrappedApplication(appSpec)) {
-EntitySpec appChildSpec = 
Iterables.getOnlyElement(appSpec.getChildren());
-
EntityManagementUtils.mergeWrapperParentSpecToChildEntity(appSpec, 
appChildSpec);
-childSpec = appChildSpec;
-}
-}
-
-app.child(childSpec);
+// children get parsed and unwrapped irrespective of the 
NEVER_UNWRAP_APPS setting;
+// we could support a NEVER_UNWRAP_NESTED_ENTITIES item but i 
don't know if there's a use case
+app.child(EntityManagementUtils.unwrapEntity(childSpec));
 }
 
-if (shouldUnwrap(template, app)) {
+if (allowedToUnwrap(template, app)) {
 app = EntityManagementUtils.unwrapApplication(app);
 }
 
 return app;
 }
 
-private boolean shouldUnwrap(AssemblyTemplate template, EntitySpec app) {
-if 
(Boolean.TRUE.equals(TypeCoercions.coerce(template.getCustomAttributes().get(NEVER_UNWRAP_APPS_PROPERTY),
 Boolean.class)))
-return false;
-return EntityManagementUtils.canPromoteWrappedApplication(app);
+private boolean allowedToUnwrap(AssemblyTemplate template, EntitySpec app) {
+return 
!(Boolean.TRUE.equals(TypeCoercions.coerce(template.getCustomAttributes().get(NEVER_UNWRAP_APPS_PROPERTY),
 Boolean.class)));
 }
 
 private List 
buildTemplateServicesAsSpecs(BrooklynClassLoadingContext loader, 
AssemblyTemplate template, CampPlatform platform, Set 
encounteredRegisteredTypeIds) {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b35188c6/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
--
diff --git 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java

[16/24] incubator-brooklyn git commit: parameter-inheritance now marked with TODO, and prev behaviour largely restored

2016-01-14 Thread heneveld 
parameter-inheritance now marked with TODO, and prev behaviour largely restored


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

Branch: refs/heads/master
Commit: 7ffc21624ef6c1887f704207862381c1eb965dff
Parents: aa9a2d7
Author: Alex Heneveld 
Authored: Thu Jan 14 14:32:55 2016 +
Committer: Alex Heneveld 
Committed: Thu Jan 14 15:51:24 2016 +

--
 .../internal/AbstractBrooklynObjectSpec.java| 24 +++-
 .../BrooklynEntityDecorationResolver.java   |  3 +++
 .../core/mgmt/EntityManagementUtils.java| 13 ---
 3 files changed, 36 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7ffc2162/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
--
diff --git 
a/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
 
b/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
index d03eec1..560c499 100644
--- 
a/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
+++ 
b/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
@@ -38,6 +38,7 @@ import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.annotations.Beta;
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
@@ -108,8 +109,23 @@ public abstract class AbstractBrooklynObjectSpec parameters) {
+return parametersReplace(parameters);
+}
+/** adds the given parameters */
+@Beta
+public SpecT parametersAdd(List> parameters) {
 // parameters follows immutable pattern, unlike the other fields
 Builder result = 
ImmutableList.builder();
 if (this.parameters!=null)
@@ -118,6 +134,12 @@ public abstract class AbstractBrooklynObjectSpec 
parameters) {
+this.parameters = ImmutableList.copyOf( checkNotNull(parameters, 
"parameters") );
+return self();
+}
 
 /**
  * @return The type (often an interface) this spec represents and which 
will be instantiated from it 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7ffc2162/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
--
diff --git 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
index 6734875..4913cb1 100644
--- 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
+++ 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
@@ -186,6 +186,9 @@ public abstract class BrooklynEntityDecorationResolver {
 @Override

[09/24] incubator-brooklyn git commit: Adds all interfaces to proxy if deploying concrete application

2016-01-14 Thread heneveld 
Adds all interfaces to proxy if deploying concrete application


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

Branch: refs/heads/master
Commit: 13f043867d908c66f5d67c476f387a176d26d90a
Parents: d058158
Author: Martin Harris 
Authored: Thu Jan 14 11:56:49 2016 +
Committer: Martin Harris 
Committed: Thu Jan 14 11:56:49 2016 +

--
 .../org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/13f04386/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
--
diff --git 
a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
 
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
index 3b0795b..8914ca4 100644
--- 
a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
+++ 
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
@@ -55,6 +55,7 @@ import org.apache.brooklyn.util.core.flags.FlagUtils;
 import org.apache.brooklyn.util.core.task.Tasks;
 import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.apache.brooklyn.util.javalang.AggregateClassLoader;
+import org.apache.brooklyn.util.javalang.Reflections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -99,6 +100,7 @@ public class InternalEntityFactory extends InternalFactory {
 interfaces.add(spec.getType());
 } else {
 log.warn("EntitySpec declared in terms of concrete type 
"+spec.getType()+"; should be supplied in terms of interface");
+interfaces.addAll(Reflections.getAllInterfaces(spec.getType()));
 }
 interfaces.addAll(spec.getAdditionalInterfaces());

[08/24] incubator-brooklyn git commit: enable and fix test for yaml source being set correctly

2016-01-14 Thread heneveld 
enable and fix test for yaml source being set correctly

also transfer catalog item id and test for that


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

Branch: refs/heads/master
Commit: 649a08d614d8afb9404e45c17f4adaeacd6db4d1
Parents: 0781c10
Author: Alex Heneveld 
Authored: Wed Jan 13 22:58:16 2016 +
Committer: Alex Heneveld 
Committed: Wed Jan 13 22:58:16 2016 +

--
 .../BrooklynComponentTemplateResolver.java  |  3 ++-
 .../catalog/CatalogYamlTemplateTest.java| 28 +++-
 .../core/mgmt/EntityManagementUtils.java| 16 ---
 3 files changed, 30 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/649a08d6/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
--
diff --git 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index e930635..b1a4764 100644
--- 
a/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ 
b/brooklyn-server/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@ -212,8 +212,9 @@ public class BrooklynComponentTemplateResolver {
 }
 }
 
-if (source!=null)
+if (source!=null) {
 spec.tag(BrooklynTags.newYamlSpecTag(source));
+}
 
 if (!Strings.isBlank(name))
 spec.displayName(name);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/649a08d6/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
--
diff --git 
a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
 
b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
index 06ac681..165fd49 100644
--- 
a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
+++ 
b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
@@ -192,18 +192,22 @@ public class CatalogYamlTemplateTest extends 
AbstractYamlTest {
 assertTrue(t1 instanceof TestEntity);
 }
 
-// XXX this should be made to work!
-//@Test
-//public void testPlanYamlTagOnSpecFromItem() throws Exception {
-//makeItem();
-//EntitySpec spec = 
EntityManagementUtils.createEntitySpecForApplication(mgmt(), 
-//"services: [ { type: t1 } ]\n" +
-//"location: localhost");
-//List yamls = 
BrooklynTags.findAll(BrooklynTags.YAML_SPEC_KIND, spec.getTags());
-//Assert.assertEquals(yamls.size(), 1, "Expected 1 yaml tag; instead 
had: "+yamls);
-//String yaml = Iterables.getOnlyElement(yamls).getContents();
-//Asserts.assertStringContains(yaml, "services:", "t1", "localhost");
-//}
+@Test
+public void testMetadataOnSpecCreatedFromItem() throws Exception {
+makeItem();
+EntitySpec spec = 
EntityManagementUtils.createEntitySpecForApplication(mgmt(), 
+"services: [ { type: t1 } ]\n" +
+"location: localhost");
+
+List yamls = 
BrooklynTags.findAll(BrooklynTags.YAML_SPEC_KIND, spec.getTags());
+Assert.assertEquals(yamls.size(), 1, "Expected 1 yaml tag; instead 
had: "+yamls);
+String yaml = Iterables.getOnlyElement(yamls).getContents();
+Asserts.assertStringContains(yaml, "services:", "t1", "localhost");
+
+EntitySpec child = Iterables.getOnlyElement( spec.getChildren() );
+Assert.assertEquals(child.getType().getName(), SIMPLE_ENTITY_TYPE);
+Assert.assertEquals(child.getCatalogItemId(), "t1:"+TEST_VERSION);
+}
 
 private RegisteredType makeItem() {
 
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), 
OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);

[21/24] incubator-brooklyn git commit: This closes #1143

2016-01-14 Thread heneveld 
This closes #1143


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

Branch: refs/heads/master
Commit: d376516c3048b244a0d1bc294e16b89ea9e2e79c
Parents: ed289ec 50b3c22
Author: Alex Heneveld 
Authored: Thu Jan 14 23:45:42 2016 +
Committer: Alex Heneveld 
Committed: Thu Jan 14 23:45:42 2016 +

--
 brooklyn-docs/guide/misc/release-notes.md   |  12 +-
 .../apache/brooklyn/api/entity/EntitySpec.java  |   7 +
 .../internal/AbstractBrooklynObjectSpec.java|  31 +++-
 .../brooklyn/camp/spi/AbstractResource.java |   3 +-
 .../brooklyn/camp/spi/pdp/DeploymentPlan.java   |  10 +-
 .../interpret/PlanInterpretationContext.java|   4 +-
 .../interpret/PlanInterpretationNode.java   |  16 +-
 .../BrooklynAssemblyTemplateInstantiator.java   |  12 +-
 .../BrooklynComponentTemplateResolver.java  |  23 ++-
 .../BrooklynEntityDecorationResolver.java   |   3 +
 .../brooklyn/spi/creation/CampResolver.java |  14 +-
 .../camp/brooklyn/AbstractYamlTest.java |   6 +-
 .../camp/brooklyn/EntitiesYamlTest.java |  54 +--
 .../camp/brooklyn/LocationsYamlTest.java|  43 +++---
 .../catalog/CatalogYamlLocationTest.java|   3 +-
 .../catalog/CatalogYamlTemplateTest.java| 146 +++
 .../resources/test-entity-basic-template.yaml   |   2 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |   6 +-
 .../core/entity/AbstractApplication.java|   5 +-
 .../apache/brooklyn/core/entity/Entities.java   |  10 ++
 .../apache/brooklyn/core/mgmt/BrooklynTags.java |  14 +-
 .../core/mgmt/EntityManagementUtils.java| 141 +++---
 .../core/mgmt/internal/EffectorUtils.java   |   3 +
 .../rest/resources/CatalogResource.java |   7 +-
 .../rest/util/DefaultExceptionMapper.java   |   5 +-
 .../main/resources/brooklyn/default.catalog.bom |   4 +
 .../brooklyn/util/exceptions/Exceptions.java|  19 ++-
 27 files changed, 464 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d376516c/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTags.java
--
diff --cc 
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTags.java
index a08eb56,ffed4f8..0ddc79a
--- 
a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTags.java
+++ 
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTags.java
@@@ -19,9 -19,9 +19,10 @@@
  package org.apache.brooklyn.core.mgmt;
  
  import java.io.Serializable;
 +import java.util.ArrayList;
  import java.util.List;
  
+ import org.apache.brooklyn.util.collections.MutableList;
  import org.codehaus.jackson.annotate.JsonIgnore;
  import org.codehaus.jackson.annotate.JsonProperty;

[2/3] incubator-brooklyn git commit: Test catalog item tags serialization

2016-01-14 Thread aledsage 
Test catalog item tags serialization


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

Branch: refs/heads/master
Commit: 9c64872fa2e204c8091cf1d7fefa90403747595c
Parents: f9591d9
Author: Svetoslav Neykov 
Authored: Thu Jan 14 17:17:25 2016 +0200
Committer: Svetoslav Neykov 
Committed: Thu Jan 14 17:17:25 2016 +0200

--
 .../apache/brooklyn/core/catalog/internal/CatalogDtoTest.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9c64872f/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoTest.java
--
diff --git 
a/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoTest.java
 
b/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoTest.java
index dc3662c..228c922 100644
--- 
a/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoTest.java
+++ 
b/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogDtoTest.java
@@ -39,12 +39,14 @@ import 
org.apache.brooklyn.core.catalog.internal.CatalogUtils;
 import org.apache.brooklyn.core.catalog.internal.CatalogXmlSerializer;
 import 
org.apache.brooklyn.core.catalog.internal.CatalogClasspathDo.CatalogScanningModes;
 import org.apache.brooklyn.core.entity.Entities;
+import org.apache.brooklyn.core.mgmt.BrooklynTags;
 import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
 import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
 import org.apache.brooklyn.core.test.entity.TestApplication;
 import org.apache.brooklyn.core.test.entity.TestEntity;
 import org.apache.brooklyn.util.core.BrooklynMavenArtifacts;
 import org.apache.brooklyn.util.maven.MavenRetriever;
+import org.apache.commons.lang3.ClassUtils;
 
 import com.google.common.collect.ImmutableList;
 
@@ -111,6 +113,9 @@ public class CatalogDtoTest {
 
testEntitiesJavaCatalog.addEntry(CatalogItemBuilder.newTemplate(TestApplication.class.getCanonicalName(),
 BasicBrooklynCatalog.NO_VERSION)
 .displayName("Test App from JAR")
 .javaType(TestApplication.class.getCanonicalName())
+.tag(BrooklynTags.newNotesTag("Some notes for catalog 
testing"))
+.tag(BrooklynTags.newYamlSpecTag("This is the spec for a test 
catalog item"))
+
.tag(BrooklynTags.newTraitsTag(ClassUtils.getAllInterfaces(TestApplication.class)))
 .build());
 
testEntitiesJavaCatalog.addEntry(CatalogItemBuilder.newEntity(TestEntity.class.getCanonicalName(),
 BasicBrooklynCatalog.NO_VERSION)
 .displayName("Test Entity from JAR")