You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 19:01:30 UTC
[32/50] [abbrv] brooklyn-client git commit: update submodule to point
to most recent, and updated whitelist files
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/4985a098/all-files-ever.gen.txt
----------------------------------------------------------------------
diff --git a/all-files-ever.gen.txt b/all-files-ever.gen.txt
index 80d0cc2..d7239f2 100644
--- a/all-files-ever.gen.txt
+++ b/all-files-ever.gen.txt
@@ -479,10 +479,14 @@ brooklyn-dist/dist/licensing/licenses/binary/jtidy
brooklyn-dist/dist/licensing/licenses/binary/jython
brooklyn-dist/dist/licensing/licenses/binary/metastuff-bsd-style
brooklyn-dist/dist/licensing/licenses/binary/xpp3_indiana_university
+brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-2-Clause
+brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-3-Clause
+brooklyn-dist/dist/licensing/licenses/brooklyn-ui/MIT
brooklyn-dist/dist/licensing/licenses/cli/MIT
brooklyn-dist/dist/licensing/licenses/jsgui/BSD-2-Clause
brooklyn-dist/dist/licensing/licenses/jsgui/BSD-3-Clause
brooklyn-dist/dist/licensing/licenses/jsgui/MIT
+brooklyn-dist/dist/licensing/licenses/server-cli/MIT
brooklyn-dist/dist/licensing/licenses/source/BSD-2-Clause
brooklyn-dist/dist/licensing/licenses/source/BSD-3-Clause
brooklyn-dist/dist/licensing/licenses/source/MIT
@@ -492,6 +496,7 @@ brooklyn-dist/dist/licensing/overrides.yaml
brooklyn-dist/dist/licensing/projects-with-custom-licenses
brooklyn-dist/dist/pom.xml
brooklyn-dist/dist/src/main/config/build-distribution.xml
+brooklyn-dist/dist/src/main/dist/README.md
brooklyn-dist/dist/src/main/dist/bin/.gitattributes
brooklyn-dist/dist/src/main/dist/bin/brooklyn
brooklyn-dist/dist/src/main/dist/bin/brooklyn.bat
@@ -504,6 +509,7 @@ brooklyn-dist/dist/src/main/license/files/NOTICE
brooklyn-dist/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java
brooklyn-dist/dist/src/test/java/org/apache/brooklyn/cli/CliIntegrationTest.java
brooklyn-dist/downstream-parent/pom.xml
+brooklyn-dist/pom.xml
brooklyn-dist/release/.gitignore
brooklyn-dist/release/README.md
brooklyn-dist/release/Vagrantfile
@@ -658,6 +664,9 @@ brooklyn-docs/guide/ops/catalog/images/add-to-catalog.png
brooklyn-docs/guide/ops/catalog/index.md
brooklyn-docs/guide/ops/catalog/mysql-in-catalog-w700.png
brooklyn-docs/guide/ops/catalog/mysql-in-catalog.png
+brooklyn-docs/guide/ops/cli/cli-ref-guide.md
+brooklyn-docs/guide/ops/cli/cli-usage-guide.md
+brooklyn-docs/guide/ops/cli/index.md
brooklyn-docs/guide/ops/externalized-configuration.md
brooklyn-docs/guide/ops/gui/_my-web-cluster.yaml
brooklyn-docs/guide/ops/gui/_my-web-cluster2.yaml
@@ -779,6 +788,8 @@ brooklyn-docs/guide/yaml/example_yaml/brooklyn-elk-catalog.bom
brooklyn-docs/guide/yaml/example_yaml/brooklyn-kibana-catalog.bom
brooklyn-docs/guide/yaml/example_yaml/brooklyn-logstash-catalog.bom
brooklyn-docs/guide/yaml/example_yaml/cluster-vm.yaml
+brooklyn-docs/guide/yaml/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
+brooklyn-docs/guide/yaml/example_yaml/entities/loopovergroupmembers-entity.yaml
brooklyn-docs/guide/yaml/example_yaml/simple-appserver-with-location-byon.yaml
brooklyn-docs/guide/yaml/example_yaml/simple-appserver-with-location.yaml
brooklyn-docs/guide/yaml/example_yaml/simple-appserver.yaml
@@ -791,6 +802,8 @@ brooklyn-docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml
brooklyn-docs/guide/yaml/index.md
brooklyn-docs/guide/yaml/multiple-services.md
brooklyn-docs/guide/yaml/setting-locations.md
+brooklyn-docs/guide/yaml/test/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
+brooklyn-docs/guide/yaml/test/example_yaml/entities/loopovergroupmembers-entity.yaml
brooklyn-docs/guide/yaml/test/example_yaml/entities/paralleltestcase-entity.yaml
brooklyn-docs/guide/yaml/test/example_yaml/entities/script1.sh
brooklyn-docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
@@ -1070,6 +1083,7 @@ brooklyn-library/examples/webapps/hello-world-webapp/src/main/webapp/index.html
brooklyn-library/examples/webapps/hello-world-webapp/src/main/webapp/primes.jsp
brooklyn-library/examples/webapps/hello-world-webapp/src/main/webapp/styles/main.css
brooklyn-library/examples/webapps/pom.xml
+brooklyn-library/pom.xml
brooklyn-library/qa/log-exclusions.txt
brooklyn-library/qa/pom.xml
brooklyn-library/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java
@@ -1084,10 +1098,27 @@ brooklyn-library/qa/src/main/java/org/apache/brooklyn/qa/longevity/StatusRecorde
brooklyn-library/qa/src/main/resources/hello-world.txt
brooklyn-library/qa/src/main/resources/hello-world.war
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/camp/EnrichersSlightlySimplerYamlTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/camp/EntitiesYamlIntegrationTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsIntegrationTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsMatchingTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/downstreamparent/DownstreamParentTest.java
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/longevity/MonitorUtilsTest.java
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java
+brooklyn-library/qa/src/test/projects/downstream-parent-test/README
+brooklyn-library/qa/src/test/projects/downstream-parent-test/pom.xml
+brooklyn-library/qa/src/test/projects/downstream-parent-test/src/main/java/com/example/HelloEntity.java
+brooklyn-library/qa/src/test/projects/downstream-parent-test/src/main/java/com/example/HelloEntityImpl.java
+brooklyn-library/qa/src/test/projects/downstream-parent-test/src/main/resources/blueprint.yaml
+brooklyn-library/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom
+brooklyn-library/qa/src/test/resources/java-web-app-and-db-with-function.yaml
+brooklyn-library/qa/src/test/resources/java-web-app-and-db-with-policy.yaml
+brooklyn-library/qa/src/test/resources/java-web-app-simple.yaml
+brooklyn-library/qa/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
+brooklyn-library/qa/src/test/resources/test-tomcat-cluster.yaml
+brooklyn-library/qa/src/test/resources/test-webapp-with-averaging-enricher.yaml
brooklyn-library/qa/start-monitor.sh
brooklyn-library/qa/start-webcluster.sh
brooklyn-library/sandbox/cassandra-multicloud-snitch/pom.xml
@@ -1688,6 +1719,7 @@ brooklyn-library/software/webapp/src/main/resources/org/apache/brooklyn/entity/w
brooklyn-library/software/webapp/src/main/resources/org/apache/brooklyn/entity/webapp/tomcat/web.xml
brooklyn-library/software/webapp/src/main/resources/tomcat-logo.png
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoDnsServiceYamlTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java
@@ -1743,15 +1775,26 @@ brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerRestartIntegrationTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EnrichersSlightlySimplerYamlTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EntitiesYamlIntegrationTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsIntegrationTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsMatchingTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntityImpl.java
+brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-function.yaml
+brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-policy.yaml
+brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml
brooklyn-library/software/webapp/src/test/resources/org/apache/brooklyn/entity/dns/geoscaling/expectedScript.php
+brooklyn-library/software/webapp/src/test/resources/org/apache/brooklyn/entity/dns/geoscaling/geodns.yaml
brooklyn-library/software/webapp/src/test/resources/org/apache/brooklyn/entity/webapp/nodejs/nodejs-hello-world.yaml
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/info.txt
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/server.crt
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/server.csr
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/server.key
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/server.key.org
+brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
+brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml
+brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml
brooklyn-server/.gitattributes
brooklyn-server/.gitignore
brooklyn-server/LICENSE
@@ -1967,12 +2010,15 @@ brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brookl
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ApplicationsYamlTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java
+brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DependentConfigPollingYamlTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptySoftwareProcessYamlTest.java
+brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EmptyWindowsProcessYamlTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersSlightlySimplerYamlTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlIntegrationTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
+brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigBrooklynPropertiesTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigYamlTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java
@@ -1985,6 +2031,7 @@ brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brookl
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencingYamlTestEntity.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencingYamlTestEntityImpl.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReloadBrooklynPropertiesTest.java
+brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/SimpleTestPojo.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfig.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java
brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingEnricher.java
@@ -2239,6 +2286,7 @@ brooklyn-server/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/internal/ApiObjectsFactoryImpl.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java
+brooklyn-server/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/internal/storage/BrooklynStorage.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/internal/storage/DataGrid.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/internal/storage/DataGridFactory.java
@@ -2336,7 +2384,9 @@ brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/Brookl
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynObjectManagementMode.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynObjectManagerInternal.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynShutdownHooks.java
+brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/CampYamlParser.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/CollectionChangeListener.java
+brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/DeferredBrooklynProperties.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EffectorUtils.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityChangeListener.java
brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java
@@ -2944,6 +2994,7 @@ brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/http/HttpValueFuncti
brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/http/JsonFunctionsTest.java
brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/shell/ShellFeedIntegrationTest.java
brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedIntegrationTest.java
+brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java
brooklyn-server/core/src/test/java/org/apache/brooklyn/feed/ssh/SshValueFunctionsTest.java
brooklyn-server/core/src/test/java/org/apache/brooklyn/location/byon/ByonLocationResolverTest.java
brooklyn-server/core/src/test/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocationRebindTest.java
@@ -3090,6 +3141,8 @@ brooklyn-server/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/A
brooklyn-server/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/CouchbaseBlueprintTest.java
brooklyn-server/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/MongoDbBlueprintTest.java
brooklyn-server/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
+brooklyn-server/launcher/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java
+brooklyn-server/launcher/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java
brooklyn-server/launcher/src/test/resources/7zip-catalog.yaml
brooklyn-server/launcher/src/test/resources/basic-empty-app-and-entity-blueprint.yaml
brooklyn-server/launcher/src/test/resources/basic-empy-app-blueprint.yaml
@@ -3303,6 +3356,7 @@ brooklyn-server/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/Mo
brooklyn-server/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
brooklyn-server/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntity.java
brooklyn-server/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
+brooklyn-server/pom.xml
brooklyn-server/rest/rest-api/pom.xml
brooklyn-server/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/AccessApi.java
brooklyn-server/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java
@@ -3509,10 +3563,13 @@ brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/Bro
brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/EntityLocationUtilsTest.java
brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/HaHotStateCheckClassResource.java
brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/HaHotStateCheckResource.java
+brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/NoOpRecordingShutdownHandler.java
brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/NullHttpServletRequestProvider.java
brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/NullServletConfigProvider.java
+brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/TestShutdownHandler.java
brooklyn-server/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java
+brooklyn-server/rest/rest-server/src/test/resources/brooklyn-test-logo.jpg
brooklyn-server/rest/rest-server/src/test/resources/brooklyn/scanning.catalog.bom
brooklyn-server/server-cli/README.md
brooklyn-server/server-cli/pom.xml
@@ -3614,6 +3671,11 @@ brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/
brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptySoftwareProcessDriver.java
brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptySoftwareProcessImpl.java
brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptySoftwareProcessSshDriver.java
+brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptyWindowsProcess.java
+brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptyWindowsProcessDriver.java
+brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptyWindowsProcessImpl.java
+brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptyWindowsProcessWinRmDriver.java
+brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/InboundPortsUtils.java
brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerDriverLifecycleEffectorTasks.java
brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntity.java
brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
@@ -3700,6 +3762,7 @@ brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/DoNothingSoftwareProcessImpl.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/DoNothingWinRmSoftwareProcessDriver.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/EntitySshToolTest.java
+brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SameServerDriverLifecycleEffectorTasksTest.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SameServerEntityTest.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareEffectorTest.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityLatchTest.java
@@ -3722,6 +3785,7 @@ brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperUnitTest.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelperUnitTest.java
+brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/autoscaling/AutoScalerPolicyNoMoreMachinesTest.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/core/mgmt/usage/ApplicationUsageTrackingTest.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/core/mgmt/usage/LocationUsageTrackingTest.java
brooklyn-server/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/core/mgmt/usage/RecordingUsageListener.java
@@ -3758,6 +3822,7 @@ brooklyn-server/software/winrm/src/main/java/org/apache/brooklyn/util/core/inter
brooklyn-server/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/WinRmTool.java
brooklyn-server/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/WinRmToolResponse.java
brooklyn-server/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/pywinrm/Winrm4jTool.java
+brooklyn-server/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/winrm4j/Winrm4jTool.java
brooklyn-server/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedLiveTest.java
brooklyn-server/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedTest.java
brooklyn-server/software/winrm/src/test/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicyTest.java
@@ -3774,10 +3839,14 @@ brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java
+brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCase.java
+brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleShellCommandTest.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleShellCommandTestImpl.java
+brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponent.java
+brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponentImpl.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCaseImpl.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java
@@ -3787,6 +3856,8 @@ brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java
brooklyn-server/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java
+brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java
+brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseTest.java
brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/SimpleShellCommandIntegrationTest.java
brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java
brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java
@@ -3794,6 +3865,8 @@ brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/
brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java
brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java
brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java
+brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructure.java
+brooklyn-server/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructureImpl.java
brooklyn-server/test-framework/src/test/resources/test-framework-examples/README.md
brooklyn-server/test-framework/src/test/resources/test-framework-examples/example-catalog-test.bom
brooklyn-server/test-framework/src/test/resources/test-framework-examples/example-catalog.bom
@@ -3928,6 +4001,7 @@ brooklyn-server/utils/common/src/main/java/org/apache/brooklyn/util/text/StringF
brooklyn-server/utils/common/src/main/java/org/apache/brooklyn/util/text/StringPredicates.java
brooklyn-server/utils/common/src/main/java/org/apache/brooklyn/util/text/StringShortener.java
brooklyn-server/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java
+brooklyn-server/utils/common/src/main/java/org/apache/brooklyn/util/text/VersionComparator.java
brooklyn-server/utils/common/src/main/java/org/apache/brooklyn/util/text/WildcardGlobs.java
brooklyn-server/utils/common/src/main/java/org/apache/brooklyn/util/time/CountdownTimer.java
brooklyn-server/utils/common/src/main/java/org/apache/brooklyn/util/time/Duration.java
@@ -3986,6 +4060,7 @@ brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/text/StringF
brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/text/StringPredicatesTest.java
brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/text/StringShortenerTest.java
brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/text/StringsTest.java
+brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/text/VersionComparatorTest.java
brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/text/WildcardGlobsTest.java
brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/time/CountdownTimerTest.java
brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/time/DurationTest.java
@@ -4364,6 +4439,7 @@ brooklyn/.gitignore
brooklyn/LICENSE
brooklyn/NOTICE
brooklyn/README.md
+brooklyn/pom.xml
buildAndRun
buildAndTest
camp/README.md
@@ -5659,6 +5735,7 @@ core/src/main/java/org/apache/brooklyn/core/internal/ApiObjectsFactoryImpl.java
core/src/main/java/org/apache/brooklyn/core/internal/BrooklynFeatureEnablement.java
core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java
+core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
core/src/main/java/org/apache/brooklyn/core/internal/storage/BrooklynStorage.java
core/src/main/java/org/apache/brooklyn/core/internal/storage/DataGrid.java
core/src/main/java/org/apache/brooklyn/core/internal/storage/DataGridFactory.java
@@ -5814,7 +5891,9 @@ core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynGarbageCollect
core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynObjectManagementMode.java
core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynObjectManagerInternal.java
core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynShutdownHooks.java
+core/src/main/java/org/apache/brooklyn/core/mgmt/internal/CampYamlParser.java
core/src/main/java/org/apache/brooklyn/core/mgmt/internal/CollectionChangeListener.java
+core/src/main/java/org/apache/brooklyn/core/mgmt/internal/DeferredBrooklynProperties.java
core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EffectorUtils.java
core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityChangeListener.java
core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EntityManagementSupport.java
@@ -7119,6 +7198,7 @@ core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTypeConfigTest.j
core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
core/src/test/java/org/apache/brooklyn/core/entity/EntityAssertsTest.java
core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
+core/src/test/java/org/apache/brooklyn/core/entity/EntityConcurrencyTest.java
core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java
core/src/test/java/org/apache/brooklyn/core/entity/EntityFunctionsTest.java
core/src/test/java/org/apache/brooklyn/core/entity/EntityLocationsTest.java
@@ -7358,6 +7438,7 @@ core/src/test/java/org/apache/brooklyn/core/test/qa/performance/GroovyYardStickP
core/src/test/java/org/apache/brooklyn/core/test/qa/performance/JavaYardStickPerformanceTest.java
core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java
core/src/test/java/org/apache/brooklyn/core/test/qa/performance/TaskPerformanceTest.java
+core/src/test/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistryTest.java
core/src/test/java/org/apache/brooklyn/core/typereg/ExampleXmlTypePlanTransformer.java
core/src/test/java/org/apache/brooklyn/core/typereg/ExampleXmlTypePlanTransformerTest.java
core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java
@@ -8040,6 +8121,9 @@ docs/guide/ops/catalog/mysql-in-catalog-w700.png
docs/guide/ops/catalog/mysql-in-catalog.png
docs/guide/ops/cli-reference.md
docs/guide/ops/cli.md
+docs/guide/ops/cli/cli-ref-guide.md
+docs/guide/ops/cli/cli-usage-guide.md
+docs/guide/ops/cli/index.md
docs/guide/ops/externalized-configuration.md
docs/guide/ops/gui/_my-web-cluster.yaml
docs/guide/ops/gui/_my-web-cluster2.yaml
@@ -8124,6 +8208,7 @@ docs/guide/ops/webconsole/webconsole-detail-w400.png
docs/guide/ops/webconsole/webconsole-detail.png
docs/guide/start/_my-web-cluster.yaml
docs/guide/start/_my-web-cluster2.yaml
+docs/guide/start/blueprints-cli.md
docs/guide/start/blueprints.md
docs/guide/start/brooklyn.properties
docs/guide/start/catalog.md
@@ -8158,10 +8243,13 @@ docs/guide/start/images/my-web-summary.png
docs/guide/start/images/my-web-validating-app-endpoint-large.png
docs/guide/start/images/my-web-validating-app-endpoint.png
docs/guide/start/images/my-web.png
+docs/guide/start/index-cli.md
docs/guide/start/index.include.md
docs/guide/start/index.md
docs/guide/start/known-issues.md
+docs/guide/start/managing-cli.md
docs/guide/start/managing.md
+docs/guide/start/policies-cli.md
docs/guide/start/policies.md
docs/guide/start/quickstart/brooklyn.properties
docs/guide/start/quickstart/catalog.xml
@@ -8387,6 +8475,8 @@ docs/guide/yaml/p2.md
docs/guide/yaml/p2p1.md
docs/guide/yaml/p2p1p1.md
docs/guide/yaml/setting-locations.md
+docs/guide/yaml/test/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
+docs/guide/yaml/test/example_yaml/entities/loopovergroupmembers-entity.yaml
docs/guide/yaml/test/example_yaml/entities/paralleltestcase-entity.yaml
docs/guide/yaml/test/example_yaml/entities/script1.sh
docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
@@ -9897,6 +9987,12 @@ locations/jclouds/src/test/java/org/apache/brooklyn/policy/jclouds/os/CreateUser
locations/jclouds/src/test/resources/brooklyn/location/jclouds/jclouds-location-test-various-login-credentials.yaml
locations/jclouds/src/test/resources/brooklyn/location/jclouds/various-login-credentials.yaml
locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/jclouds-location-test-various-login-credentials.yaml
+locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-aws-machine-aKEcbxKN
+locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-aws-parent-lCYB3mTb
+locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-aws-winrm-machine-KYSryzW8
+locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-aws-winrm-parent-fKc0Ofyn
+locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-azure-machine-VNapYjwp
+locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-azure-parent-briByOel
mgmt/.gitignore
mgmt/pom.xml
mgmt/src/main/java/brooklyn/mgmt/federated/BrooklynManagementNode.groovy
@@ -12869,6 +12965,12 @@ software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/Elas
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBAuthenticationMixins.java
@@ -12962,6 +13064,7 @@ software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cas
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.uri
+software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/hazelcast/hazelcast-brooklyn.xml
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/default-mongod.conf
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/default.conf
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/mongodb_win.yaml
@@ -13082,6 +13185,11 @@ software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNod
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/JcouchdbSupport.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterNodeIntegrationTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeIntegrationTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastTestHelper.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBEc2LiveTest.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBIntegrationTest.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBRebindIntegrationTest.java
@@ -13804,7 +13912,9 @@ usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersSlightlySimp
usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java
usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlIntegrationTest.java
usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
+usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigBrooklynPropertiesTest.java
usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigYamlTest.java
+usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/GeoDnsServiceYamlTest.java
usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppWithDslYamlRebindIntegrationTest.java
usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java
usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java
@@ -13878,6 +13988,7 @@ usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.bat
usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit0.ps1
usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.bat
usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/exit1.ps1
+usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/geodns.yaml
usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/test/lite/test-app-service-blueprint.yaml
usage/camp/src/test/resources/osgi-catalog.xml
usage/camp/src/test/resources/playing.yaml
@@ -14897,10 +15008,17 @@ usage/qa/src/test/java/brooklyn/qa/longevity/MonitorUtilsTest.java
usage/qa/src/test/java/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java
usage/qa/src/test/java/brooklyn/qa/longevity/webcluster/WebClusterApp.java
usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
+usage/qa/src/test/java/org/apache/brooklyn/qa/downstreamparent/DownstreamParentTest.java
usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java
usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/MonitorUtilsTest.java
usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java
usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java
+usage/qa/src/test/projects/downstream-parent-test/README
+usage/qa/src/test/projects/downstream-parent-test/pom.xml
+usage/qa/src/test/projects/downstream-parent-test/src/main/java/com/example/HelloEntity.java
+usage/qa/src/test/projects/downstream-parent-test/src/main/java/com/example/HelloEntityImpl.java
+usage/qa/src/test/projects/downstream-parent-test/src/main/resources/blueprint.yaml
+usage/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom
usage/qa/start-monitor.sh
usage/qa/start-webcluster.sh
usage/rest-api/pom.xml
@@ -15440,6 +15558,8 @@ usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/AbstractTe
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCase.java
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommand.java
@@ -15454,6 +15574,8 @@ usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleShel
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleShellCommandLifecycleEffectorTasks.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleShellCommandTest.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleShellCommandTestImpl.java
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponent.java
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponentImpl.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCaseImpl.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java
@@ -15463,6 +15585,8 @@ usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCa
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCallImpl.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java
usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensorImpl.java
+usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java
+usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseTest.java
usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/SimpleCommandImplIntegrationTest.java
usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/SimpleCommandImplTest.java
usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/SimpleCommandIntegrationTest.java
@@ -15476,6 +15600,8 @@ usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestHttpCa
usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java
usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java
usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java
+usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructure.java
+usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructureImpl.java
usage/test-framework/src/test/resources/brooklyn/logback-appender-stdout.xml
usage/test-framework/src/test/resources/test-framework-examples/README.md
usage/test-framework/src/test/resources/test-framework-examples/example-catalog-test.bom
@@ -16086,6 +16212,7 @@ utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java
utils/common/src/main/java/org/apache/brooklyn/util/text/StringPredicates.java
utils/common/src/main/java/org/apache/brooklyn/util/text/StringShortener.java
utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java
+utils/common/src/main/java/org/apache/brooklyn/util/text/VersionComparator.java
utils/common/src/main/java/org/apache/brooklyn/util/text/WildcardGlobs.java
utils/common/src/main/java/org/apache/brooklyn/util/time/CountdownTimer.java
utils/common/src/main/java/org/apache/brooklyn/util/time/Duration.java
@@ -16208,6 +16335,7 @@ utils/common/src/test/java/org/apache/brooklyn/util/text/StringFunctionsTest.jav
utils/common/src/test/java/org/apache/brooklyn/util/text/StringPredicatesTest.java
utils/common/src/test/java/org/apache/brooklyn/util/text/StringShortenerTest.java
utils/common/src/test/java/org/apache/brooklyn/util/text/StringsTest.java
+utils/common/src/test/java/org/apache/brooklyn/util/text/VersionComparatorTest.java
utils/common/src/test/java/org/apache/brooklyn/util/text/WildcardGlobsTest.java
utils/common/src/test/java/org/apache/brooklyn/util/time/CountdownTimerTest.java
utils/common/src/test/java/org/apache/brooklyn/util/time/DurationTest.java
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/4985a098/dist-whitelist.full.gen.txt
----------------------------------------------------------------------
diff --git a/dist-whitelist.full.gen.txt b/dist-whitelist.full.gen.txt
index 86ec571..0a25a37 100644
--- a/dist-whitelist.full.gen.txt
+++ b/dist-whitelist.full.gen.txt
@@ -49,10 +49,14 @@ brooklyn-dist/dist/licensing/licenses/binary/jtidy
brooklyn-dist/dist/licensing/licenses/binary/jython
brooklyn-dist/dist/licensing/licenses/binary/metastuff-bsd-style
brooklyn-dist/dist/licensing/licenses/binary/xpp3_indiana_university
+brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-2-Clause
+brooklyn-dist/dist/licensing/licenses/brooklyn-ui/BSD-3-Clause
+brooklyn-dist/dist/licensing/licenses/brooklyn-ui/MIT
brooklyn-dist/dist/licensing/licenses/cli/MIT
brooklyn-dist/dist/licensing/licenses/jsgui/BSD-2-Clause
brooklyn-dist/dist/licensing/licenses/jsgui/BSD-3-Clause
brooklyn-dist/dist/licensing/licenses/jsgui/MIT
+brooklyn-dist/dist/licensing/licenses/server-cli/MIT
brooklyn-dist/dist/licensing/licenses/source/BSD-2-Clause
brooklyn-dist/dist/licensing/licenses/source/BSD-3-Clause
brooklyn-dist/dist/licensing/licenses/source/MIT
@@ -62,6 +66,7 @@ brooklyn-dist/dist/licensing/overrides.yaml
brooklyn-dist/dist/licensing/projects-with-custom-licenses
brooklyn-dist/dist/pom.xml
brooklyn-dist/dist/src/main/config/build-distribution.xml
+brooklyn-dist/dist/src/main/dist/README.md
brooklyn-dist/dist/src/main/dist/bin/.gitattributes
brooklyn-dist/dist/src/main/dist/bin/brooklyn
brooklyn-dist/dist/src/main/dist/bin/brooklyn.bat
@@ -74,6 +79,7 @@ brooklyn-dist/dist/src/main/license/files/NOTICE
brooklyn-dist/dist/src/test/java/org/apache/brooklyn/cli/BaseCliIntegrationTest.java
brooklyn-dist/dist/src/test/java/org/apache/brooklyn/cli/CliIntegrationTest.java
brooklyn-dist/downstream-parent/pom.xml
+brooklyn-dist/pom.xml
brooklyn-dist/release/.gitignore
brooklyn-dist/release/README.md
brooklyn-dist/release/Vagrantfile
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/4985a098/docs-whitelist.full.gen.txt
----------------------------------------------------------------------
diff --git a/docs-whitelist.full.gen.txt b/docs-whitelist.full.gen.txt
index f49fc36..2a19cb5 100644
--- a/docs-whitelist.full.gen.txt
+++ b/docs-whitelist.full.gen.txt
@@ -143,6 +143,9 @@ brooklyn-docs/guide/ops/catalog/images/add-to-catalog.png
brooklyn-docs/guide/ops/catalog/index.md
brooklyn-docs/guide/ops/catalog/mysql-in-catalog-w700.png
brooklyn-docs/guide/ops/catalog/mysql-in-catalog.png
+brooklyn-docs/guide/ops/cli/cli-ref-guide.md
+brooklyn-docs/guide/ops/cli/cli-usage-guide.md
+brooklyn-docs/guide/ops/cli/index.md
brooklyn-docs/guide/ops/externalized-configuration.md
brooklyn-docs/guide/ops/gui/_my-web-cluster.yaml
brooklyn-docs/guide/ops/gui/_my-web-cluster2.yaml
@@ -264,6 +267,8 @@ brooklyn-docs/guide/yaml/example_yaml/brooklyn-elk-catalog.bom
brooklyn-docs/guide/yaml/example_yaml/brooklyn-kibana-catalog.bom
brooklyn-docs/guide/yaml/example_yaml/brooklyn-logstash-catalog.bom
brooklyn-docs/guide/yaml/example_yaml/cluster-vm.yaml
+brooklyn-docs/guide/yaml/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
+brooklyn-docs/guide/yaml/example_yaml/entities/loopovergroupmembers-entity.yaml
brooklyn-docs/guide/yaml/example_yaml/simple-appserver-with-location-byon.yaml
brooklyn-docs/guide/yaml/example_yaml/simple-appserver-with-location.yaml
brooklyn-docs/guide/yaml/example_yaml/simple-appserver.yaml
@@ -276,6 +281,8 @@ brooklyn-docs/guide/yaml/example_yaml/vanilla-bash-netcat.yaml
brooklyn-docs/guide/yaml/index.md
brooklyn-docs/guide/yaml/multiple-services.md
brooklyn-docs/guide/yaml/setting-locations.md
+brooklyn-docs/guide/yaml/test/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
+brooklyn-docs/guide/yaml/test/example_yaml/entities/loopovergroupmembers-entity.yaml
brooklyn-docs/guide/yaml/test/example_yaml/entities/paralleltestcase-entity.yaml
brooklyn-docs/guide/yaml/test/example_yaml/entities/script1.sh
brooklyn-docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
@@ -768,6 +775,9 @@ docs/guide/ops/catalog/mysql-in-catalog-w700.png
docs/guide/ops/catalog/mysql-in-catalog.png
docs/guide/ops/cli-reference.md
docs/guide/ops/cli.md
+docs/guide/ops/cli/cli-ref-guide.md
+docs/guide/ops/cli/cli-usage-guide.md
+docs/guide/ops/cli/index.md
docs/guide/ops/externalized-configuration.md
docs/guide/ops/gui/_my-web-cluster.yaml
docs/guide/ops/gui/_my-web-cluster2.yaml
@@ -852,6 +862,7 @@ docs/guide/ops/webconsole/webconsole-detail-w400.png
docs/guide/ops/webconsole/webconsole-detail.png
docs/guide/start/_my-web-cluster.yaml
docs/guide/start/_my-web-cluster2.yaml
+docs/guide/start/blueprints-cli.md
docs/guide/start/blueprints.md
docs/guide/start/brooklyn.properties
docs/guide/start/catalog.md
@@ -886,10 +897,13 @@ docs/guide/start/images/my-web-summary.png
docs/guide/start/images/my-web-validating-app-endpoint-large.png
docs/guide/start/images/my-web-validating-app-endpoint.png
docs/guide/start/images/my-web.png
+docs/guide/start/index-cli.md
docs/guide/start/index.include.md
docs/guide/start/index.md
docs/guide/start/known-issues.md
+docs/guide/start/managing-cli.md
docs/guide/start/managing.md
+docs/guide/start/policies-cli.md
docs/guide/start/policies.md
docs/guide/start/quickstart/brooklyn.properties
docs/guide/start/quickstart/catalog.xml
@@ -1115,6 +1129,8 @@ docs/guide/yaml/p2.md
docs/guide/yaml/p2p1.md
docs/guide/yaml/p2p1p1.md
docs/guide/yaml/setting-locations.md
+docs/guide/yaml/test/example_yaml/entities/infrastructuredeploymenttestcase-entity.yaml
+docs/guide/yaml/test/example_yaml/entities/loopovergroupmembers-entity.yaml
docs/guide/yaml/test/example_yaml/entities/paralleltestcase-entity.yaml
docs/guide/yaml/test/example_yaml/entities/script1.sh
docs/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/4985a098/incubator-brooklyn
----------------------------------------------------------------------
diff --git a/incubator-brooklyn b/incubator-brooklyn
index e14a16b..f472ad6 160000
--- a/incubator-brooklyn
+++ b/incubator-brooklyn
@@ -1 +1 @@
-Subproject commit e14a16b72e663a84aa8b567908c4fdf3b97b5b77
+Subproject commit f472ad68a9fb58a646d6e588bba36bfe66e255d4
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/4985a098/library-whitelist.full.gen.txt
----------------------------------------------------------------------
diff --git a/library-whitelist.full.gen.txt b/library-whitelist.full.gen.txt
index f4385eb..b0b8f65 100644
--- a/library-whitelist.full.gen.txt
+++ b/library-whitelist.full.gen.txt
@@ -99,6 +99,7 @@ brooklyn-library/examples/webapps/hello-world-webapp/src/main/webapp/index.html
brooklyn-library/examples/webapps/hello-world-webapp/src/main/webapp/primes.jsp
brooklyn-library/examples/webapps/hello-world-webapp/src/main/webapp/styles/main.css
brooklyn-library/examples/webapps/pom.xml
+brooklyn-library/pom.xml
brooklyn-library/qa/log-exclusions.txt
brooklyn-library/qa/pom.xml
brooklyn-library/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java
@@ -113,10 +114,27 @@ brooklyn-library/qa/src/main/java/org/apache/brooklyn/qa/longevity/StatusRecorde
brooklyn-library/qa/src/main/resources/hello-world.txt
brooklyn-library/qa/src/main/resources/hello-world.war
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/camp/EnrichersSlightlySimplerYamlTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/camp/EntitiesYamlIntegrationTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsIntegrationTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/camp/JavaWebAppsMatchingTest.java
+brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/downstreamparent/DownstreamParentTest.java
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/longevity/MonitorUtilsTest.java
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java
brooklyn-library/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java
+brooklyn-library/qa/src/test/projects/downstream-parent-test/README
+brooklyn-library/qa/src/test/projects/downstream-parent-test/pom.xml
+brooklyn-library/qa/src/test/projects/downstream-parent-test/src/main/java/com/example/HelloEntity.java
+brooklyn-library/qa/src/test/projects/downstream-parent-test/src/main/java/com/example/HelloEntityImpl.java
+brooklyn-library/qa/src/test/projects/downstream-parent-test/src/main/resources/blueprint.yaml
+brooklyn-library/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom
+brooklyn-library/qa/src/test/resources/java-web-app-and-db-with-function.yaml
+brooklyn-library/qa/src/test/resources/java-web-app-and-db-with-policy.yaml
+brooklyn-library/qa/src/test/resources/java-web-app-simple.yaml
+brooklyn-library/qa/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
+brooklyn-library/qa/src/test/resources/test-tomcat-cluster.yaml
+brooklyn-library/qa/src/test/resources/test-webapp-with-averaging-enricher.yaml
brooklyn-library/qa/start-monitor.sh
brooklyn-library/qa/start-webcluster.sh
brooklyn-library/sandbox/cassandra-multicloud-snitch/pom.xml
@@ -717,6 +735,7 @@ brooklyn-library/software/webapp/src/main/resources/org/apache/brooklyn/entity/w
brooklyn-library/software/webapp/src/main/resources/org/apache/brooklyn/entity/webapp/tomcat/web.xml
brooklyn-library/software/webapp/src/main/resources/tomcat-logo.png
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoDnsServiceYamlTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java
@@ -772,15 +791,34 @@ brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerRestartIntegrationTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EnrichersSlightlySimplerYamlTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/EntitiesYamlIntegrationTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsIntegrationTest.java
+brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsMatchingTest.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntity.java
brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/entity/TestJavaWebAppEntityImpl.java
+brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-function.yaml
+brooklyn-library/software/webapp/src/test/resources/java-web-app-and-db-with-policy.yaml
+brooklyn-library/software/webapp/src/test/resources/java-web-app-simple.yaml
brooklyn-library/software/webapp/src/test/resources/org/apache/brooklyn/entity/dns/geoscaling/expectedScript.php
+brooklyn-library/software/webapp/src/test/resources/org/apache/brooklyn/entity/dns/geoscaling/geodns.yaml
brooklyn-library/software/webapp/src/test/resources/org/apache/brooklyn/entity/webapp/nodejs/nodejs-hello-world.yaml
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/info.txt
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/server.crt
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/server.csr
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/server.key
brooklyn-library/software/webapp/src/test/resources/ssl/certs/localhost/server.key.org
+brooklyn-library/software/webapp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
+brooklyn-library/software/webapp/src/test/resources/test-tomcat-cluster.yaml
+brooklyn-library/software/webapp/src/test/resources/test-webapp-with-averaging-enricher.yaml
+brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersSlightlySimplerYamlTest.java
+brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlIntegrationTest.java
+brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java
+brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java
+brooklyn-server/camp/camp-brooklyn/src/test/resources/java-web-app-and-db-with-policy.yaml
+brooklyn-server/camp/camp-brooklyn/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
+brooklyn-server/camp/camp-brooklyn/src/test/resources/test-tomcat-cluster.yaml
+brooklyn-server/camp/camp-brooklyn/src/test/resources/test-webapp-with-averaging-enricher.yaml
example/.gitignore
example/brooklyn-jmeter-test-plan.jmx
example/jboss.sh
@@ -3067,6 +3105,12 @@ software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/Elas
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java
+software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBAuthenticationMixins.java
@@ -3160,6 +3204,7 @@ software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cas
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.uri
+software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/hazelcast/hazelcast-brooklyn.xml
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/default-mongod.conf
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/default.conf
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/mongodb_win.yaml
@@ -3280,6 +3325,11 @@ software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBNod
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/JcouchdbSupport.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterNodeIntegrationTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeIntegrationTest.java
+software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastTestHelper.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBEc2LiveTest.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBIntegrationTest.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBRebindIntegrationTest.java
@@ -3709,6 +3759,20 @@ usage/camp/pom.xml
usage/camp/src/main/java/io/brooklyn/camp/brooklyn/BrooklynCampPlatform.java
usage/camp/src/main/java/io/brooklyn/camp/brooklyn/PlatformComponentTemplateBrooklynLookup.java
usage/camp/src/main/resources/placeholder.txt
+usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EnrichersSlightlySimplerYamlTest.java
+usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlIntegrationTest.java
+usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java
+usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java
+usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersSlightlySimplerYamlTest.java
+usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlIntegrationTest.java
+usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/GeoDnsServiceYamlTest.java
+usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java
+usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java
+usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml
+usage/camp/src/test/resources/org/apache/brooklyn/camp/brooklyn/geodns.yaml
+usage/camp/src/test/resources/test-app-with-enrichers-slightly-simpler.yaml
+usage/camp/src/test/resources/test-tomcat-cluster.yaml
+usage/camp/src/test/resources/test-webapp-with-averaging-enricher.yaml
usage/jsgui/src/main/license/LICENSE
usage/jsgui/src/main/license/NOTICE
usage/jsgui/src/main/license/files/LICENSE
@@ -4103,10 +4167,17 @@ usage/qa/src/test/java/brooklyn/qa/longevity/MonitorUtilsTest.java
usage/qa/src/test/java/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java
usage/qa/src/test/java/brooklyn/qa/longevity/webcluster/WebClusterApp.java
usage/qa/src/test/java/org/apache/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
+usage/qa/src/test/java/org/apache/brooklyn/qa/downstreamparent/DownstreamParentTest.java
usage/qa/src/test/java/org/apache/brooklyn/qa/load/LoadTest.java
usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/MonitorUtilsTest.java
usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java
usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java
+usage/qa/src/test/projects/downstream-parent-test/README
+usage/qa/src/test/projects/downstream-parent-test/pom.xml
+usage/qa/src/test/projects/downstream-parent-test/src/main/java/com/example/HelloEntity.java
+usage/qa/src/test/projects/downstream-parent-test/src/main/java/com/example/HelloEntityImpl.java
+usage/qa/src/test/projects/downstream-parent-test/src/main/resources/blueprint.yaml
+usage/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom
usage/qa/start-monitor.sh
usage/qa/start-webcluster.sh
whirr/src/main/java/brooklyn/extras/whirr/WhirrExample.groovy