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:35 UTC

[37/50] [abbrv] brooklyn-client git commit: update file lists with correct all-files-ever list

update file lists with correct all-files-ever list


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

Branch: refs/heads/master
Commit: e685c3efca61c8c12e2a36aebdbd8eca26f23c85
Parents: 34ae71d
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jan 27 22:47:44 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jan 27 22:47:44 2016 +0000

----------------------------------------------------------------------
 all-files-claimed.gen.txt          | 390 ++++++++++++++++++++++++++++++
 all-files-ever.gen.txt             |  25 ++
 server-only-whitelist.full.gen.txt | 390 ++++++++++++++++++++++++++++++
 server-whitelist.full.gen.txt      |  20 ++
 unclaimed-files.gen.txt            | 410 ++------------------------------
 5 files changed, 845 insertions(+), 390 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/e685c3ef/all-files-claimed.gen.txt
----------------------------------------------------------------------
diff --git a/all-files-claimed.gen.txt b/all-files-claimed.gen.txt
index 46bf432..2ad2af4 100644
--- a/all-files-claimed.gen.txt
+++ b/all-files-claimed.gen.txt
@@ -1,12 +1,24 @@
 
 .gitattributes
 .gitignore
+.idea/ant.xml
+.project
+.settings/org.eclipse.m2e.core.prefs
+COPYRIGHT.md
+DISCLAIMER
 LICENSE
+LICENSE.md
 LICENSE.txt
 NOTICE
+README
 README.md
 README.rst
+acceptance/pom.xml
+acceptance/prodDb.properties
+acceptance/prodDb.script
+acceptance/src/test/java/brooklyn/web/console/test/AbstractSeleniumTest.groovy
 acceptance/src/test/java/brooklyn/web/console/test/ActivityTabTest.groovy
+acceptance/src/test/java/brooklyn/web/console/test/CloudsoftWebsiteTest.groovy
 acceptance/src/test/java/brooklyn/web/console/test/EffectorsTabTest.groovy
 acceptance/src/test/java/brooklyn/web/console/test/EntityTreeTest.groovy
 acceptance/src/test/java/brooklyn/web/console/test/PingConsoleTest.groovy
@@ -424,6 +436,7 @@ api/src/main/java/org/apache/brooklyn/policy/Policy.java
 api/src/main/java/org/apache/brooklyn/policy/PolicySpec.java
 api/src/main/java/org/apache/brooklyn/policy/PolicyType.java
 api/src/test/resources/META-INF/org.sonatype.gossip/config.properties
+atlassian-ide-plugin.xml
 brooklyn-dist
 brooklyn-dist/.gitattributes
 brooklyn-dist/.gitignore
@@ -986,6 +999,7 @@ brooklyn-docs/website/learnmore/theory.md
 brooklyn-docs/website/meta/license.md
 brooklyn-docs/website/meta/sitemap.md
 brooklyn-docs/website/meta/versions.md
+brooklyn-install.sh
 brooklyn-library
 brooklyn-library/.gitattributes
 brooklyn-library/.gitignore
@@ -4382,7 +4396,52 @@ brooklyn-ui/src/test/javascript/specs/view/entity-sensors-spec.js
 brooklyn-ui/src/test/license/DISCLAIMER
 brooklyn-ui/src/test/license/LICENSE
 brooklyn-ui/src/test/license/NOTICE
+brooklyn.api/.classpath
+brooklyn.api/.project
+brooklyn.api/.settings/org.eclipse.jdt.core.prefs
+brooklyn.api/.settings/org.eclipse.m2e.core.prefs
 brooklyn.api/pom.xml
+brooklyn.core/.classpath
+brooklyn.core/.project
+brooklyn.core/.settings/org.eclipse.jdt.core.prefs
+brooklyn.core/.settings/org.eclipse.m2e.core.prefs
+brooklyn.core/pom.xml
+brooklyn.extra/.classpath
+brooklyn.extra/.project
+brooklyn.extra/.settings/org.eclipse.jdt.core.prefs
+brooklyn.extra/.settings/org.eclipse.m2e.core.prefs
+brooklyn.extra/pom.xml
+brooklyn.iml
+brooklyn.policies/.classpath
+brooklyn.policies/.gitignore
+brooklyn.policies/.project
+brooklyn.policies/.settings/org.codehaus.groovy.eclipse.core.prefs
+brooklyn.policies/.settings/org.eclipse.core.resources.prefs
+brooklyn.policies/.settings/org.eclipse.jdt.core.prefs
+brooklyn.policies/.settings/org.eclipse.m2e.core.prefs
+brooklyn.policies/.settings/org.maven.ide.eclipse.prefs
+brooklyn.policies/pom.xml
+brooklyn.policies/src/main/java/org/overpaas/activity/ActivityModel.java
+brooklyn.policies/src/main/java/org/overpaas/activity/EnhancedType.java
+brooklyn.policies/src/main/java/org/overpaas/activity/EntityRankers.java
+brooklyn.policies/src/main/java/org/overpaas/activity/Event.java
+brooklyn.policies/src/main/java/org/overpaas/activity/EventDictionary.java
+brooklyn.policies/src/main/java/org/overpaas/activity/EventFilter.java
+brooklyn.policies/src/main/java/org/overpaas/activity/EventFilters.java
+brooklyn.policies/src/main/java/org/overpaas/activity/EventListener.java
+brooklyn.policies/src/main/java/org/overpaas/activity/NestedMapAccessor.java
+brooklyn.policies/src/main/java/org/overpaas/activity/TypedKey.java
+brooklyn.policies/src/main/java/org/overpaas/activity/impl/EventImpl.java
+brooklyn.policies/src/main/java/org/overpaas/activity/impl/NestedMapAccessorImpl.java
+brooklyn.policies/src/main/java/org/overpaas/activity/impl/NestedMapsUtils.java
+brooklyn.policies/src/main/java/org/overpaas/policy/BalanceableEntity.java
+brooklyn.policies/src/main/java/org/overpaas/policy/BalancerPolicy.groovy
+brooklyn.policies/src/main/java/org/overpaas/policy/Entity.java
+brooklyn.policies/src/main/java/org/overpaas/policy/MoveableEntity.java
+brooklyn.policies/src/main/java/org/overpaas/policy/Policy.java
+brooklyn.policies/src/main/java/org/overpaas/policy/ResizableEntity.java
+brooklyn.policies/src/main/java/org/overpaas/policy/ResizerPolicy.groovy
+brooklyn.policies/src/test/java/org/overpaas/policy/BalancerPolicyTest.groovy
 brooklyn/
 brooklyn/.gitattributes
 brooklyn/.gitignore
@@ -4557,6 +4616,7 @@ camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/rest/resource/Pla
 camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/test/fixture/AbstractRestResourceTest.java
 camp/camp-server/src/test/java/org/apache/brooklyn/camp/server/test/fixture/InMemoryCamp.java
 camp/pom.xml
+coding_standard.txt
 core
 core/.gitignore
 core/brooklyn-core.iml
@@ -7773,6 +7833,9 @@ core/src/test/resources/org/apache/brooklyn/location/basic/sample_id_rsa.pub
 core/src/test/resources/org/apache/brooklyn/util/core/rebind/compiler_compatibility_eclipse.xml
 core/src/test/resources/org/apache/brooklyn/util/core/rebind/compiler_compatibility_oracle.xml
 core/src/test/resources/server.ks
+demo-support/Demo.jmx
+demo-support/start-jmeter
+doc/git-workflow.svg
 docs
 docs/.gitignore
 docs/Gemfile
@@ -9057,12 +9120,22 @@ docs/website/quickstart/policies-and-catalogs.md
 docs/website/sitemap.md
 example/.gitignore
 example/brooklyn-jmeter-test-plan.jmx
+example/demo.sh
 example/jboss.sh
 example/jboss6.sh
+example/pom.xml
+example/src/main/java/brooklyn/demo/Demo.groovy
+example/src/main/java/brooklyn/demo/GemfireDemo.groovy
 example/src/main/java/brooklyn/demo/GemfireExample.groovy
+example/src/main/java/brooklyn/demo/JBossSeamTravelDemo.groovy
+example/src/main/java/brooklyn/demo/JbossSeamTravelDemo.groovy
+example/src/main/java/brooklyn/demo/Locations.groovy
 example/src/main/java/brooklyn/demo/SingleWebServerExample.groovy
+example/src/main/java/brooklyn/demo/SpringTravel.groovy
+example/src/main/java/brooklyn/demo/TomcatSpringTravelDemo.groovy
 example/src/main/java/brooklyn/demo/WebAppFabricExample.groovy
 example/src/main/java/brooklyn/demo/WebAppWideAreaExample.groovy
+example/src/main/java/brooklyn/demo/WebCluster.groovy
 example/src/main/java/brooklyn/demo/WebClusterExample.groovy
 example/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy
 example/src/main/java/brooklyn/demo/todo/GemfireExample.groovy
@@ -9077,7 +9150,19 @@ example/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy
 example/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy
 example/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy
 example/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy
+example/src/main/java/brooklyn/example/BigAppBixby.groovy
+example/src/main/java/brooklyn/example/BigAppBrooklyn.groovy
+example/src/main/java/brooklyn/example/ClusteredJBossApp.groovy
+example/src/main/java/brooklyn/example/MultiLocationTomcatApp.groovy
+example/src/main/java/brooklyn/example/MultiLocationWebAppDemo.groovy
 example/src/main/java/brooklyn/example/PretendLocations.groovy
+example/src/main/java/brooklyn/example/SimpleTomcatApp.groovy
+example/src/main/java/brooklyn/example/TomcatClusterApp.groovy
+example/src/main/java/brooklyn/example/TomcatClusterWithNginxApp.groovy
+example/src/main/java/brooklyn/example/TomcatFabricApp.groovy
+example/src/main/java/brooklyn/example/TomcatFabricGeoApp.groovy
+example/src/main/java/brooklyn/example/TomcatInAwsApp.groovy
+example/src/main/java/brooklyn/example/TomcatServerApp.groovy
 example/src/main/resources/gemfire/gemfire-myapp.jar
 example/src/main/resources/gemfire/server-conf.xml
 example/src/main/resources/hello-world.war
@@ -9088,6 +9173,7 @@ example/src/main/resources/logging.properties
 example/src/main/scripts/amis.txt
 example/src/main/scripts/create-all-instances.sh
 example/src/main/scripts/create-instance.sh
+example/src/main/scripts/run-at-all-instances.sh
 example/src/main/scripts/run-at-instances.sh
 example/src/main/scripts/stop-instances.sh
 examples
@@ -9342,24 +9428,42 @@ examples/webapps/hello-world-webapp/src/main/webapp/primes.jsp
 examples/webapps/hello-world-webapp/src/main/webapp/styles/main.css
 examples/webapps/pom.xml
 extra/.gitignore
+extra/brooklyn-extra.iml
+extra/pom.xml
+extra/resources/META-INF/org.sonatype.gossip/config.properties
+extra/resources/hello-world.war
+extra/resources/logging.properties
+extra/src/integration/java/brooklyn/entity/webapp/jboss/JBossNodeIntegrationTest.groovy
+extra/src/integration/java/brooklyn/entity/webapp/jboss/JBossNodeTest.groovy
+extra/src/integration/java/brooklyn/entity/webapp/tomcat/SimulatedITLocation.groovy
+extra/src/integration/java/brooklyn/entity/webapp/tomcat/TomcatNodeIntegrationTest.groovy
+extra/src/integration/java/brooklyn/test/TestUtils.groovy
+extra/src/integration/resources/META-INF/org.sonatype.gossip/config.properties
 extra/src/integration/resources/hello-world.war
+extra/src/integration/resources/logging.properties
 extra/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.groovy
 extra/src/main/java/brooklyn/enricher/DeltaEnricher.groovy
 extra/src/main/java/brooklyn/enricher/RollingMeanEnricher.groovy
 extra/src/main/java/brooklyn/enricher/RollingTimeWindowMeanEnricher.groovy
 extra/src/main/java/brooklyn/enricher/TimeWeightedDeltaEnricher.groovy
 extra/src/main/java/brooklyn/entity/brooklyn/BrooklynMetrics.groovy
+extra/src/main/java/brooklyn/entity/cluster/Controller.groovy
+extra/src/main/java/brooklyn/entity/data/mysql/MySqlNode.groovy
 extra/src/main/java/brooklyn/entity/database/Database.groovy
 extra/src/main/java/brooklyn/entity/database/derby/DerbyDatabase.groovy
 extra/src/main/java/brooklyn/entity/database/derby/DerbySetup.groovy
 extra/src/main/java/brooklyn/entity/database/mysql/MySqlNode.groovy
+extra/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy
 extra/src/main/java/brooklyn/entity/dns/AbstractGeoDnsService.groovy
 extra/src/main/java/brooklyn/entity/dns/HostGeoInfo.java
+extra/src/main/java/brooklyn/entity/dns/LocationUtils.java
+extra/src/main/java/brooklyn/entity/dns/ServerGeoInfo.java
 extra/src/main/java/brooklyn/entity/dns/example.php
 extra/src/main/java/brooklyn/entity/dns/geoscaling/GeoscalingDnsServer.groovy
 extra/src/main/java/brooklyn/entity/dns/geoscaling/GeoscalingDnsService.groovy
 extra/src/main/java/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
 extra/src/main/java/brooklyn/entity/dns/geoscaling/GeoscalingWebClient.java
+extra/src/main/java/brooklyn/entity/dns/geoscaling/LocationUtils.java
 extra/src/main/java/brooklyn/entity/dns/geoscaling/example.php
 extra/src/main/java/brooklyn/entity/dns/geoscaling/template.php
 extra/src/main/java/brooklyn/entity/group/AbstractController.groovy
@@ -9377,6 +9481,7 @@ extra/src/main/java/brooklyn/entity/jms/qpid/QpidNode.groovy
 extra/src/main/java/brooklyn/entity/jms/qpid/QpidSetup.groovy
 extra/src/main/java/brooklyn/entity/messaging/JMSBroker.groovy
 extra/src/main/java/brooklyn/entity/messaging/MessageBroker.groovy
+extra/src/main/java/brooklyn/entity/messaging/MessageBroker.java
 extra/src/main/java/brooklyn/entity/messaging/Queue.groovy
 extra/src/main/java/brooklyn/entity/messaging/Topic.groovy
 extra/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.groovy
@@ -9384,6 +9489,11 @@ extra/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQSetup.groovy
 extra/src/main/java/brooklyn/entity/messaging/qpid/QpidBroker.groovy
 extra/src/main/java/brooklyn/entity/messaging/qpid/QpidSetup.groovy
 extra/src/main/java/brooklyn/entity/nosql/DataStore.groovy
+extra/src/main/java/brooklyn/entity/nosql/gemfire/GatewayConnectionDetails.groovy
+extra/src/main/java/brooklyn/entity/nosql/gemfire/GemfireCluster.groovy
+extra/src/main/java/brooklyn/entity/nosql/gemfire/GemfireFabric.groovy
+extra/src/main/java/brooklyn/entity/nosql/gemfire/GemfireServer.groovy
+extra/src/main/java/brooklyn/entity/nosql/gemfire/GemfireSetup.groovy
 extra/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Server.groovy
 extra/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Setup.groovy
 extra/src/main/java/brooklyn/entity/nosql/redis/RedisCluster.groovy
@@ -9395,24 +9505,39 @@ extra/src/main/java/brooklyn/entity/trait/Resizable.java
 extra/src/main/java/brooklyn/entity/trait/Startable.java
 extra/src/main/java/brooklyn/entity/webapp/ControlledDynamicWebAppCluster.groovy
 extra/src/main/java/brooklyn/entity/webapp/DynamicWebAppCluster.groovy
+extra/src/main/java/brooklyn/entity/webapp/JavaWebApp.groovy
 extra/src/main/java/brooklyn/entity/webapp/JavaWebAppService.groovy
 extra/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.groovy
 extra/src/main/java/brooklyn/entity/webapp/OldJavaWebApp.groovy
+extra/src/main/java/brooklyn/entity/webapp/PortPreconditions.groovy
 extra/src/main/java/brooklyn/entity/webapp/WebAppService.groovy
 extra/src/main/java/brooklyn/entity/webapp/jboss/JBoss6Server.groovy
 extra/src/main/java/brooklyn/entity/webapp/jboss/JBoss6SshSetup.groovy
 extra/src/main/java/brooklyn/entity/webapp/jboss/JBoss7Server.groovy
 extra/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshDriver.groovy
+extra/src/main/java/brooklyn/entity/webapp/jboss/JBoss7SshSetup.groovy
+extra/src/main/java/brooklyn/entity/webapp/jboss/JBossCluster.groovy
+extra/src/main/java/brooklyn/entity/webapp/jboss/JBossMultiLocationTier.groovy
 extra/src/main/java/brooklyn/entity/webapp/jboss/JBossNode.groovy
 extra/src/main/java/brooklyn/entity/webapp/jboss/JBossServer.groovy
 extra/src/main/java/brooklyn/entity/webapp/jboss/OldJBoss7SshSetup.groovy
 extra/src/main/java/brooklyn/entity/webapp/tomcat/Tomcat7SshSetup.groovy
+extra/src/main/java/brooklyn/entity/webapp/tomcat/TomcatCluster.groovy
+extra/src/main/java/brooklyn/entity/webapp/tomcat/TomcatMultiLocationTier.groovy
 extra/src/main/java/brooklyn/entity/webapp/tomcat/TomcatNode.groovy
 extra/src/main/java/brooklyn/entity/webapp/tomcat/TomcatServer.groovy
+extra/src/main/java/brooklyn/policy/AggregatorEnricher.groovy
+extra/src/main/java/brooklyn/policy/AggregatorEnricher.java
+extra/src/main/java/brooklyn/policy/BufferingEnricher.groovy
+extra/src/main/java/brooklyn/policy/CustomAggregatingEnricher.groovy
 extra/src/main/java/brooklyn/policy/DeltaEnricher.groovy
+extra/src/main/java/brooklyn/policy/RangeBufferingEnricher.groovy
 extra/src/main/java/brooklyn/policy/ResizerPolicy.groovy
 extra/src/main/java/brooklyn/policy/RollingMeanEnricher.groovy
 extra/src/main/java/brooklyn/policy/RollingTimeWindowMeanEnricher.groovy
+extra/src/main/java/brooklyn/policy/SimpleAveragingEnricher.groovy
+extra/src/main/java/brooklyn/policy/SimpleTimeAveragingEnricher.groovy
+extra/src/main/java/brooklyn/policy/TimeBufferingEnricher.groovy
 extra/src/main/java/brooklyn/policy/TimeWeightedDeltaEnricher.groovy
 extra/src/main/java/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java
 extra/src/main/java/brooklyn/policy/followthesun/FollowTheSunModel.java
@@ -9421,8 +9546,13 @@ extra/src/main/java/brooklyn/policy/followthesun/FollowTheSunPolicy.groovy
 extra/src/main/java/brooklyn/policy/followthesun/FollowTheSunPool.groovy
 extra/src/main/java/brooklyn/policy/followthesun/FollowTheSunStrategy.java
 extra/src/main/java/brooklyn/policy/followthesun/WeightedObject.java
+extra/src/main/java/brooklyn/policy/loadbalancing/AbstractBalanceableClusterModel.java
+extra/src/main/java/brooklyn/policy/loadbalancing/AbstractBalanceablePoolModel.java
+extra/src/main/java/brooklyn/policy/loadbalancing/Balanceable.java
+extra/src/main/java/brooklyn/policy/loadbalancing/BalanceableClusterModel.java
 extra/src/main/java/brooklyn/policy/loadbalancing/BalanceableContainer.java
 extra/src/main/java/brooklyn/policy/loadbalancing/BalanceablePoolModel.java
+extra/src/main/java/brooklyn/policy/loadbalancing/BalanceablePoolModelImpl.java
 extra/src/main/java/brooklyn/policy/loadbalancing/BalanceableWorkerPool.groovy
 extra/src/main/java/brooklyn/policy/loadbalancing/BalancingStrategy.java
 extra/src/main/java/brooklyn/policy/loadbalancing/DefaultBalanceablePoolModel.java
@@ -9430,8 +9560,14 @@ extra/src/main/java/brooklyn/policy/loadbalancing/ItemsInContainersGroup.groovy
 extra/src/main/java/brooklyn/policy/loadbalancing/LoadBalancingPolicy.groovy
 extra/src/main/java/brooklyn/policy/loadbalancing/LocationConstraint.java
 extra/src/main/java/brooklyn/policy/loadbalancing/Movable.groovy
+extra/src/main/java/brooklyn/policy/loadbalancing/Movable.java
 extra/src/main/java/brooklyn/policy/loadbalancing/PolicyUtilForPool.java
+extra/src/main/java/brooklyn/policy/loadbalancing/WatermarksConfiguration.java
 extra/src/main/java/brooklyn/policy/resizing/ResizingPolicy.groovy
+extra/src/main/java/brooklyn/policy/wip/AggregatorEnricher.groovy
+extra/src/main/java/brooklyn/policy/wip/BufferingEnricher.groovy
+extra/src/main/java/brooklyn/policy/wip/RangeBufferingEnricher.groovy
+extra/src/main/java/brooklyn/policy/wip/TimeBufferingEnricher.groovy
 extra/src/main/java/brooklyn/util/SshBasedJavaWebAppSetup.groovy
 extra/src/main/resources/brooklyn/entity/dns/geoscaling/example.php
 extra/src/main/resources/brooklyn/entity/dns/geoscaling/template.php
@@ -9440,6 +9576,7 @@ extra/src/test/java/brooklyn/enricher/DeltaEnrichersTests.groovy
 extra/src/test/java/brooklyn/enricher/RollingMeanEnricherTest.groovy
 extra/src/test/java/brooklyn/enricher/RollingTimeWindowMeanEnricherTest.groovy
 extra/src/test/java/brooklyn/entity/brooklyn/BrooklynMetricsTest.groovy
+extra/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.groovy
 extra/src/test/java/brooklyn/entity/dns/AbstractGeoDnsServiceTest.groovy
 extra/src/test/java/brooklyn/entity/dns/HostGeoInfoTest.groovy
 extra/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.groovy
@@ -9457,6 +9594,7 @@ extra/src/test/java/brooklyn/entity/jms/qpid/QpidNodeIntegrationTest.groovy
 extra/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.groovy
 extra/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.groovy
 extra/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.groovy
+extra/src/test/java/brooklyn/entity/nosql/gemfire/GemfireServerIntegrationTest.groovy
 extra/src/test/java/brooklyn/entity/nosql/infinispan/Infinispan5ServerIntegrationTest.groovy
 extra/src/test/java/brooklyn/entity/nosql/redis/RedisIntegrationTest.groovy
 extra/src/test/java/brooklyn/entity/proxy/nginx/NginxAmazonTest.groovy
@@ -9466,16 +9604,33 @@ extra/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
 extra/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTests.groovy
 extra/src/test/java/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy
 extra/src/test/java/brooklyn/entity/webapp/WebAppLiveIntergrationTest.groovy
+extra/src/test/java/brooklyn/entity/webapp/jboss/JBoss7ServerIntegrationTest.groovy
+extra/src/test/java/brooklyn/entity/webapp/jboss/JBossNodeIntegrationTest.groovy
+extra/src/test/java/brooklyn/entity/webapp/jboss/JBossNodeTest.groovy
+extra/src/test/java/brooklyn/entity/webapp/jboss/JBossServerIntegrationTest.groovy
+extra/src/test/java/brooklyn/entity/webapp/jboss/JBossServerLiveIntergrationTest.groovy
 extra/src/test/java/brooklyn/entity/webapp/tomcat/GeneralisedDynamicMBean.groovy
+extra/src/test/java/brooklyn/entity/webapp/tomcat/JmxService.groovy
 extra/src/test/java/brooklyn/entity/webapp/tomcat/SimulatedLocation.groovy
+extra/src/test/java/brooklyn/entity/webapp/tomcat/TomcatNodeIntegrationTest.groovy
+extra/src/test/java/brooklyn/entity/webapp/tomcat/TomcatNodeTest.groovy
 extra/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerIntegrationTest.groovy
+extra/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerLiveIntegrationTest.groovy
 extra/src/test/java/brooklyn/entity/webapp/tomcat/TomcatServerTest.groovy
 extra/src/test/java/brooklyn/entity/webapp/tomcat/TomcatSimulator.groovy
+extra/src/test/java/brooklyn/example/BigAppBixby.groovy
+extra/src/test/java/brooklyn/example/BigAppBrooklyn.groovy
+extra/src/test/java/brooklyn/example/MultiLocationTomcatApp.groovy
+extra/src/test/java/brooklyn/example/PretendLocations.groovy
+extra/src/test/java/brooklyn/example/SimpleTomcatApp.groovy
 extra/src/test/java/brooklyn/management/internal/task/FuturesTest.groovy
+extra/src/test/java/brooklyn/policy/BufferingEnricherTest.groovy
 extra/src/test/java/brooklyn/policy/CustomAggregatingEnricherTest.groovy
 extra/src/test/java/brooklyn/policy/DeltaEnrichersTests.groovy
+extra/src/test/java/brooklyn/policy/ResizerPolicyTest.groovy
 extra/src/test/java/brooklyn/policy/RollingMeanEnricherTest.groovy
 extra/src/test/java/brooklyn/policy/RollingTimeWindowMeanEnricherTest.groovy
+extra/src/test/java/brooklyn/policy/SimpleTimeAveragingEnricherTest.groovy
 extra/src/test/java/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.groovy
 extra/src/test/java/brooklyn/policy/followthesun/FollowTheSunModelTest.java
 extra/src/test/java/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.groovy
@@ -9487,20 +9642,38 @@ extra/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingModelTest.java
 extra/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyConcurrencyTest.groovy
 extra/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicySoakTest.groovy
 extra/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.groovy
+extra/src/test/java/brooklyn/policy/loadbalancing/LoadBalancingStrategyTest.java
 extra/src/test/java/brooklyn/policy/loadbalancing/MockContainerEntity.groovy
 extra/src/test/java/brooklyn/policy/loadbalancing/MockItemEntity.groovy
+extra/src/test/java/brooklyn/policy/loadbalancing/MockWorkerPool.java
 extra/src/test/java/brooklyn/policy/resizing/ResizingPolicyTest.groovy
 extra/src/test/java/brooklyn/test/AwsLocationTest.groovy
 extra/src/test/java/brooklyn/test/TestUtils.groovy
+extra/src/test/java/brooklyn/test/entity/ExtraEntities.groovy
 extra/src/test/java/brooklyn/util/internal/JmxSensorAdapterTest.groovy
+extra/src/test/java/brooklyn/util/internal/JmxSensorEffectorToolTest.groovy
 extra/src/test/java/brooklyn/util/internal/LanguageUtilsTest.groovy
 extra/src/test/java/brooklyn/util/internal/SshJschToolTest.groovy
 extra/src/test/java/brooklyn/util/internal/TimeExtrasTest.groovy
 extra/src/test/java/brooklyn/util/task/BasicTaskExecution.groovy
+extra/src/test/resources/META-INF/org.sonatype.gossip/config.properties
 extra/src/test/resources/brooklyn/entity/dns/geoscaling/expectedScript.php
+extra/src/test/resources/brooklyn/entity/nosql/gemfire/eu/cache.xml
+extra/src/test/resources/brooklyn/entity/nosql/gemfire/eu/client-cache.xml
 extra/src/test/resources/hello-world.war
+extra/src/test/resources/jclouds/id_rsa.private
+extra/src/test/resources/jclouds/id_rsa.pub
+extra/src/test/resources/log4j.properties
+extra/src/test/resources/logging.properties
 extra/src/test/resources/qpid-config.xml
 extra/src/test/resources/qpid-plugin.jar
+extras/openshift/pom.xml
+extras/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftExpressAccess.groovy
+extras/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftExpressJavaWebAppCluster.groovy
+extras/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftLocation.groovy
+extras/openshift/src/test/java/brooklyn/extras/openshift/OpenshiftExpressAccessIntegrationTest.groovy
+extras/openshift/src/test/java/brooklyn/extras/openshift/OpenshiftExpressJavaClusterOnlyExample.groovy
+extras/openshift/src/test/resources/hello-world.war
 karaf
 karaf/apache-brooklyn/pom.xml
 karaf/apache-brooklyn/src/main/filtered-resources/etc/branding.properties
@@ -9521,10 +9694,12 @@ karaf/itest/src/test/java/org/apache/brooklyn/MyTest.java
 karaf/itest/src/test/resources/exam.properties
 karaf/itest/src/test/resources/logback.xml
 karaf/pom.xml
+launcher/.gitignore
 launcher/pom.xml
 launcher/src/main/java/brooklyn/launcher/Activator.java
 launcher/src/main/java/brooklyn/launcher/BrooklynLauncher.groovy
 launcher/src/main/java/brooklyn/launcher/Main.groovy
+launcher/src/main/java/brooklyn/launcher/Main.java
 launcher/src/main/java/brooklyn/launcher/WebAppRunner.groovy
 launcher/src/main/resources/log4j.properties
 launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.groovy
@@ -9837,6 +10012,7 @@ locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persis
 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
 mgmt/src/main/java/brooklyn/mgmt/federated/FederatingManagementContext.groovy
@@ -9851,10 +10027,24 @@ mgmt/src/test/java/org/infinispan/examples/tutorial/clustered/Node1.java
 mgmt/src/test/java/org/infinispan/examples/tutorial/clustered/NumNutNode0.java
 mgmt/src/test/java/org/infinispan/examples/tutorial/clustered/NumNutNode1.java
 mgmt/src/test/java/org/infinispan/examples/tutorial/clustered/util/ClusterValidation.java
+mgmt/src/test/resources/logging.properties
+org.overpaas.core/.classpath
+org.overpaas.core/.gitignore
+org.overpaas.core/.project
+org.overpaas.core/.settings/org.codehaus.groovy.eclipse.core.prefs
+org.overpaas.core/.settings/org.eclipse.core.resources.prefs
+org.overpaas.core/.settings/org.eclipse.jdt.core.prefs
+org.overpaas.core/.settings/org.eclipse.m2e.core.prefs
+org.overpaas.core/.settings/org.maven.ide.eclipse.prefs
+org.overpaas.core/make-groovydoc.groovy
+org.overpaas.core/pom.xml
+org.overpaas.core/resources/README.txt
+org.overpaas.core/resources/hello-world.war
 org.overpaas.core/src/main/java/brooklyn/entity/Application.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/DynamicGroup.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/Entity.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/EntityClass.groovy
+org.overpaas.core/src/main/java/brooklyn/entity/EntitySummary.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/Group.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/ManagementApi.java
 org.overpaas.core/src/main/java/brooklyn/entity/basic/DynamicGroup.groovy
@@ -9863,7 +10053,11 @@ org.overpaas.core/src/main/java/brooklyn/entity/group/Fabric.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/group/Tier.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/trait/Resizable.java
 org.overpaas.core/src/main/java/brooklyn/entity/trait/Startable.java
+org.overpaas.core/src/main/java/brooklyn/entity/webapp/jboss/JBossCluster.groovy
+org.overpaas.core/src/main/java/brooklyn/entity/webapp/jboss/JBossMultiLocationTier.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/webapp/jboss/JBossNode.groovy
+org.overpaas.core/src/main/java/brooklyn/entity/webapp/tomcat/TomcatCluster.groovy
+org.overpaas.core/src/main/java/brooklyn/entity/webapp/tomcat/TomcatMultiLocationTier.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/webapp/tomcat/TomcatNode.groovy
 org.overpaas.core/src/main/java/brooklyn/event/Activity.groovy
 org.overpaas.core/src/main/java/brooklyn/event/EntityStartException.groovy
@@ -9894,42 +10088,108 @@ org.overpaas.core/src/main/java/brooklyn/util/internal/task/FutureValue.groovy
 org.overpaas.core/src/main/java/brooklyn/util/internal/task/Futures.groovy
 org.overpaas.core/src/main/java/brooklyn/util/internal/task/FuturesCollection.groovy
 org.overpaas.core/src/main/java/brooklyn/util/internal/task/QualifiableFuture.groovy
+org.overpaas.core/src/main/java/org/overpaas/console/EntityNavigationUtils.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/decorators/GroupEntity.java
+org.overpaas.core/src/main/java/org/overpaas/core/decorators/Location.java
+org.overpaas.core/src/main/java/org/overpaas/core/decorators/OverpaasApplication.java
+org.overpaas.core/src/main/java/org/overpaas/core/decorators/OverpaasEntity.java
+org.overpaas.core/src/main/java/org/overpaas/core/decorators/QualifiableFuture.java
 org.overpaas.core/src/main/java/org/overpaas/core/decorators/Resizable.java
+org.overpaas.core/src/main/java/org/overpaas/core/decorators/Startable.java
+org.overpaas.core/src/main/java/org/overpaas/core/locations/SshMachineLocation.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/Activity.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/Sensor.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/common/AbstractGroupEntity.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/common/AbstractOverpaasApplication.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/common/AbstractOverpaasEntity.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/common/Cluster.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/common/DynamicGroup.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/common/EntityStartUtils.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/common/Fabric.groovy
+org.overpaas.core/src/main/java/org/overpaas/core/types/common/Tier.groovy
 org.overpaas.core/src/main/java/org/overpaas/decorators/Resizable.java
+org.overpaas.core/src/main/java/org/overpaas/decorators/Startable.java
+org.overpaas.core/src/main/java/org/overpaas/entities/Application.groovy
+org.overpaas.core/src/main/java/org/overpaas/entities/Cluster.groovy
 org.overpaas.core/src/main/java/org/overpaas/entities/DynamicGroup.groovy
 org.overpaas.core/src/main/java/org/overpaas/entities/Entity.groovy
 org.overpaas.core/src/main/java/org/overpaas/entities/EntityClass.groovy
+org.overpaas.core/src/main/java/org/overpaas/entities/EntitySummary.groovy
+org.overpaas.core/src/main/java/org/overpaas/entities/Fabric.groovy
+org.overpaas.core/src/main/java/org/overpaas/entities/Group.groovy
 org.overpaas.core/src/main/java/org/overpaas/entities/ManagementApi.java
+org.overpaas.core/src/main/java/org/overpaas/entities/Tier.groovy
 org.overpaas.core/src/main/java/org/overpaas/event/EntityRankers.java
+org.overpaas.core/src/main/java/org/overpaas/event/EventFilter.java
 org.overpaas.core/src/main/java/org/overpaas/event/EventFilters.java
+org.overpaas.core/src/main/java/org/overpaas/event/EventListener.java
+org.overpaas.core/src/main/java/org/overpaas/execution/CompoundTask.groovy
+org.overpaas.core/src/main/java/org/overpaas/execution/Console.groovy
+org.overpaas.core/src/main/java/org/overpaas/execution/ExecutionManager.groovy
+org.overpaas.core/src/main/java/org/overpaas/execution/ParallelTask.groovy
+org.overpaas.core/src/main/java/org/overpaas/execution/SequentialTask.groovy
+org.overpaas.core/src/main/java/org/overpaas/execution/Task.groovy
 org.overpaas.core/src/main/java/org/overpaas/locations/SshBasedJavaAppSetup.groovy
 org.overpaas.core/src/main/java/org/overpaas/locations/SshBasedJavaWebAppSetup.groovy
 org.overpaas.core/src/main/java/org/overpaas/locations/SshMachineLocation.groovy
 org.overpaas.core/src/main/java/org/overpaas/types/Activity.groovy
 org.overpaas.core/src/main/java/org/overpaas/types/EntityStartException.groovy
+org.overpaas.core/src/main/java/org/overpaas/types/Location.groovy
 org.overpaas.core/src/main/java/org/overpaas/types/Sensor.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/BrooklynSystemProperties.java
 org.overpaas.core/src/main/java/org/overpaas/util/DelegatingExecutor.groovy
+org.overpaas.core/src/main/java/org/overpaas/util/EntityNavigationUtils.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/EntityStartUtils.groovy
+org.overpaas.core/src/main/java/org/overpaas/util/FutureValue.groovy
+org.overpaas.core/src/main/java/org/overpaas/util/Futures.groovy
+org.overpaas.core/src/main/java/org/overpaas/util/FuturesCollection.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/JmxSensorEffectorTool.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/LanguageUtils.groovy
+org.overpaas.core/src/main/java/org/overpaas/util/OverpaasDsl.groovy
+org.overpaas.core/src/main/java/org/overpaas/util/QualifiableFuture.java
+org.overpaas.core/src/main/java/org/overpaas/util/SerializableObservables.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/SshJschTool.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/TimeExtras.groovy
+org.overpaas.core/src/main/java/org/overpaas/util/concurrent/DelegateFuture.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/concurrent/DelegatingExecutor.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/concurrent/FutureValue.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/concurrent/Futures.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/concurrent/FuturesCollection.groovy
+org.overpaas.core/src/main/java/org/overpaas/util/concurrent/QualifiableFuture.groovy
 org.overpaas.core/src/main/java/org/overpaas/util/duplicates/ExecResult.java
 org.overpaas.core/src/main/java/org/overpaas/util/duplicates/ExecUtils.java
+org.overpaas.core/src/main/java/org/overpaas/web/jboss/JBossCluster.groovy
+org.overpaas.core/src/main/java/org/overpaas/web/jboss/JBossMultiLocationTier.groovy
 org.overpaas.core/src/main/java/org/overpaas/web/jboss/JBossNode.groovy
+org.overpaas.core/src/main/java/org/overpaas/web/tomcat/TomcatCluster.groovy
+org.overpaas.core/src/main/java/org/overpaas/web/tomcat/TomcatMultiLocationTier.groovy
 org.overpaas.core/src/main/java/org/overpaas/web/tomcat/TomcatNode.groovy
+org.overpaas.core/src/test/java/brooklyn/entity/webapp/tomcat/TomcatNodeTest.groovy
+org.overpaas.core/src/test/java/brooklyn/example/BigAppBixby.groovy
+org.overpaas.core/src/test/java/brooklyn/example/BigAppBrooklyn.groovy
+org.overpaas.core/src/test/java/brooklyn/example/MultiLocationTomcatApp.groovy
+org.overpaas.core/src/test/java/brooklyn/example/PretendLocations.groovy
+org.overpaas.core/src/test/java/brooklyn/example/SimpleTomcatApp.groovy
+org.overpaas.core/src/test/java/brooklyn/util/internal/JmxSensorEffectorToolTest.groovy
 org.overpaas.core/src/test/java/brooklyn/util/internal/LanguageUtilsTest.groovy
 org.overpaas.core/src/test/java/brooklyn/util/internal/SshJschToolTest.groovy
 org.overpaas.core/src/test/java/brooklyn/util/internal/TimeExtrasTest.groovy
+org.overpaas.core/src/test/java/org/overpaas/example/BigAppBixby.groovy
+org.overpaas.core/src/test/java/org/overpaas/example/BigAppBrooklyn.groovy
+org.overpaas.core/src/test/java/org/overpaas/example/MultiLocationTomcatApp.groovy
+org.overpaas.core/src/test/java/org/overpaas/example/PretendLocations.groovy
+org.overpaas.core/src/test/java/org/overpaas/example/SimpleTomcatApp.groovy
+org.overpaas.core/src/test/java/org/overpaas/example/TomcatWarDeployApp.groovy
+org.overpaas.core/src/test/java/org/overpaas/execution/BasicTaskExecution.groovy
+org.overpaas.core/src/test/java/org/overpaas/util/JmxSensorEffectorToolTest.groovy
 org.overpaas.core/src/test/java/org/overpaas/util/LanguageUtilsTest.groovy
 org.overpaas.core/src/test/java/org/overpaas/util/SshJschToolTest.groovy
+org.overpaas.core/src/test/java/org/overpaas/util/TimeExtrasTest.groovy
 org.overpaas.core/src/test/java/org/overpaas/util/concurrent/FuturesTest.groovy
 org.overpaas.core/src/test/java/org/overpaas/util/test/LanguageUtilsTest.groovy
+org.overpaas.core/src/test/java/org/overpaas/web/tomcat/TomcatNodeTest.groovy
+org.overpaas.core/src/test/resources/META-INF/org.sonatype.gossip/config.properties
+org.overpaas.core/thoughts.txt
 org.overpaas.management.webapp
 org.overpaas.management.webapp/.gitignore
 org.overpaas.management.webapp/.project
@@ -10032,6 +10292,36 @@ org.overpaas.management.webapp/web-app/js/prototype/scriptaculous.js
 org.overpaas.management.webapp/web-app/js/prototype/slider.js
 org.overpaas.management.webapp/web-app/js/prototype/sound.js
 org.overpaas.management.webapp/web-app/js/prototype/unittest.js
+org.overpaas.policies/.classpath
+org.overpaas.policies/.gitignore
+org.overpaas.policies/.project
+org.overpaas.policies/.settings/org.codehaus.groovy.eclipse.core.prefs
+org.overpaas.policies/.settings/org.eclipse.core.resources.prefs
+org.overpaas.policies/.settings/org.eclipse.jdt.core.prefs
+org.overpaas.policies/.settings/org.eclipse.m2e.core.prefs
+org.overpaas.policies/.settings/org.maven.ide.eclipse.prefs
+org.overpaas.policies/pom.xml
+org.overpaas.policies/src/main/java/org/overpaas/activity/ActivityModel.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/EnhancedType.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/EntityRankers.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/Event.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/EventDictionary.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/EventFilter.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/EventFilters.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/EventListener.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/NestedMapAccessor.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/TypedKey.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/impl/EventImpl.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/impl/NestedMapAccessorImpl.java
+org.overpaas.policies/src/main/java/org/overpaas/activity/impl/NestedMapsUtils.java
+org.overpaas.policies/src/main/java/org/overpaas/policy/BalanceableEntity.java
+org.overpaas.policies/src/main/java/org/overpaas/policy/BalancerPolicy.groovy
+org.overpaas.policies/src/main/java/org/overpaas/policy/Entity.java
+org.overpaas.policies/src/main/java/org/overpaas/policy/MoveableEntity.java
+org.overpaas.policies/src/main/java/org/overpaas/policy/Policy.java
+org.overpaas.policies/src/main/java/org/overpaas/policy/ResizableEntity.java
+org.overpaas.policies/src/main/java/org/overpaas/policy/ResizerPolicy.groovy
+org.overpaas.policies/src/test/java/org/overpaas/policy/BalancerPolicyTest.groovy
 parent
 parent/.gitignore
 parent/brooklyn-parent.iml
@@ -11827,6 +12117,7 @@ software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
 software/base/src/main/resources/brooklyn/entity/salt/master
 software/base/src/main/resources/brooklyn/entity/salt/masterless
 software/base/src/main/resources/brooklyn/entity/salt/minion
+software/base/src/main/resources/brooklyn/entity/salt/top.sls
 software/base/src/main/resources/brooklyn/entity/service/service.sh
 software/base/src/main/resources/brooklyn/entity/software/os-and-version.sh
 software/base/src/main/resources/brooklyn/entity/software/os-details.sh
@@ -12075,6 +12366,13 @@ software/base/src/test/resources/org/apache/brooklyn/entity/chef/hosted-chef-bro
 software/base/src/test/resources/org/apache/brooklyn/entity/software/base/frogs.txt
 software/base/src/test/resources/org/apache/brooklyn/entity/software/base/template.yaml
 software/base/src/test/resources/org/apache/brooklyn/entity/software/base/template_with_extra_substitutions.txt
+software/container/pom.xml
+software/container/src/main/java/brooklyn/entity/container/docker/DockerDriver.java
+software/container/src/main/java/brooklyn/entity/container/docker/DockerNode.java
+software/container/src/main/java/brooklyn/entity/container/docker/DockerNodeImpl.java
+software/container/src/main/java/brooklyn/entity/container/docker/DockerSshDriver.java
+software/container/src/main/resources/docker-top-logo.png
+software/container/src/test/java/brooklyn/entity/container/docker/DockerSoftLayerLiveTest.java
 software/database
 software/database/pom.xml
 software/database/src/main/java/brooklyn/entity/database/DatabaseNode.java
@@ -13375,6 +13673,84 @@ storage/hazelcast/src/main/java/org/apache/brooklyn/internal/storage/impl/hazelc
 storage/hazelcast/src/main/java/org/apache/brooklyn/internal/storage/impl/hazelcast/HazelcastDataGridFactory.java
 storage/hazelcast/src/test/java/brooklyn/storage/impl/hazelcast/HazelcastStorageTest.java
 storage/hazelcast/src/test/java/org/apache/brooklyn/storage/impl/hazelcast/HazelcastStorageTest.java
+systems/paas/cloudfoundry/pom.xml
+systems/paas/cloudfoundry/src/main/java/brooklyn/extras/cloudfoundry/CloudFoundryJavaWebAppCluster.groovy
+systems/paas/cloudfoundry/src/main/java/brooklyn/extras/cloudfoundry/CloudFoundryLocation.groovy
+systems/paas/cloudfoundry/src/main/java/brooklyn/extras/cloudfoundry/CloudFoundryVmcCliAccess.groovy
+systems/paas/cloudfoundry/src/main/resources/META-INF/services/brooklyn.location.LocationResolver
+systems/paas/cloudfoundry/src/test/java/brooklyn/extras/cloudfoundry/CloudFoundryAccessIntegrationTest.groovy
+systems/paas/cloudfoundry/src/test/java/brooklyn/extras/cloudfoundry/CloudFoundryJavaClusterExample.groovy
+systems/paas/cloudfoundry/src/test/java/brooklyn/extras/cloudfoundry/CloudFoundryJavaClusterFromLocationExample.groovy
+systems/paas/cloudfoundry/src/test/java/brooklyn/extras/cloudfoundry/CloudFoundryParseTest.java
+systems/paas/cloudfoundry/src/test/java/brooklyn/extras/cloudfoundry/LocationResolvesTest.java
+systems/paas/cloudfoundry/src/test/resources/hello-world.war
+systems/paas/openshift/pom.xml
+systems/paas/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftExpressAccess.groovy
+systems/paas/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftExpressAccess.java
+systems/paas/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftExpressApplicationAccess.java
+systems/paas/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftExpressJavaWebAppCluster.groovy
+systems/paas/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftExpressJavaWebAppCluster.java
+systems/paas/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftLocation.groovy
+systems/paas/openshift/src/main/java/brooklyn/extras/openshift/OpenshiftLocation.java
+systems/paas/openshift/src/main/resources/META-INF/services/brooklyn.location.LocationResolver
+systems/paas/openshift/src/test/java/brooklyn/extras/openshift/LocationResolvesTest.java
+systems/paas/openshift/src/test/java/brooklyn/extras/openshift/OpenshiftExpressAccessIntegrationTest.groovy
+systems/paas/openshift/src/test/java/brooklyn/extras/openshift/OpenshiftExpressJavaClusterOnlyExample.groovy
+systems/paas/openshift/src/test/resources/hello-world.war
+systems/whirr/base/pom.xml
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrCluster.groovy
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrCluster.java
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrClusterImpl.groovy
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrClusterImpl.java
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrInstance.groovy
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrInstance.java
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrInstanceImpl.groovy
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrInstanceImpl.java
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrRole.groovy
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrRole.java
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrRoleImpl.groovy
+systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrRoleImpl.java
+systems/whirr/base/src/test/java/brooklyn/extras/whirr/core/WhirrClusterTest.groovy
+systems/whirr/base/src/test/java/brooklyn/extras/whirr/core/WhirrClusterTest.java
+systems/whirr/hadoop/pom.xml
+systems/whirr/hadoop/src/main/java/brooklyn/extras/whirr/hadoop/WhirrHadoopCluster.groovy
+systems/whirr/hadoop/src/main/java/brooklyn/extras/whirr/hadoop/WhirrHadoopCluster.java
+systems/whirr/hadoop/src/main/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterImpl.groovy
+systems/whirr/hadoop/src/main/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterImpl.java
+systems/whirr/hadoop/src/test/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterLiveTest.java
+systems/whirr/hadoop/src/test/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterTest.groovy
+systems/whirr/hadoop/src/test/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterTest.java
+temp-policies/.classpath
+temp-policies/.gitignore
+temp-policies/.project
+temp-policies/.settings/org.codehaus.groovy.eclipse.core.prefs
+temp-policies/.settings/org.eclipse.core.resources.prefs
+temp-policies/.settings/org.eclipse.jdt.core.prefs
+temp-policies/.settings/org.eclipse.m2e.core.prefs
+temp-policies/.settings/org.maven.ide.eclipse.prefs
+temp-policies/org.overpaas.policies.iml
+temp-policies/pom.xml
+temp-policies/src/main/java/org/overpaas/activity/ActivityModel.java
+temp-policies/src/main/java/org/overpaas/activity/EnhancedType.java
+temp-policies/src/main/java/org/overpaas/activity/EntityRankers.java
+temp-policies/src/main/java/org/overpaas/activity/Event.java
+temp-policies/src/main/java/org/overpaas/activity/EventDictionary.java
+temp-policies/src/main/java/org/overpaas/activity/EventFilter.java
+temp-policies/src/main/java/org/overpaas/activity/EventFilters.java
+temp-policies/src/main/java/org/overpaas/activity/EventListener.java
+temp-policies/src/main/java/org/overpaas/activity/NestedMapAccessor.java
+temp-policies/src/main/java/org/overpaas/activity/TypedKey.java
+temp-policies/src/main/java/org/overpaas/activity/impl/EventImpl.java
+temp-policies/src/main/java/org/overpaas/activity/impl/NestedMapAccessorImpl.java
+temp-policies/src/main/java/org/overpaas/activity/impl/NestedMapsUtils.java
+temp-policies/src/main/java/org/overpaas/policy/BalanceableEntity.java
+temp-policies/src/main/java/org/overpaas/policy/BalancerPolicy.groovy
+temp-policies/src/main/java/org/overpaas/policy/Entity.java
+temp-policies/src/main/java/org/overpaas/policy/MoveableEntity.java
+temp-policies/src/main/java/org/overpaas/policy/Policy.java
+temp-policies/src/main/java/org/overpaas/policy/ResizableEntity.java
+temp-policies/src/main/java/org/overpaas/policy/ResizerPolicy.groovy
+temp-policies/src/test/java/org/overpaas/policy/BalancerPolicyTest.groovy
 test-support/pom.xml
 test-support/src/main/java/brooklyn/test/StatusListener.java
 test-support/src/main/java/brooklyn/test/TestUtils.groovy
@@ -14606,6 +14982,8 @@ usage/launcher/src/test/resources/mongo-single-server-blueprint.yaml
 usage/launcher/src/test/resources/mongo.key
 usage/launcher/src/test/resources/mssql-test.yaml
 usage/launcher/src/test/resources/nginx.yaml
+usage/launcher/src/test/resources/nodejs-todo.yaml
+usage/launcher/src/test/resources/nodejs-word-finder.yaml
 usage/launcher/src/test/resources/opengamma-cluster.yaml
 usage/launcher/src/test/resources/pillowfight.yaml
 usage/launcher/src/test/resources/playing.yaml
@@ -14649,9 +15027,11 @@ usage/qa/src/main/java/brooklyn/qa/load/SimulatedTheeTierApp.java
 usage/qa/src/main/java/brooklyn/qa/longevity/Monitor.java
 usage/qa/src/main/java/brooklyn/qa/longevity/MonitorListener.java
 usage/qa/src/main/java/brooklyn/qa/longevity/MonitorPrefs.java
+usage/qa/src/main/java/brooklyn/qa/longevity/MonitorUtils.groovy
 usage/qa/src/main/java/brooklyn/qa/longevity/MonitorUtils.java
 usage/qa/src/main/java/brooklyn/qa/longevity/StatusRecorder.java
 usage/qa/src/main/java/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java
+usage/qa/src/main/java/brooklyn/qa/longevity/webcluster/WebClusterApp.groovy
 usage/qa/src/main/java/brooklyn/qa/longevity/webcluster/WebClusterApp.java
 usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java
 usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java
@@ -14664,8 +15044,10 @@ usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java
 usage/qa/src/main/java/org/apache/brooklyn/qa/longevity/StatusRecorder.java
 usage/qa/src/main/resources/hello-world.txt
 usage/qa/src/main/resources/hello-world.war
+usage/qa/src/main/resources/log4j.properties
 usage/qa/src/test/java/brooklyn/qa/brooklynnode/SoftlayerObtainPrivateLiveTest.java
 usage/qa/src/test/java/brooklyn/qa/load/LoadTest.java
+usage/qa/src/test/java/brooklyn/qa/longevity/MonitorUtilsTest.groovy
 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
@@ -16638,5 +17020,13 @@ web-console/web-app/js/prototype/scriptaculous.js
 web-console/web-app/js/prototype/slider.js
 web-console/web-app/js/prototype/sound.js
 web-console/web-app/js/prototype/unittest.js
+whirr/demo-hadoop.sh
+whirr/demo.sh
+whirr/pom.xml
+whirr/src/main/java/brooklyn/extras/whirr/WhirrCluster.groovy
 whirr/src/main/java/brooklyn/extras/whirr/WhirrExample.groovy
 whirr/src/main/java/brooklyn/extras/whirr/WhirrHadoopExample.groovy
+whirr/src/main/java/brooklyn/extras/whirr/core/WhirrCluster.groovy
+whirr/src/main/java/brooklyn/extras/whirr/core/WhirrRole.groovy
+whirr/src/main/java/brooklyn/extras/whirr/hadoop/WhirrHadoopCluster.groovy
+whirr/src/test/java/brooklyn/extras/whirr/WhirrIntegrationTest.groovy

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/e685c3ef/all-files-ever.gen.txt
----------------------------------------------------------------------
diff --git a/all-files-ever.gen.txt b/all-files-ever.gen.txt
index d7239f2..b3054c9 100644
--- a/all-files-ever.gen.txt
+++ b/all-files-ever.gen.txt
@@ -114,6 +114,7 @@ api/src/main/java/brooklyn/location/LocationNotAvailableException.java
 api/src/main/java/brooklyn/location/LocationRegistry.java
 api/src/main/java/brooklyn/location/LocationResolver.java
 api/src/main/java/brooklyn/location/LocationSpec.java
+api/src/main/java/brooklyn/location/LocationType.java
 api/src/main/java/brooklyn/location/MachineDetails.java
 api/src/main/java/brooklyn/location/MachineLocation.java
 api/src/main/java/brooklyn/location/MachineLocationCustomizer.java
@@ -1478,6 +1479,12 @@ brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/e
 brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeDriver.java
 brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
 brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeSshDriver.java
+brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java
+brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java
+brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java
+brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java
+brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java
+brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java
 brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java
 brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
 brooklyn-library/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBAuthenticationMixins.java
@@ -1544,6 +1551,7 @@ brooklyn-library/software/nosql/src/main/resources/org/apache/brooklyn/entity/no
 brooklyn-library/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchbase/pillowfight.yaml
 brooklyn-library/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.ini
 brooklyn-library/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/couchdb/couch.uri
+brooklyn-library/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/hazelcast/hazelcast-brooklyn.xml
 brooklyn-library/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/default-mongod.conf
 brooklyn-library/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/default.conf
 brooklyn-library/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/mongodb/mongodb_win.yaml
@@ -1588,6 +1596,11 @@ brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/c
 brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/JcouchdbSupport.java
 brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
 brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
+brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java
+brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterNodeIntegrationTest.java
+brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java
+brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeIntegrationTest.java
+brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastTestHelper.java
 brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBEc2LiveTest.java
 brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBIntegrationTest.java
 brooklyn-library/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBRebindIntegrationTest.java
@@ -2768,6 +2781,7 @@ brooklyn-server/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntity
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/entity/EntityAssertsTest.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
+brooklyn-server/core/src/test/java/org/apache/brooklyn/core/entity/EntityConcurrencyTest.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/entity/EntityFunctionsTest.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/entity/EntityLocationsTest.java
@@ -2958,6 +2972,7 @@ brooklyn-server/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/JavaYardStickPerformanceTest.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/TaskPerformanceTest.java
+brooklyn-server/core/src/test/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistryTest.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/typereg/ExampleXmlTypePlanTransformer.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/typereg/ExampleXmlTypePlanTransformerTest.java
 brooklyn-server/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java
@@ -3269,6 +3284,12 @@ brooklyn-server/locations/jclouds/src/test/java/org/apache/brooklyn/location/jcl
 brooklyn-server/locations/jclouds/src/test/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicyLiveTest.java
 brooklyn-server/locations/jclouds/src/test/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicyTest.java
 brooklyn-server/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/jclouds-location-test-various-login-credentials.yaml
+brooklyn-server/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-aws-machine-aKEcbxKN
+brooklyn-server/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-aws-parent-lCYB3mTb
+brooklyn-server/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-aws-winrm-machine-KYSryzW8
+brooklyn-server/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-aws-winrm-parent-fKc0Ofyn
+brooklyn-server/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-azure-machine-VNapYjwp
+brooklyn-server/locations/jclouds/src/test/resources/org/apache/brooklyn/location/jclouds/persisted-azure-parent-briByOel
 brooklyn-server/logging/logback-includes/pom.xml
 brooklyn-server/logging/logback-includes/src/main/java/org/apache/brooklyn/util/logback/JcloudsPersistenceThreadDiscriminator.java
 brooklyn-server/logging/logback-includes/src/main/resources/brooklyn/logback-appender-file.xml
@@ -5182,12 +5203,14 @@ core/src/main/java/brooklyn/location/basic/LocalhostResolver.java
 core/src/main/java/brooklyn/location/basic/LocationConfigKeys.java
 core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java
 core/src/main/java/brooklyn/location/basic/LocationCreationUtils.java
+core/src/main/java/brooklyn/location/basic/LocationDynamicType.java
 core/src/main/java/brooklyn/location/basic/LocationEvent.java
 core/src/main/java/brooklyn/location/basic/LocationFunctions.java
 core/src/main/java/brooklyn/location/basic/LocationInternal.java
 core/src/main/java/brooklyn/location/basic/LocationPredicates.java
 core/src/main/java/brooklyn/location/basic/LocationPropertiesFromBrooklynProperties.java
 core/src/main/java/brooklyn/location/basic/LocationRegistry.java
+core/src/main/java/brooklyn/location/basic/LocationTypeSnapshot.java
 core/src/main/java/brooklyn/location/basic/LocationUsage.java
 core/src/main/java/brooklyn/location/basic/Locations.java
 core/src/main/java/brooklyn/location/basic/Machines.java
@@ -5448,6 +5471,7 @@ core/src/main/java/brooklyn/util/internal/ssh/BackoffLimitedRetryHandler.java
 core/src/main/java/brooklyn/util/internal/ssh/ShellAbstractTool.java
 core/src/main/java/brooklyn/util/internal/ssh/ShellTool.java
 core/src/main/java/brooklyn/util/internal/ssh/ShellToolConfigKeysForRemote.java
+core/src/main/java/brooklyn/util/internal/ssh/SshAbstractTool.java
 core/src/main/java/brooklyn/util/internal/ssh/SshException.java
 core/src/main/java/brooklyn/util/internal/ssh/SshTool.java
 core/src/main/java/brooklyn/util/internal/ssh/SshjClientConnection.java
@@ -8075,6 +8099,7 @@ docs/guide/java/common-usage.md
 docs/guide/java/defining-and-deploying.md
 docs/guide/java/entities.md
 docs/guide/java/entities/index.md
+docs/guide/java/entitlements.md
 docs/guide/java/entity.md
 docs/guide/java/index.md
 docs/guide/java/policies.md