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

[03/50] [abbrv] brooklyn-client git commit: latest generated file lists

http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/55280c9e/server-whitelist.full.gen.txt
----------------------------------------------------------------------
diff --git a/server-whitelist.full.gen.txt b/server-whitelist.full.gen.txt
index b8146df..e29c88b 100644
--- a/server-whitelist.full.gen.txt
+++ b/server-whitelist.full.gen.txt
@@ -1,11 +1,21 @@
+
 .gitattributes
 .gitignore
+.idea/ant.xml
+.project
+.settings/org.eclipse.m2e.core.prefs
+COPYRIGHT.md
 DISCLAIMER
 LICENSE
 LICENSE.md
 LICENSE.txt
 NOTICE
+README
 README.md
+acceptance/prodDb.properties
+acceptance/prodDb.script
+acceptance/src/test/java/brooklyn/web/console/test/AbstractSeleniumTest.groovy
+acceptance/src/test/java/brooklyn/web/console/test/CloudsoftWebsiteTest.groovy
 api
 api/.gitignore
 api/brooklyn-api.iml
@@ -415,6 +425,8 @@ 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-install.sh
 brooklyn-server
 brooklyn-server/.gitattributes
 brooklyn-server/.gitignore
@@ -2727,9 +2739,53 @@ brooklyn-server/utils/test-support/src/main/java/org/apache/brooklyn/test/suppor
 brooklyn-server/utils/test-support/src/main/java/org/apache/brooklyn/test/support/VerboseReporter.java
 brooklyn-server/utils/test-support/src/main/resources/brooklyn/logback-appender-file.xml
 brooklyn-server/utils/test-support/src/main/resources/logback-test.xml
+brooklyn-ui/src/main/webapp/assets/images/Sorting icons.psd
+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
 camp
 camp/README.md
 camp/camp-base/notes.txt
@@ -2895,6 +2951,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
@@ -6106,14 +6163,34 @@ 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/_plugins/json.rb
 docs/guide/license/license.md
 docs/license/license.md
 docs/meta/license/license.md
 docs/style/deps/underscore-min.js
 docs/style/deps/underscore-min.map
+docs/style/images/version banner.png
 docs/website/meta/license.md
+example/pom.xml
+example/src/main/java/brooklyn/demo/Demo.groovy
+example/src/main/java/brooklyn/demo/Locations.groovy
+example/src/main/java/brooklyn/demo/SpringTravel.groovy
+example/src/main/java/brooklyn/demo/TomcatSpringTravelDemo.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/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/springtravel-datamodel.jar
 example/src/main/resources/log4j.properties
 examples/simple-messaging-pubsub/src/main/example/resources/passwd
 examples/simple-messaging-pubsub/src/main/resources/passwd
@@ -6122,6 +6199,17 @@ examples/simple-nosql-cluster/src/main/assembly/files/conf/logback.xml
 examples/simple-open-loop-policy/src/main/resources/visitors-creation-script.sql
 examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
 extra/.gitignore
+extra/brooklyn-extra.iml
+extra/brooklyn-test-support-0.1.0-SNAPSHOT.jar
+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/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
@@ -6130,8 +6218,11 @@ 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/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/geoscaling/LocationUtils.java
 extra/src/main/java/brooklyn/entity/group/AbstractController.groovy
 extra/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.groovy
 extra/src/main/java/brooklyn/entity/group/Cluster.groovy
@@ -6140,16 +6231,32 @@ extra/src/main/java/brooklyn/entity/group/DynamicFabric.groovy
 extra/src/main/java/brooklyn/entity/group/Fabric.groovy
 extra/src/main/java/brooklyn/entity/group/Tier.groovy
 extra/src/main/java/brooklyn/entity/java/VanillaJavaApp.groovy
+extra/src/main/java/brooklyn/entity/messaging/MessageBroker.java
+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/trait/Resizable.java
 extra/src/main/java/brooklyn/entity/trait/Startable.java
 extra/src/main/java/brooklyn/entity/webapp/JavaWebApp.groovy
 extra/src/main/java/brooklyn/entity/webapp/PortPreconditions.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/tomcat/TomcatCluster.groovy
+extra/src/main/java/brooklyn/entity/webapp/tomcat/TomcatMultiLocationTier.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
@@ -6158,10 +6265,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
@@ -6169,13 +6279,20 @@ 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/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.groovy
 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/HostGeoInfoTest.groovy
 extra/src/test/java/brooklyn/entity/driver/MockSshBasedSoftwareSetup.groovy
 extra/src/test/java/brooklyn/entity/group/AbstractControllerTest.groovy
@@ -6183,10 +6300,22 @@ extra/src/test/java/brooklyn/entity/group/DynamicClusterTest.groovy
 extra/src/test/java/brooklyn/entity/group/DynamicFabricTest.groovy
 extra/src/test/java/brooklyn/entity/java/ExampleVanillaMain.java
 extra/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.groovy
+extra/src/test/java/brooklyn/entity/nosql/gemfire/GemfireServerIntegrationTest.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/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/TomcatServerLiveIntegrationTest.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
@@ -6204,8 +6333,10 @@ 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/TestUtils.groovy
 extra/src/test/java/brooklyn/util/internal/JmxSensorAdapterTest.groovy
@@ -6213,8 +6344,25 @@ 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/nosql/gemfire/eu/cache.xml
+extra/src/test/resources/brooklyn/entity/nosql/gemfire/eu/client-cache.xml
+extra/src/test/resources/brooklyn/entity/nosql/gemfire/gemfireLicense.zip
 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/seam-booking-as6.war
+extra/src/test/resources/seam-booking-as7.war
+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
@@ -6235,13 +6383,16 @@ 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
+launcher/src/test/resources/hello-world.war
 launcher/start-mgmt-web.sh
 locations
 locations/jclouds/pom.xml
@@ -6544,6 +6695,20 @@ 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
+mgmt/.gitignore
+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
@@ -6555,7 +6720,12 @@ org.overpaas.core/src/main/java/brooklyn/entity/basic/DynamicGroup.groovy
 org.overpaas.core/src/main/java/brooklyn/entity/group/Cluster.groovy
 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/tomcat/TomcatCluster.groovy
+org.overpaas.core/src/main/java/brooklyn/entity/webapp/tomcat/TomcatMultiLocationTier.groovy
 org.overpaas.core/src/main/java/brooklyn/event/Activity.groovy
 org.overpaas.core/src/main/java/brooklyn/event/EntityStartException.groovy
 org.overpaas.core/src/main/java/brooklyn/event/Sensor.groovy
@@ -6585,13 +6755,26 @@ 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
@@ -6625,10 +6808,12 @@ 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
@@ -6640,10 +6825,25 @@ org.overpaas.core/src/main/java/org/overpaas/util/concurrent/FuturesCollection.g
 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/tomcat/TomcatCluster.groovy
+org.overpaas.core/src/main/java/org/overpaas/web/tomcat/TomcatMultiLocationTier.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
@@ -6652,8 +6852,88 @@ 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/resources/META-INF/org.sonatype.gossip/config.properties
+org.overpaas.core/thoughts.txt
+org.overpaas.management.webapp/application.properties
+org.overpaas.management.webapp/src/main/webapp/META-INF/MANIFEST.MF
+org.overpaas.management.webapp/web-app/WEB-INF/classes/BootStrap$_closure1.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/BootStrap$_closure2.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/BootStrap.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/BuildConfig$_run_closure1.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/BuildConfig$_run_closure1_closure2.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/BuildConfig$_run_closure1_closure3.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/BuildConfig$_run_closure1_closure4.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/BuildConfig.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/Config$_run_closure1.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/Config$_run_closure1_closure3.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/Config$_run_closure1_closure4.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/Config$_run_closure1_closure5.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/Config$_run_closure2.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/Config.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource$_run_closure1.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource$_run_closure2.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource$_run_closure3.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource$_run_closure3_closure4.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource$_run_closure3_closure4_closure7.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource$_run_closure3_closure5.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource$_run_closure3_closure5_closure8.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource$_run_closure3_closure6.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource$_run_closure3_closure6_closure9.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/DataSource.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/UrlMappings$__clinit__closure1.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/UrlMappings$__clinit__closure1_closure2.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/UrlMappings$__clinit__closure1_closure2_closure3.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/UrlMappings.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/ParentDelegatingClassLoader.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/SearchFirstURLClassLoader.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatLoader.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatServer$_preStart_closure4.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatServer$_preStart_closure4_closure7.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatServer$_start_closure1.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatServer$_start_closure2.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatServer$_start_closure2_closure5.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatServer$_start_closure2_closure5_closure6.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatServer$_start_closure3.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatServer.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/grails/tomcat/TomcatServerFactory.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/org/overpaas/management/webapp/EntityControllerTests.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/resources$_run_closure1.class
+org.overpaas.management.webapp/web-app/WEB-INF/classes/resources.class
+org.overpaas.management.webapp/web-app/index.html
+org.overpaas.management.webapp/web-app/js/jquery/themes/classic/dot_for_ie.gif
+org.overpaas.management.webapp/web-app/js/jquery/themes/classic/throbber.gif
+org.overpaas.management.webapp/web-app/js/jquery/themes/default-rtl/throbber.gif
+org.overpaas.management.webapp/web-app/js/jquery/themes/default/throbber.gif
+org.overpaas.policies.monterey/.project
+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
@@ -6844,6 +7124,7 @@ policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntit
 policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntity.java
 policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
 pom.xml
+sandbox/brooklyn-sandbox-test-framework/README.md
 sandbox/brooklyn-sandbox-test-framework/etc/exampl-catalog.bom
 sandbox/brooklyn-sandbox-test-framework/etc/example-catalog-test.bom
 sandbox/brooklyn-sandbox-test-framework/etc/nginx-test-examples.yml
@@ -6912,41 +7193,57 @@ sandbox/camp/src/test/resources/postgresql-chef.yaml
 sandbox/camp/src/test/resources/visitors-creation-script.sql
 sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java
 sandbox/examples/src/main/resources/gemfire/gemfire-myapp.jar
+sandbox/jsgui/src/main/resources/assets/images/Sorting icons.psd
 sandbox/jsgui/src/main/resources/assets/tpl/apps/activities.html
 sandbox/jsgui/src/main/resources/assets/tpl/apps/activity-details.html
+sandbox/jsgui/src/main/webapp/assets/images/Sorting icons.psd
 sandbox/jsgui/src/main/webapp/assets/tpl/apps/activities.html
 sandbox/jsgui/src/main/webapp/assets/tpl/apps/activity-details.html
+sandbox/jsgui/src/test/resources/log4j.properties
 sandbox/rest/pom.xml
 sandbox/rest/src/main/java/brooklyn/rest/BrooklynRestApi.java
 sandbox/rest/src/main/java/brooklyn/rest/api/ApiError.java
 sandbox/rest/src/main/java/brooklyn/rest/api/Application.java
 sandbox/rest/src/main/java/brooklyn/rest/api/ApplicationSpec.java
+sandbox/rest/src/main/java/brooklyn/rest/api/ApplicationSummary.java
 sandbox/rest/src/main/java/brooklyn/rest/api/CatalogEntitySummary.java
 sandbox/rest/src/main/java/brooklyn/rest/api/CatalogPolicySummary.java
 sandbox/rest/src/main/java/brooklyn/rest/api/ConfigSummary.java
 sandbox/rest/src/main/java/brooklyn/rest/api/EffectorSummary.java
 sandbox/rest/src/main/java/brooklyn/rest/api/Entity.java
 sandbox/rest/src/main/java/brooklyn/rest/api/EntitySpec.java
+sandbox/rest/src/main/java/brooklyn/rest/api/EntitySummary.java
+sandbox/rest/src/main/java/brooklyn/rest/api/Location.java
 sandbox/rest/src/main/java/brooklyn/rest/api/LocationSpec.java
+sandbox/rest/src/main/java/brooklyn/rest/api/LocationSummary.java
+sandbox/rest/src/main/java/brooklyn/rest/api/PolicySummary.java
 sandbox/rest/src/main/java/brooklyn/rest/api/SensorSummary.java
 sandbox/rest/src/main/java/brooklyn/rest/api/TaskSummary.java
 sandbox/rest/src/main/java/brooklyn/rest/apidoc/Apidoc.java
 sandbox/rest/src/main/java/brooklyn/rest/apidoc/ApidocEndpoint.java
 sandbox/rest/src/main/java/brooklyn/rest/apidoc/ApidocHelpMessageBodyWriter.java
 sandbox/rest/src/main/java/brooklyn/rest/apidoc/ApidocResource.java
+sandbox/rest/src/main/java/brooklyn/rest/core/BrooklynCatalog.java
 sandbox/rest/src/main/java/brooklyn/rest/core/BrooklynRestResourceUtils.java
 sandbox/rest/src/main/java/brooklyn/rest/core/EntityLocationUtils.java
+sandbox/rest/src/main/java/brooklyn/rest/core/LocationStore.java
 sandbox/rest/src/main/java/brooklyn/rest/core/WebResourceUtils.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/ApiError.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/ApplicationSpec.java
+sandbox/rest/src/main/java/brooklyn/rest/domain/ApplicationSummary.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/CatalogEntitySummary.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/CatalogPolicySummary.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/ConfigSummary.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/EffectorSummary.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/EntitySpec.java
+sandbox/rest/src/main/java/brooklyn/rest/domain/EntitySummary.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/LocationSpec.java
+sandbox/rest/src/main/java/brooklyn/rest/domain/LocationSummary.java
+sandbox/rest/src/main/java/brooklyn/rest/domain/PolicySummary.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/SensorSummary.java
 sandbox/rest/src/main/java/brooklyn/rest/domain/TaskSummary.java
+sandbox/rest/src/main/java/brooklyn/rest/legacy/BrooklynCatalog.java
+sandbox/rest/src/main/java/brooklyn/rest/legacy/LocationStore.java
 sandbox/rest/src/main/java/brooklyn/rest/resources/AbstractBrooklynRestResource.java
 sandbox/rest/src/main/java/brooklyn/rest/resources/ActivityResource.java
 sandbox/rest/src/main/java/brooklyn/rest/resources/ApidocResource.java
@@ -6954,6 +7251,7 @@ sandbox/rest/src/main/java/brooklyn/rest/resources/ApplicationResource.java
 sandbox/rest/src/main/java/brooklyn/rest/resources/ApplicationSpecResource.java
 sandbox/rest/src/main/java/brooklyn/rest/resources/CatalogResource.java
 sandbox/rest/src/main/java/brooklyn/rest/resources/ConfigResource.java
+sandbox/rest/src/main/java/brooklyn/rest/resources/EffectorResource.java
 sandbox/rest/src/main/java/brooklyn/rest/resources/EntityResource.java
 sandbox/rest/src/main/java/brooklyn/rest/resources/LocationResource.java
 sandbox/rest/src/main/java/brooklyn/rest/resources/PolicyResource.java
@@ -6962,6 +7260,7 @@ sandbox/rest/src/main/java/brooklyn/rest/resources/VersionResource.java
 sandbox/rest/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java
 sandbox/rest/src/main/java/brooklyn/rest/util/EntityLocationUtils.java
 sandbox/rest/src/main/java/brooklyn/rest/util/WebResourceUtils.java
+sandbox/rest/src/main/resources/assets/images/Sorting icons.psd
 sandbox/rest/src/main/resources/assets/tpl/apps/activities.html
 sandbox/rest/src/main/resources/assets/tpl/apps/activity-details.html
 sandbox/rest/src/main/webapp/WEB-INF/web.xml
@@ -6981,6 +7280,7 @@ sandbox/rest/src/test/java/brooklyn/rest/api/LocationSummaryTest.java
 sandbox/rest/src/test/java/brooklyn/rest/api/LocationTest.java
 sandbox/rest/src/test/java/brooklyn/rest/api/SensorSummaryTest.java
 sandbox/rest/src/test/java/brooklyn/rest/core/EntityLocationUtilsTest.java
+sandbox/rest/src/test/java/brooklyn/rest/core/LocationStoreTest.java
 sandbox/rest/src/test/java/brooklyn/rest/domain/ApplicationSpecTest.java
 sandbox/rest/src/test/java/brooklyn/rest/domain/ApplicationTest.java
 sandbox/rest/src/test/java/brooklyn/rest/domain/EffectorSummaryTest.java
@@ -6989,10 +7289,12 @@ sandbox/rest/src/test/java/brooklyn/rest/domain/EntitySummaryTest.java
 sandbox/rest/src/test/java/brooklyn/rest/domain/LocationSpecTest.java
 sandbox/rest/src/test/java/brooklyn/rest/domain/LocationSummaryTest.java
 sandbox/rest/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java
+sandbox/rest/src/test/java/brooklyn/rest/legacy/LocationStoreTest.java
 sandbox/rest/src/test/java/brooklyn/rest/mock/CapitalizePolicy.java
 sandbox/rest/src/test/java/brooklyn/rest/mock/RestMockApp.java
 sandbox/rest/src/test/java/brooklyn/rest/mock/RestMockSimpleEntity.java
 sandbox/rest/src/test/java/brooklyn/rest/resources/ActivityResourceTest.java
+sandbox/rest/src/test/java/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java
 sandbox/rest/src/test/java/brooklyn/rest/resources/ApplicationResourceTest.java
 sandbox/rest/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
 sandbox/rest/src/test/java/brooklyn/rest/resources/EntityResourceTest.java
@@ -7025,6 +7327,7 @@ sandbox/rest/src/test/resources/fixtures/sensor-summary-list.json
 sandbox/rest/src/test/resources/fixtures/sensor-summary.json
 sandbox/rest/src/test/resources/fixtures/service-state.json
 sandbox/rest/src/test/resources/fixtures/task-summary-list.json
+sandbox/rest/src/test/resources/logback-test.xml
 software/base
 software/base/pom.xml
 software/base/src/main/java/brooklyn/entity/basic/AbstractSoftwareProcessDriver.java
@@ -7579,6 +7882,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/src/main/resources/brooklyn/entity/database/mssql/checkrunningmssql.bat
 software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/checkrunningmssql.bat
 software/database/src/test/java/brooklyn/entity/database/mysql/MySqlRestartIntegrationTest.java
@@ -7637,9 +7947,87 @@ 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
 test-support/src/main/resources/logging.properties
 usage/all/start-mgmt-web.sh
 usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/files/conf/logback.xml
@@ -7983,6 +8371,7 @@ usage/cli/src/test/resources/example-app.yaml
 usage/dist/LICENSE.txt
 usage/dist/src/main/java/brooklyn/Main.groovy
 usage/jsgui/src/main/webapp/LICENSE
+usage/jsgui/src/main/webapp/assets/images/Sorting icons.psd
 usage/jsgui/src/main/webapp/assets/tpl/apps/activities.html
 usage/jsgui/src/main/webapp/assets/tpl/apps/activity-details.html
 usage/jsgui/src/main/webapp/assets/tpl/apps/activity-full-details.html
@@ -8126,6 +8515,10 @@ usage/logback-includes/src/main/resources/logback-custom.xml
 usage/logback-includes/src/main/resources/logback-main.xml
 usage/logback-xml/pom.xml
 usage/logback-xml/src/main/resources/logback.xml
+usage/qa/src/main/java/brooklyn/qa/longevity/MonitorUtils.groovy
+usage/qa/src/main/java/brooklyn/qa/longevity/webcluster/WebClusterApp.groovy
+usage/qa/src/main/resources/log4j.properties
+usage/rest
 usage/rest-api
 usage/rest-api/pom.xml
 usage/rest-api/src/main/java/brooklyn/rest/api/AccessApi.java
@@ -8536,6 +8929,7 @@ usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/NullServletConfigP
 usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/TestShutdownHandler.java
 usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerTest.java
 usage/rest-server/src/test/resources/brooklyn/scanning.catalog.bom
+usage/rest/a
 usage/rest/pom.xml
 usage/rest/src/main/java/brooklyn/rest/BrooklynRestApi.java
 usage/rest/src/main/java/brooklyn/rest/BrooklynWebConfig.java
@@ -8545,23 +8939,31 @@ usage/rest/src/main/java/brooklyn/rest/apidoc/ApidocHelpMessageBodyWriter.java
 usage/rest/src/main/java/brooklyn/rest/apidoc/ApidocResource.java
 usage/rest/src/main/java/brooklyn/rest/domain/ApiError.java
 usage/rest/src/main/java/brooklyn/rest/domain/ApplicationSpec.java
+usage/rest/src/main/java/brooklyn/rest/domain/ApplicationSummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/CatalogEntitySummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/CatalogItemSummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/CatalogPolicySummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/ConfigSummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/EffectorSummary.java
+usage/rest/src/main/java/brooklyn/rest/domain/EntityConfigSummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/EntitySpec.java
+usage/rest/src/main/java/brooklyn/rest/domain/EntitySummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/LocationSpec.java
+usage/rest/src/main/java/brooklyn/rest/domain/LocationSummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/PolicyConfigSummary.java
+usage/rest/src/main/java/brooklyn/rest/domain/PolicySummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/ScriptExecutionSummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/SensorSummary.java
 usage/rest/src/main/java/brooklyn/rest/domain/TaskSummary.java
+usage/rest/src/main/java/brooklyn/rest/legacy/BrooklynCatalog.java
+usage/rest/src/main/java/brooklyn/rest/legacy/LocationStore.java
 usage/rest/src/main/java/brooklyn/rest/resources/AbstractBrooklynRestResource.java
 usage/rest/src/main/java/brooklyn/rest/resources/ActivityResource.java
 usage/rest/src/main/java/brooklyn/rest/resources/ApidocResource.java
 usage/rest/src/main/java/brooklyn/rest/resources/ApplicationResource.java
 usage/rest/src/main/java/brooklyn/rest/resources/CatalogResource.java
 usage/rest/src/main/java/brooklyn/rest/resources/ConfigResource.java
+usage/rest/src/main/java/brooklyn/rest/resources/EffectorResource.java
 usage/rest/src/main/java/brooklyn/rest/resources/EntityConfigResource.java
 usage/rest/src/main/java/brooklyn/rest/resources/EntityResource.java
 usage/rest/src/main/java/brooklyn/rest/resources/LocationResource.java
@@ -8595,7 +8997,9 @@ usage/rest/src/test/java/brooklyn/rest/domain/EntitySummaryTest.java
 usage/rest/src/test/java/brooklyn/rest/domain/LocationSpecTest.java
 usage/rest/src/test/java/brooklyn/rest/domain/LocationSummaryTest.java
 usage/rest/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java
+usage/rest/src/test/java/brooklyn/rest/legacy/LocationStoreTest.java
 usage/rest/src/test/java/brooklyn/rest/resources/ActivityResourceTest.java
+usage/rest/src/test/java/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java
 usage/rest/src/test/java/brooklyn/rest/resources/ApplicationResourceTest.java
 usage/rest/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
 usage/rest/src/test/java/brooklyn/rest/resources/DelegatingPrintStream.java
@@ -8636,6 +9040,10 @@ usage/rest/src/test/resources/fixtures/sensor-summary-list.json
 usage/rest/src/test/resources/fixtures/sensor-summary.json
 usage/rest/src/test/resources/fixtures/service-state.json
 usage/rest/src/test/resources/fixtures/task-summary-list.json
+usage/rest/src/test/resources/log4j.properties
+usage/rest/src/test/resources/logback-test.xml
+usage/test-framework
+usage/test-framework/README.md
 usage/test-framework/etc/exampl-catalog.bom
 usage/test-framework/etc/example-catalog-test.bom
 usage/test-framework/etc/example-catalog.bom
@@ -8649,8 +9057,16 @@ usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/Infrastruc
 usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.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
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommandDriver.java
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommandImpl.java
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommandLifecycleEffectorTasks.java
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommandSshDriver.java
 usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommandTest.java
 usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleCommandTestImpl.java
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleShellCommand.java
+usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/SimpleShellCommandImpl.java
+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/TestCase.java
@@ -8662,6 +9078,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/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
 usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/SimpleCommandScriptIntegrationTest.java
 usage/test-framework/src/test/java/org/apache/brooklyn/test/framework/SimpleShellCommandIntegrationTest.java
@@ -8673,12 +9091,14 @@ 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/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
 usage/test-framework/src/test/resources/test-framework-examples/example-catalog.bom
 usage/test-framework/src/test/resources/test-framework-examples/nginx-test-examples.yml
 usage/test-framework/src/test/resources/test-framework-examples/testhttpcall-examples.yml
 usage/test-framework/src/test/resources/test-framework-examples/tomcat-test-examples.yml
+usage/test-support
 usage/test-support/pom.xml
 usage/test-support/src/main/java/brooklyn/test/Asserts.java
 usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.java
@@ -8687,6 +9107,7 @@ usage/test-support/src/main/java/brooklyn/test/LoggingVerboseReporter.java
 usage/test-support/src/main/java/brooklyn/test/NetworkingTestUtils.java
 usage/test-support/src/main/java/brooklyn/test/PerformanceTestUtils.java
 usage/test-support/src/main/java/brooklyn/test/StatusListener.java
+usage/test-support/src/main/java/brooklyn/test/TestUtils.groovy
 usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.java
 usage/test-support/src/main/java/brooklyn/test/VerboseReporter.java
 usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.java
@@ -8694,6 +9115,7 @@ usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java
 usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
 usage/test-support/src/main/java/org/apache/brooklyn/test/NetworkingTestUtils.java
 usage/test-support/src/main/java/org/apache/brooklyn/test/PerformanceTestUtils.java
+usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.groovy
 usage/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.java
 usage/test-support/src/main/java/org/apache/brooklyn/test/TrustingSslSocketFactory.java
 usage/test-support/src/main/java/org/apache/brooklyn/test/WebAppMonitor.java
@@ -8705,6 +9127,12 @@ usage/test-support/src/main/java/org/apache/brooklyn/test/performance/Performanc
 usage/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestResult.java
 usage/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestUtils.java
 usage/test-support/src/main/resources/brooklyn/logback-test-file.xml
+usage/test-support/src/main/resources/brooklyn/logback-test.xml
+usage/test-support/src/main/resources/log4j.properties
+usage/test-support/src/main/resources/logback-test.xml
+usage/test-support/src/main/resources/logging.properties
+usage/test-support/src/main/resources/test-log4j.properties
+usage/web-console/web-app/images/datatables/Sorting icons.psd
 util/jmx/jmxmp-ssl-agent/pom.xml
 util/jmx/jmxmp-ssl-agent/src/main/java/brooklyn/util/jmx/jmxmp/JmxmpAgent.java
 util/jmx/jmxmp-ssl-agent/src/test/java/brooklyn/util/jmx/jmxmp/JmxmpAgentSslTest.java
@@ -9283,3 +9711,12 @@ utils/test-support/src/main/java/org/apache/brooklyn/test/support/TestResourceUn
 utils/test-support/src/main/java/org/apache/brooklyn/test/support/VerboseReporter.java
 utils/test-support/src/main/resources/brooklyn/logback-appender-file.xml
 utils/test-support/src/main/resources/logback-test.xml
+web-console/web-app/images/datatables/Sorting icons.psd
+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/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