You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/07/05 08:17:46 UTC
[4/4] brooklyn-server git commit: This closes #218
This closes #218
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/79092da6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/79092da6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/79092da6
Branch: refs/heads/master
Commit: 79092da6af302df09448efb79ffcbe6eadc5a5a2
Parents: a58ba05 89ef9d5
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jul 5 09:17:24 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jul 5 09:17:24 2016 +0100
----------------------------------------------------------------------
.../spi/dsl/methods/BrooklynDslCommon.java | 3 +
.../brooklyn/spi/dsl/methods/DslComponent.java | 31 +++-
.../camp/brooklyn/ByonLocationsYamlTest.java | 2 +-
.../brooklyn/ConfigInheritanceYamlTest.java | 2 +-
.../brooklyn/EmptySoftwareProcessYamlTest.java | 2 +-
.../brooklyn/EmptyWindowsProcessYamlTest.java | 2 +-
.../camp/brooklyn/EntitiesYamlTest.java | 12 +-
.../camp/brooklyn/EntityNameYamlTest.java | 2 +-
.../camp/brooklyn/EntityRefsYamlTest.java | 186 +++++++++++++++++++
.../catalog/CatalogYamlEntityNameTest.java | 18 +-
.../CreatePasswordSensorIntegrationTest.java | 2 +-
.../resources/test-referencing-entities.yaml | 2 +-
.../apache/brooklyn/core/entity/Entities.java | 162 ++++++++++++----
.../brooklyn/core/entity/EntitiesTest.java | 46 ++++-
.../core/mgmt/rebind/RebindEnricherTest.java | 2 +-
.../core/mgmt/rebind/RebindEntityTest.java | 2 +-
.../entity/group/DynamicClusterTest.java | 10 +-
.../blueprints/AbstractBlueprintTest.java | 2 +-
.../Windows7zipBlueprintLiveTest.java | 2 +-
.../rest/resources/EntityConfigResource.java | 4 +-
20 files changed, 410 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79092da6/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79092da6/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
----------------------------------------------------------------------
diff --cc camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
index 19ea766,8e5ed36..cfb343f
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
@@@ -46,9 -45,10 +47,11 @@@ import com.google.common.base.Converter
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
+ import com.google.common.base.Predicate;
+ import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.google.common.util.concurrent.Callables;
public class DslComponent extends BrooklynDslDeferredSupplier<Entity> {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79092da6/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79092da6/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79092da6/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityNameTest.java
----------------------------------------------------------------------