This closes #848
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/162b1d46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/162b1d46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/162b1d46 Branch: refs/heads/master Commit: 162b1d46a8718b7470f2abf5128b0585d0fc3c8b Parents: 1811c4b 3d91a43 Author: Alex Heneveld <[email protected]> Authored: Wed Aug 19 12:14:57 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Aug 19 12:14:57 2015 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/api/entity/Application.java | 4 ++-- .../java/org/apache/brooklyn/api/entity/Entity.java | 8 ++++---- .../apache/brooklyn/core/config/BasicConfigKey.java | 2 +- .../core/catalog/internal/CatalogVersioningTest.java | 2 +- .../entity/core/ConfigEntityInheritanceTest.java | 2 -- docs/_extra/big_examples/global-web-fabric/index.md | 6 +++--- docs/guide/ops/locations/index.md | 2 +- docs/guide/yaml/clusters.md | 2 +- docs/guide/yaml/example_yaml/cluster-vm.yaml | 2 +- docs/guide/yaml/example_yaml/simple-vm.yaml | 2 +- .../test-app-with-enrichers-slightly-simpler.yaml | 4 ++-- .../yaml/example_yaml/vanilla-bash-netcat-file.yaml | 2 +- .../example_yaml/vanilla-bash-netcat-restarter.yaml | 2 +- .../example_yaml/vanilla-bash-netcat-w-client.yaml | 4 ++-- docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml | 2 +- docs/guide/yaml/winrm/index.md | 4 ++-- ...louds-location-test-various-login-credentials.yaml | 12 ++++++------ parent/pom.xml | 2 +- .../brooklyn/entity/database/derby/DerbyDatabase.java | 6 +++--- .../brooklyn/entity/database/derby/DerbySchema.java | 2 +- .../database/postgresql/PostgreSqlNodeSaltImpl.java | 8 ++++---- .../org/apache/brooklyn/entity/salt/SaltConfig.java | 2 +- .../org/apache/brooklyn/entity/salt/SaltConfigs.java | 2 +- .../entity/salt/SaltLifecycleEffectorTasks.java | 4 ++-- .../apache/brooklyn/entity/salt/SaltStackMaster.java | 6 +++--- .../brooklyn/entity/salt/SaltStackMasterDriver.java | 2 +- .../brooklyn/entity/salt/SaltStackMasterImpl.java | 2 +- .../entity/salt/SaltStackMasterSshDriver.java | 2 +- .../org/apache/brooklyn/entity/salt/SaltTasks.java | 2 +- .../database/postgresql/PostgreSqlSaltLiveTest.java | 2 +- .../apache/brooklyn/entity/salt/SaltConfigsTest.java | 4 ++-- .../entity/nosql/hazelcast/HazelcastCluster.java | 2 +- .../entity/nosql/hazelcast/HazelcastClusterImpl.java | 4 ++-- .../entity/nosql/hazelcast/HazelcastNode.java | 4 ++-- .../entity/nosql/hazelcast/HazelcastNodeDriver.java | 2 +- .../entity/nosql/hazelcast/HazelcastNodeImpl.java | 4 ++-- .../nosql/hazelcast/HazelcastNodeSshDriver.java | 2 +- .../entity/nosql/infinispan/Infinispan5Server.java | 6 +++--- .../nosql/hazelcast/HazelcastClusterEc2LiveTest.java | 2 +- .../hazelcast/HazelcastClusterSoftlayerLiveTest.java | 2 +- .../Infinispan5ServerIntegrationTest.groovy | 2 +- .../software/base/AbstractSoftwareProcessDriver.java | 2 +- .../software/base/DoNothingSoftwareProcess.java | 1 - ...illaSoftwareProcessAndChildrenIntegrationTest.java | 2 +- .../brooklyn/entity/nosql/couchbase/pillowfight.yaml | 2 +- .../brooklyn/entity/webapp/WebAppServiceMetrics.java | 4 ++-- .../brooklyn/camp/brooklyn/ByonLocationsYamlTest.java | 12 ++++++------ .../brooklyn/camp/brooklyn/ReferencedYamlTest.java | 6 +++--- .../catalog/CatalogOsgiVersionMoreEntityTest.java | 2 +- .../camp/brooklyn/catalog/CatalogXmlVersionTest.java | 6 +++--- .../camp/brooklyn/catalog/CatalogYamlAppTest.java | 14 +++++++------- .../camp/brooklyn/catalog/CatalogYamlEntityTest.java | 4 ++-- .../brooklyn/catalog/CatalogYamlLocationTest.java | 2 +- .../camp/brooklyn/catalog/CatalogYamlPolicyTest.java | 4 ++-- .../brooklyn/catalog/CatalogYamlVersioningTest.java | 2 +- usage/camp/src/test/resources/simple-catalog.xml | 10 +++++----- .../src/test/resources/test-app-with-enricher.yaml | 2 +- .../camp/src/test/resources/test-app-with-policy.yaml | 2 +- .../resources/test-entity-reference-map-template.yaml | 4 ++-- .../src/test/resources/test-entity-with-enricher.yaml | 2 +- .../src/test/resources/test-entity-with-policy.yaml | 2 +- .../test/resources/vanilla-bash-netcat-w-client.yaml | 4 ++-- usage/camp/src/test/resources/yaml-ref-app.yaml | 2 +- usage/camp/src/test/resources/yaml-ref-entity.yaml | 2 +- .../src/main/resources/brooklyn/default.catalog.bom | 3 ++- .../basic-empty-app-and-entity-blueprint.yaml | 4 ++-- .../src/test/resources/basic-empy-app-blueprint.yaml | 2 +- usage/launcher/src/test/resources/mongo-sharded.yaml | 2 +- usage/launcher/src/test/resources/mssql-test.yaml | 2 +- .../test/resources/vanilla-software-blueprint.yaml | 2 +- .../vanilla-software-with-child-blueprint.yaml | 4 ++-- .../brooklyn/rest/resources/EntityResourceTest.java | 2 +- .../brooklyn/rest/resources/ServerResourceTest.java | 2 +- .../brooklyn/rest/resources/ServerShutdownTest.java | 2 +- 74 files changed, 127 insertions(+), 129 deletions(-) ----------------------------------------------------------------------
