This closes #805
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e3db4e3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e3db4e3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e3db4e3c Branch: refs/heads/master Commit: e3db4e3cc26d4977b127146085e26c4632537d08 Parents: 50b18e7 3ffbdd9 Author: Aled Sage <[email protected]> Authored: Wed Aug 12 16:54:48 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 12 16:54:48 2015 +0100 ---------------------------------------------------------------------- .../test/java/brooklyn/BrooklynVersionTest.java | 3 +- .../brooklyn/camp/lite/CampYamlLiteTest.java | 6 +- .../brooklyn/camp/lite/TestAppAssembly.java | 3 +- .../camp/lite/TestAppAssemblyInstantiator.java | 4 +- .../catalog/internal/CatalogDtoTest.java | 7 +- .../catalog/internal/CatalogVersioningTest.java | 3 +- ...stomAggregatingEnricherDeprecatedTest.groovy | 6 +- .../enricher/CustomAggregatingEnricherTest.java | 2 +- .../java/brooklyn/enricher/EnrichersTest.java | 2 +- ...SensorPropagatingEnricherDeprecatedTest.java | 2 +- .../enricher/SensorPropagatingEnricherTest.java | 2 +- .../TransformingEnricherDeprecatedTest.groovy | 4 +- .../enricher/TransformingEnricherTest.java | 2 +- .../enricher/basic/BasicEnricherTest.java | 4 +- .../entity/BrooklynAppLiveTestSupport.java | 4 +- .../entity/BrooklynAppUnitTestSupport.java | 4 +- .../entity/EffectorSayHiGroovyTest.groovy | 2 +- .../entity/EntityPreManagementTest.java | 6 +- .../basic/AbstractApplicationLegacyTest.java | 4 +- .../entity/basic/AbstractEntityLegacyTest.java | 6 +- .../brooklyn/entity/basic/AttributeMapTest.java | 4 +- .../brooklyn/entity/basic/AttributeTest.java | 2 +- .../entity/basic/BasicStartableTest.java | 6 +- .../entity/basic/BrooklynShutdownHooksTest.java | 4 +- .../basic/ConfigEntityInheritanceTest.java | 2 +- .../entity/basic/ConfigMapGroovyTest.groovy | 2 +- .../brooklyn/entity/basic/DataEntityTest.java | 4 +- .../basic/DependentConfigurationTest.java | 2 +- .../entity/basic/DynamicEntityTest.java | 2 +- .../brooklyn/entity/basic/DynamicGroupTest.java | 4 +- .../brooklyn/entity/basic/EntitiesTest.java | 2 +- .../basic/EntityConfigMapUsageLegacyTest.java | 4 +- .../entity/basic/EntityConfigMapUsageTest.java | 2 +- .../brooklyn/entity/basic/EntityConfigTest.java | 2 +- .../entity/basic/EntityFunctionsTest.java | 2 +- .../entity/basic/EntityPredicatesTest.java | 2 +- .../entity/basic/EntityRegistrationTest.java | 2 +- .../brooklyn/entity/basic/EntitySpecTest.java | 6 +- .../entity/basic/EntitySubscriptionTest.java | 4 +- .../entity/basic/EntitySuppliersTest.java | 2 +- .../brooklyn/entity/basic/EntityTypeTest.java | 4 +- .../basic/MapConfigKeyAndFriendsMoreTest.java | 2 +- ...apListAndOtherStructuredConfigKeyTest.groovy | 4 +- .../entity/basic/PolicyRegistrationTest.java | 4 +- .../entity/basic/ServiceStateLogicTest.java | 4 +- .../drivers/EntityDriverRegistryTest.java | 2 +- .../downloads/BasicDownloadsRegistryTest.java | 4 +- .../DownloadProducerFromLocalRepoTest.java | 4 +- .../DownloadProducerFromPropertiesTest.java | 4 +- .../downloads/DownloadSubstitutersTest.java | 2 +- .../entity/effector/EffectorBasicTest.java | 2 +- .../effector/EffectorConcatenateTest.java | 4 +- .../entity/effector/EffectorTaskTest.java | 2 +- .../entity/group/DynamicClusterTest.java | 4 +- ...DynamicClusterWithAvailabilityZonesTest.java | 2 +- .../entity/group/DynamicFabricTest.java | 4 +- .../entity/group/DynamicMultiGroupTest.java | 6 +- .../entity/group/DynamicRegionsFabricTest.java | 2 +- .../entity/group/GroupPickUpEntitiesTest.java | 2 +- .../java/brooklyn/entity/group/GroupTest.java | 2 +- .../group/MembershipTrackingPolicyTest.java | 2 +- .../entity/group/QuarantineGroupTest.java | 2 +- .../BalancingNodePlacementStrategyTest.java | 2 +- .../ProportionalZoneFailureDetectorTest.java | 2 +- .../ApplicationBuilderOverridingTest.java | 6 +- .../entity/proxying/EntityManagerTest.java | 6 +- .../entity/proxying/EntityProxyTest.java | 2 +- .../proxying/InternalEntityFactoryTest.java | 10 +- .../entity/rebind/ActivePartialRebindTest.java | 2 +- .../entity/rebind/RebindCatalogItemTest.java | 2 +- ...talogWhenCatalogPersistenceDisabledTest.java | 3 +- .../entity/rebind/RebindEnricherTest.java | 6 +- .../rebind/RebindEntityDynamicTypeInfoTest.java | 4 +- .../entity/rebind/RebindEntityTest.java | 6 +- .../entity/rebind/RebindFailuresTest.java | 2 +- .../brooklyn/entity/rebind/RebindFeedTest.java | 4 +- .../entity/rebind/RebindFeedWithHaTest.java | 4 +- .../brooklyn/entity/rebind/RebindGroupTest.java | 2 +- .../rebind/RebindLocalhostLocationTest.java | 2 +- .../entity/rebind/RebindLocationTest.java | 2 +- .../entity/rebind/RebindManagerSorterTest.java | 4 +- .../entity/rebind/RebindManagerTest.java | 4 +- .../entity/rebind/RebindPolicyTest.java | 4 +- .../rebind/RebindSshMachineLocationTest.java | 2 +- .../entity/rebind/RebindTestFixtureWithApp.java | 5 +- .../brooklyn/entity/rebind/RebindTestUtils.java | 2 +- ...ntoPersisterInMemorySizeIntegrationTest.java | 2 +- .../BrooklynMementoPersisterTestFixture.java | 4 +- .../persister/FileBasedObjectStoreTest.java | 2 +- .../persister/XmlMementoSerializerTest.java | 6 +- .../transformer/CompoundTransformerTest.java | 2 +- .../brooklyn/entity/trait/FailingEntity.java | 3 +- .../entity/trait/FailingEntityImpl.java | 2 +- .../entity/trait/StartableMethodsTest.java | 2 +- .../event/feed/ConfigToAttributesTest.java | 4 +- .../java/brooklyn/event/feed/PollerTest.java | 2 +- .../event/feed/function/FunctionFeedTest.java | 2 +- .../feed/http/HttpFeedIntegrationTest.java | 2 +- .../brooklyn/event/feed/http/HttpFeedTest.java | 2 +- .../feed/shell/ShellFeedIntegrationTest.java | 2 +- .../event/feed/ssh/SshFeedIntegrationTest.java | 2 +- .../WindowsPerformanceCounterFeedLiveTest.java | 2 +- .../WindowsPerformanceCounterFeedTest.java | 2 +- .../PortForwardManagerLocationResolverTest.java | 2 +- .../access/PortForwardManagerRebindTest.java | 4 +- .../location/access/PortForwardManagerTest.java | 2 +- .../location/basic/AbstractLocationTest.java | 2 +- ...regatingMachineProvisioningLocationTest.java | 2 +- .../basic/ByonLocationResolverTest.java | 2 +- ...stMachineProvisioningLocationRebindTest.java | 2 +- ...ixedListMachineProvisioningLocationTest.java | 2 +- .../basic/HostLocationResolverTest.java | 2 +- .../basic/LocalhostLocationResolverTest.java | 2 +- ...ocalhostMachineProvisioningLocationTest.java | 2 +- .../location/basic/LocationConfigTest.java | 2 +- .../location/basic/LocationExtensionsTest.java | 2 +- .../location/basic/LocationPredicatesTest.java | 4 +- .../location/basic/LocationRegistryTest.java | 2 +- .../location/basic/MachineDetailsTest.java | 2 +- .../location/basic/MultiLocationRebindTest.java | 2 +- .../basic/MultiLocationResolverTest.java | 2 +- .../location/basic/MultiLocationTest.java | 2 +- .../SingleMachineLocationResolverTest.java | 2 +- .../SingleMachineProvisioningLocationTest.java | 2 +- .../SshMachineLocationIntegrationTest.java | 4 +- .../location/basic/SshMachineLocationTest.java | 4 +- .../basic/TestPortSupplierLocation.java | 2 +- .../location/cloud/CloudMachineNamerTest.java | 6 +- .../location/cloud/CustomMachineNamerTest.java | 6 +- .../AcmeEntitlementManagerTestFixture.java | 2 +- .../entitlement/EntitlementsTest.java | 2 +- .../entitlement/EntityEntitlementTest.java | 2 +- .../ha/HighAvailabilityManagerInMemoryTest.java | 4 +- .../HighAvailabilityManagerSplitBrainTest.java | 4 +- .../ha/HighAvailabilityManagerTestFixture.java | 2 +- .../brooklyn/management/ha/HotStandbyTest.java | 6 +- .../management/ha/TestEntityFailingRebind.java | 3 +- .../brooklyn/management/ha/WarmStandbyTest.java | 4 +- .../management/internal/AccessManagerTest.java | 6 +- .../internal/EntityExecutionManagerTest.java | 6 +- .../internal/LocalManagementContextTest.java | 2 +- .../internal/LocalSubscriptionManagerTest.java | 2 +- .../brooklyn/management/osgi/OsgiPathTest.java | 2 +- .../osgi/OsgiVersionMoreEntityTest.java | 4 +- .../brooklyn/policy/basic/PolicyConfigTest.java | 2 +- .../policy/basic/PolicySubscriptionTest.java | 2 +- .../EntityCleanupLongevityTestFixture.java | 6 +- .../qa/performance/AbstractPerformanceTest.java | 2 +- .../qa/performance/EntityPerformanceTest.java | 2 +- .../EntityPersistencePerformanceTest.java | 2 +- .../SubscriptionPerformanceTest.java | 2 +- .../brooklyn/test/entity/BlockingEntity.java | 45 - .../test/entity/BlockingEntityImpl.java | 59 - .../entity/LocalManagementContextForTests.java | 157 - .../brooklyn/test/entity/NoopStartable.java | 29 - .../brooklyn/test/entity/TestApplication.java | 60 - .../test/entity/TestApplicationImpl.java | 98 - .../entity/TestApplicationNoEnrichersImpl.java | 29 - .../java/brooklyn/test/entity/TestCluster.java | 30 - .../brooklyn/test/entity/TestClusterImpl.java | 65 - .../java/brooklyn/test/entity/TestEntity.java | 113 - .../brooklyn/test/entity/TestEntityImpl.java | 186 - .../test/entity/TestEntityNoEnrichersImpl.java | 32 - .../entity/TestEntityTransientCopyImpl.java | 28 - .../util/ssh/BashCommandsIntegrationTest.java | 2 +- .../test/java/brooklyn/util/task/TasksTest.java | 4 +- .../util/text/TemplateProcessorTest.java | 4 +- .../brooklyn/test/entity/BlockingEntity.java | 45 + .../test/entity/BlockingEntityImpl.java | 59 + .../entity/LocalManagementContextForTests.java | 157 + .../brooklyn/test/entity/NoopStartable.java | 29 + .../brooklyn/test/entity/TestApplication.java | 60 + .../test/entity/TestApplicationImpl.java | 98 + .../entity/TestApplicationNoEnrichersImpl.java | 29 + .../brooklyn/test/entity/TestCluster.java | 30 + .../brooklyn/test/entity/TestClusterImpl.java | 65 + .../apache/brooklyn/test/entity/TestEntity.java | 113 + .../brooklyn/test/entity/TestEntityImpl.java | 186 + .../test/entity/TestEntityNoEnrichersImpl.java | 32 + .../entity/TestEntityTransientCopyImpl.java | 28 + .../big_examples/global-web-fabric/index.md | 2 +- .../appserver-clustered-w-db-concise.yaml | 2 +- .../brooklyn/demo/GlobalWebFabricExample.java | 9 +- .../brooklyn/demo/CumulusRDFApplication.java | 4 +- .../brooklyn/demo/NodeJsTodoApplication.java | 2 +- .../brooklyn/demo/SingleWebServerExample.java | 5 +- .../demo/WebClusterDatabaseExample.java | 11 +- .../demo/WebClusterDatabaseExampleApp.java | 11 +- .../apache/brooklyn/demo/WebClusterExample.java | 9 +- .../apache/brooklyn/demo/nodejs-riak-todo.yaml | 2 +- .../org/apache/brooklyn/demo/nodejs-todo.yaml | 2 +- ...lusterDatabaseExampleAppIntegrationTest.java | 8 +- .../persister/jclouds/BlobStoreCleaner.java | 2 +- .../persister/jclouds/BlobStoreExpiryTest.java | 2 +- .../rebind/persister/jclouds/BlobStoreTest.java | 2 +- ...ailabilityManagerJcloudsObjectStoreTest.java | 2 +- .../JcloudsBlobStoreBasedObjectStoreTest.java | 2 +- .../jclouds/JcloudsExpect100ContinueTest.java | 2 +- .../JcloudsObjectStoreAccessorWriterTest.java | 2 +- .../jclouds/AbstractJcloudsLiveTest.java | 2 +- .../JcloudsByonLocationResolverTest.java | 2 +- .../jclouds/JcloudsLocationMetadataTest.java | 2 +- .../jclouds/JcloudsLocationResolverTest.java | 2 +- .../location/jclouds/JcloudsLocationTest.java | 2 +- .../location/jclouds/LiveTestEntity.java | 4 +- .../jclouds/RebindJcloudsLocationLiveTest.java | 2 +- .../os/AdvertiseWinrmLoginPolicyTest.java | 2 +- .../policy/os/CreateUserPolicyLiveTest.java | 2 +- .../policy/os/CreateUserPolicyTest.java | 2 +- .../enricher/HttpLatencyDetectorTest.java | 4 +- .../brooklyn/enricher/RebindEnricherTest.java | 2 +- .../enricher/TimeFractionDeltaEnricherTest.java | 4 +- .../entity/brooklyn/BrooklynMetricsTest.java | 10 +- .../autoscaling/AutoScalerPolicyMetricTest.java | 6 +- .../autoscaling/AutoScalerPolicyRebindTest.java | 4 +- .../AutoScalerPolicyReconfigurationTest.java | 4 +- .../autoscaling/AutoScalerPolicyTest.java | 4 +- .../autoscaling/LocallyResizableEntity.java | 3 +- .../AbstractFollowTheSunPolicyTest.java | 4 +- .../ha/ConnectionFailureDetectorTest.java | 4 +- .../brooklyn/policy/ha/HaPolicyRebindTest.java | 4 +- ...ServiceFailureDetectorStabilizationTest.java | 6 +- .../policy/ha/ServiceFailureDetectorTest.java | 6 +- .../brooklyn/policy/ha/ServiceReplacerTest.java | 6 +- .../policy/ha/ServiceRestarterTest.java | 6 +- .../AbstractLoadBalancingPolicyTest.java | 2 +- .../BalanceableWorkerPoolTest.java | 2 +- .../ItemsInContainersGroupTest.java | 2 +- .../LoadBalancingPolicyConcurrencyTest.java | 2 +- .../brooklyn/entity/AbstractEc2LiveTest.java | 2 +- .../entity/AbstractGoogleComputeLiveTest.java | 2 +- .../entity/AbstractSoftlayerLiveTest.java | 2 +- .../entity/basic/SameServerEntityTest.java | 4 +- .../basic/SoftwareProcessEntityRebindTest.java | 2 +- .../entity/basic/SoftwareProcessEntityTest.java | 2 +- ...SoftwareProcessSshDriverIntegrationTest.java | 2 +- ...ftwareProcessAndChildrenIntegrationTest.java | 2 +- .../basic/lifecycle/StartStopSshDriverTest.java | 8 +- .../entity/brooklynnode/BrooklynNodeTest.java | 2 +- .../brooklyn/entity/chef/ChefConfigsTest.java | 2 +- .../chef/ChefServerTasksIntegrationTest.java | 2 +- .../brooklyn/entity/java/EntityPollingTest.java | 2 +- ...SoftwareProcessSshDriverIntegrationTest.java | 2 +- .../brooklyn/entity/java/JmxSupportTest.java | 2 +- .../entity/java/VanillaJavaAppRebindTest.java | 2 +- .../entity/java/VanillaJavaAppTest.java | 2 +- .../entity/pool/AbstractServerPoolTest.java | 4 +- .../entity/pool/ServerPoolLiveTest.java | 4 +- .../pool/ServerPoolLocationResolverTest.java | 4 +- .../entity/pool/ServerPoolRebindTest.java | 2 +- .../brooklyn/entity/pool/ServerPoolTest.java | 2 +- .../entity/software/AbstractDockerLiveTest.java | 2 +- .../MachineLifecycleEffectorTasksTest.java | 2 +- .../entity/software/SoftwareEffectorTest.java | 2 +- .../entity/software/SshEffectorTasksTest.java | 2 +- .../software/http/HttpRequestSensorTest.java | 4 +- .../software/ssh/SshCommandIntegrationTest.java | 4 +- .../brooklyn/event/feed/jmx/JmxFeedTest.java | 8 +- .../event/feed/jmx/RebindJmxFeedTest.java | 4 +- .../basic/WinRmMachineLocationLiveTest.java | 6 +- .../usage/ApplicationUsageTrackingTest.java | 4 +- .../management/usage/UsageListenerTest.java | 4 +- .../crate/CrateNodeIntegrationTest.java | 2 +- .../mariadb/MariaDbIntegrationTest.java | 2 +- .../database/mysql/MySqlClusterTestHelper.java | 2 +- .../postgresql/PostgreSqlIntegrationTest.java | 2 +- .../rubyrep/RubyRepIntegrationTest.java | 2 +- .../activemq/ActiveMQIntegrationTest.java | 2 +- .../messaging/kafka/KafkaIntegrationTest.java | 2 +- .../messaging/qpid/QpidIntegrationTest.java | 2 +- .../messaging/rabbit/RabbitIntegrationTest.java | 2 +- .../zookeeper/ZooKeeperEnsembleLiveTest.java | 2 +- .../bind/BindDnsServerIntegrationTest.java | 2 +- .../network/bind/BindDnsServerLiveTest.java | 2 +- .../entity/nosql/couchdb/CouchDBNode.java | 3 +- .../entity/nosql/couchdb/CouchDBNodeImpl.java | 4 +- .../nosql/elasticsearch/ElasticSearchNode.java | 3 +- .../entity/nosql/riak/RiakNodeImpl.java | 3 +- .../nosql/riak/riak-with-webapp-cluster.yaml | 4 +- .../entity/nosql/riak/riak-with-webapp.yaml | 2 +- .../apache/brooklyn/entity/nosql/riak/riak.md | 2 +- ...assandraDatacenterRebindIntegrationTest.java | 2 +- .../nosql/couchbase/CouchbaseOfflineTest.java | 2 +- .../nosql/couchdb/AbstractCouchDBNodeTest.java | 2 +- .../nosql/couchdb/CouchDBClusterLiveTest.java | 2 +- .../ElasticSearchNodeIntegrationTest.java | 2 +- .../nosql/mongodb/MongoDBIntegrationTest.java | 2 +- .../MongoDBConfigServerIntegrationTest.java | 2 +- .../redis/RedisClusterIntegrationTest.java | 2 +- .../nosql/redis/RedisIntegrationTest.java | 2 +- .../nosql/riak/RiakNodeIntegrationTest.java | 2 +- software/webapp/pom.xml | 4 +- .../entity/dns/AbstractGeoDnsService.java | 59 - .../entity/dns/AbstractGeoDnsServiceImpl.java | 373 -- .../dns/geoscaling/GeoscalingDnsService.java | 70 - .../geoscaling/GeoscalingDnsServiceImpl.java | 200 - .../geoscaling/GeoscalingScriptGenerator.java | 79 - .../dns/geoscaling/GeoscalingWebClient.java | 459 -- .../entity/proxy/AbstractController.java | 74 - .../entity/proxy/AbstractControllerImpl.java | 516 -- .../proxy/AbstractNonProvisionedController.java | 28 - .../AbstractNonProvisionedControllerImpl.java | 277 -- .../brooklyn/entity/proxy/LoadBalancer.java | 124 - .../entity/proxy/LoadBalancerCluster.java | 37 - .../entity/proxy/LoadBalancerClusterImpl.java | 76 - .../brooklyn/entity/proxy/ProxySslConfig.java | 219 - .../proxy/nginx/NginxConfigFileGenerator.java | 33 - .../entity/proxy/nginx/NginxController.java | 145 - .../entity/proxy/nginx/NginxControllerImpl.java | 370 -- .../nginx/NginxDefaultConfigGenerator.java | 258 - .../entity/proxy/nginx/NginxDriver.java | 31 - .../entity/proxy/nginx/NginxSshDriver.java | 477 -- .../nginx/NginxTemplateConfigGenerator.java | 82 - .../brooklyn/entity/proxy/nginx/UrlMapping.java | 102 - .../entity/proxy/nginx/UrlMappingImpl.java | 223 - .../entity/proxy/nginx/UrlRewriteRule.java | 74 - .../webapp/ControlledDynamicWebAppCluster.java | 113 - .../ControlledDynamicWebAppClusterImpl.java | 327 -- .../entity/webapp/DynamicWebAppCluster.java | 69 - .../entity/webapp/DynamicWebAppClusterImpl.java | 263 - .../entity/webapp/DynamicWebAppFabric.java | 48 - .../entity/webapp/DynamicWebAppFabricImpl.java | 83 - .../entity/webapp/ElasticJavaWebAppService.java | 60 - .../webapp/FilenameToWebContextMapper.java | 92 - .../brooklyn/entity/webapp/HttpsSslConfig.java | 74 - .../entity/webapp/JavaWebAppDriver.java | 54 - .../entity/webapp/JavaWebAppService.java | 109 - .../webapp/JavaWebAppSoftwareProcess.java | 34 - .../webapp/JavaWebAppSoftwareProcessImpl.java | 206 - .../entity/webapp/JavaWebAppSshDriver.java | 201 - .../brooklyn/entity/webapp/WebAppService.java | 24 - .../entity/webapp/WebAppServiceConstants.java | 61 - .../entity/webapp/WebAppServiceMethods.java | 89 - .../entity/webapp/WebAppServiceMetrics.java | 77 - .../entity/webapp/jboss/JBoss6Driver.java | 24 - .../entity/webapp/jboss/JBoss6Server.java | 62 - .../entity/webapp/jboss/JBoss6ServerImpl.java | 103 - .../entity/webapp/jboss/JBoss6SshDriver.java | 243 - .../entity/webapp/jboss/JBoss7Driver.java | 30 - .../entity/webapp/jboss/JBoss7Server.java | 104 - .../entity/webapp/jboss/JBoss7ServerImpl.java | 199 - .../entity/webapp/jboss/JBoss7SshDriver.java | 276 -- .../entity/webapp/jetty/Jetty6Driver.java | 24 - .../entity/webapp/jetty/Jetty6Server.java | 60 - .../entity/webapp/jetty/Jetty6ServerImpl.java | 141 - .../entity/webapp/jetty/Jetty6SshDriver.java | 173 - .../webapp/nodejs/NodeJsWebAppDriver.java | 29 - .../webapp/nodejs/NodeJsWebAppService.java | 74 - .../webapp/nodejs/NodeJsWebAppServiceImpl.java | 92 - .../webapp/nodejs/NodeJsWebAppSshDriver.java | 185 - .../entity/webapp/tomcat/Tomcat7Driver.java | 23 - .../entity/webapp/tomcat/Tomcat7SshDriver.java | 29 - .../entity/webapp/tomcat/Tomcat8Server.java | 55 - .../entity/webapp/tomcat/Tomcat8ServerImpl.java | 26 - .../entity/webapp/tomcat/TomcatDriver.java | 24 - .../entity/webapp/tomcat/TomcatServer.java | 80 - .../entity/webapp/tomcat/TomcatServerImpl.java | 120 - .../entity/webapp/tomcat/TomcatSshDriver.java | 174 - .../entity/dns/AbstractGeoDnsService.java | 59 + .../entity/dns/AbstractGeoDnsServiceImpl.java | 373 ++ .../dns/geoscaling/GeoscalingDnsService.java | 71 + .../geoscaling/GeoscalingDnsServiceImpl.java | 200 + .../geoscaling/GeoscalingScriptGenerator.java | 79 + .../dns/geoscaling/GeoscalingWebClient.java | 459 ++ .../entity/proxy/AbstractController.java | 74 + .../entity/proxy/AbstractControllerImpl.java | 516 ++ .../proxy/AbstractNonProvisionedController.java | 28 + .../AbstractNonProvisionedControllerImpl.java | 277 ++ .../brooklyn/entity/proxy/LoadBalancer.java | 125 + .../entity/proxy/LoadBalancerCluster.java | 37 + .../entity/proxy/LoadBalancerClusterImpl.java | 76 + .../brooklyn/entity/proxy/ProxySslConfig.java | 219 + .../proxy/nginx/NginxConfigFileGenerator.java | 33 + .../entity/proxy/nginx/NginxController.java | 146 + .../entity/proxy/nginx/NginxControllerImpl.java | 370 ++ .../nginx/NginxDefaultConfigGenerator.java | 258 + .../entity/proxy/nginx/NginxDriver.java | 31 + .../entity/proxy/nginx/NginxSshDriver.java | 477 ++ .../nginx/NginxTemplateConfigGenerator.java | 83 + .../brooklyn/entity/proxy/nginx/UrlMapping.java | 103 + .../entity/proxy/nginx/UrlMappingImpl.java | 223 + .../entity/proxy/nginx/UrlRewriteRule.java | 74 + .../webapp/ControlledDynamicWebAppCluster.java | 114 + .../ControlledDynamicWebAppClusterImpl.java | 327 ++ .../entity/webapp/DynamicWebAppCluster.java | 69 + .../entity/webapp/DynamicWebAppClusterImpl.java | 263 + .../entity/webapp/DynamicWebAppFabric.java | 48 + .../entity/webapp/DynamicWebAppFabricImpl.java | 83 + .../entity/webapp/ElasticJavaWebAppService.java | 60 + .../webapp/FilenameToWebContextMapper.java | 92 + .../brooklyn/entity/webapp/HttpsSslConfig.java | 74 + .../entity/webapp/JavaWebAppDriver.java | 54 + .../entity/webapp/JavaWebAppService.java | 109 + .../webapp/JavaWebAppSoftwareProcess.java | 34 + .../webapp/JavaWebAppSoftwareProcessImpl.java | 206 + .../entity/webapp/JavaWebAppSshDriver.java | 201 + .../brooklyn/entity/webapp/WebAppService.java | 24 + .../entity/webapp/WebAppServiceConstants.java | 61 + .../entity/webapp/WebAppServiceMethods.java | 89 + .../entity/webapp/WebAppServiceMetrics.java | 77 + .../entity/webapp/jboss/JBoss6Driver.java | 24 + .../entity/webapp/jboss/JBoss6Server.java | 63 + .../entity/webapp/jboss/JBoss6ServerImpl.java | 103 + .../entity/webapp/jboss/JBoss6SshDriver.java | 244 + .../entity/webapp/jboss/JBoss7Driver.java | 30 + .../entity/webapp/jboss/JBoss7Server.java | 105 + .../entity/webapp/jboss/JBoss7ServerImpl.java | 199 + .../entity/webapp/jboss/JBoss7SshDriver.java | 276 ++ .../entity/webapp/jetty/Jetty6Driver.java | 24 + .../entity/webapp/jetty/Jetty6Server.java | 61 + .../entity/webapp/jetty/Jetty6ServerImpl.java | 141 + .../entity/webapp/jetty/Jetty6SshDriver.java | 174 + .../webapp/nodejs/NodeJsWebAppDriver.java | 29 + .../webapp/nodejs/NodeJsWebAppService.java | 75 + .../webapp/nodejs/NodeJsWebAppServiceImpl.java | 92 + .../webapp/nodejs/NodeJsWebAppSshDriver.java | 185 + .../entity/webapp/tomcat/Tomcat7Driver.java | 23 + .../entity/webapp/tomcat/Tomcat7SshDriver.java | 29 + .../entity/webapp/tomcat/Tomcat8Server.java | 55 + .../entity/webapp/tomcat/Tomcat8ServerImpl.java | 26 + .../entity/webapp/tomcat/TomcatDriver.java | 24 + .../entity/webapp/tomcat/TomcatServer.java | 81 + .../entity/webapp/tomcat/TomcatServerImpl.java | 120 + .../entity/webapp/tomcat/TomcatSshDriver.java | 175 + .../brooklyn/entity/dns/geoscaling/template.php | 68 - .../brooklyn/entity/proxy/nginx/server.conf | 84 - .../entity/webapp/jboss/jboss7-standalone.xml | 311 -- .../entity/webapp/jetty/jetty-brooklyn.xml | 41 - .../entity/webapp/sample-java-keystore.jks | Bin 1355 -> 0 bytes .../entity/webapp/sample-java-keystore.txt | 22 - .../brooklyn/entity/webapp/tomcat/server.xml | 206 - .../entity/webapp/tomcat/tomcat8-server.xml | 149 - .../entity/webapp/tomcat/tomcat8-web.xml | 4615 ------------------ .../brooklyn/entity/webapp/tomcat/web.xml | 4615 ------------------ .../brooklyn/entity/dns/geoscaling/template.php | 68 + .../brooklyn/entity/proxy/nginx/server.conf | 84 + .../entity/webapp/jboss/jboss7-standalone.xml | 311 ++ .../entity/webapp/jetty/jetty-brooklyn.xml | 41 + .../entity/webapp/sample-java-keystore.jks | Bin 0 -> 1355 bytes .../entity/webapp/sample-java-keystore.txt | 22 + .../brooklyn/entity/webapp/tomcat/server.xml | 206 + .../entity/webapp/tomcat/tomcat8-server.xml | 149 + .../entity/webapp/tomcat/tomcat8-web.xml | 4615 ++++++++++++++++++ .../brooklyn/entity/webapp/tomcat/web.xml | 4615 ++++++++++++++++++ .../entity/dns/AbstractGeoDnsServiceTest.java | 320 -- .../geoscaling/GeoscalingIntegrationTest.java | 211 - .../GeoscalingScriptGeneratorTest.java | 58 - .../dns/geoscaling/GeoscalingWebClientTest.java | 117 - .../entity/proxy/AbstractControllerTest.java | 363 -- .../entity/proxy/ProxySslConfigTest.java | 60 - .../brooklyn/entity/proxy/StubAppServer.java | 86 - .../proxy/TrackingAbstractController.java | 29 - .../proxy/TrackingAbstractControllerImpl.java | 67 - .../brooklyn/entity/proxy/UrlMappingTest.java | 216 - .../nginx/NginxClusterIntegrationTest.java | 241 - .../entity/proxy/nginx/NginxEc2LiveTest.java | 72 - .../nginx/NginxHttpsSslIntegrationTest.java | 238 - .../proxy/nginx/NginxIntegrationTest.java | 453 -- .../proxy/nginx/NginxLightIntegrationTest.java | 74 - .../proxy/nginx/NginxRebindIntegrationTest.java | 292 -- .../nginx/NginxRebindWithHaIntegrationTest.java | 182 - .../nginx/NginxUrlMappingIntegrationTest.java | 525 -- .../proxy/nginx/NginxWebClusterEc2LiveTest.java | 115 - .../AbstractWebAppFixtureIntegrationTest.java | 502 -- ...lledDynamicWebAppClusterIntegrationTest.java | 182 - .../ControlledDynamicWebAppClusterTest.java | 211 - .../entity/webapp/DynamicWebAppClusterTest.java | 131 - .../entity/webapp/DynamicWebAppFabricTest.java | 124 - .../webapp/ElasticCustomLocationTest.java | 90 - ...ElasticJavaWebAppServiceIntegrationTest.java | 69 - .../webapp/FilenameToWebContextMapperTest.java | 85 - .../entity/webapp/HttpsSslConfigTest.java | 38 - .../webapp/TomcatAutoScalerPolicyTest.java | 124 - .../webapp/WebAppConcurrentDeployTest.java | 105 - .../webapp/WebAppLiveIntegrationTest.groovy | 115 - ...namicWebAppClusterRebindIntegrationTest.java | 162 - ...namicWebAppClusterRebindIntegrationTest.java | 152 - .../jboss/JBoss6ServerAwsEc2LiveTest.java | 72 - ...Boss6ServerNonInheritingIntegrationTest.java | 103 - .../webapp/jboss/JBoss7PasswordHashingTest.java | 60 - .../jboss/JBoss7ServerAwsEc2LiveTest.java | 78 - .../jboss/JBoss7ServerDockerLiveTest.java | 77 - ...Boss7ServerNonInheritingIntegrationTest.java | 191 - .../JBoss7ServerRebindingIntegrationTest.java | 125 - ...ultiVersionWebAppFixtureIntegrationTest.java | 106 - .../Jboss7ServerGoogleComputeLiveTest.java | 78 - .../JettyWebAppFixtureIntegrationTest.java | 68 - .../webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 60 - .../NodeJsWebAppFixtureIntegrationTest.java | 171 - .../NodeJsWebAppSimpleIntegrationTest.java | 82 - .../nodejs/NodeJsWebAppSoftlayerLiveTest.java | 59 - .../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 68 - .../Tomcat8ServerRestartIntegrationTest.java | 45 - .../tomcat/Tomcat8ServerSoftlayerLiveTest.java | 77 - ...mcat8ServerWebAppFixtureIntegrationTest.java | 176 - ...ableRetrieveUsageMetricsIntegrationTest.java | 65 - .../webapp/tomcat/TomcatServerEc2LiveTest.java | 70 - .../TomcatServerRestartIntegrationTest.java | 44 - .../tomcat/TomcatServerSoftlayerLiveTest.java | 78 - ...omcatServerWebAppFixtureIntegrationTest.java | 175 - .../test/entity/TestJavaWebAppEntity.java | 78 - .../test/entity/TestJavaWebAppEntityImpl.java | 61 - .../entity/dns/AbstractGeoDnsServiceTest.java | 323 ++ .../geoscaling/GeoscalingIntegrationTest.java | 213 + .../GeoscalingScriptGeneratorTest.java | 59 + .../dns/geoscaling/GeoscalingWebClientTest.java | 118 + .../entity/proxy/AbstractControllerTest.java | 363 ++ .../entity/proxy/ProxySslConfigTest.java | 61 + .../brooklyn/entity/proxy/StubAppServer.java | 86 + .../proxy/TrackingAbstractController.java | 31 + .../proxy/TrackingAbstractControllerImpl.java | 68 + .../brooklyn/entity/proxy/UrlMappingTest.java | 216 + .../nginx/NginxClusterIntegrationTest.java | 243 + .../entity/proxy/nginx/NginxEc2LiveTest.java | 73 + .../nginx/NginxHttpsSslIntegrationTest.java | 239 + .../proxy/nginx/NginxIntegrationTest.java | 454 ++ .../proxy/nginx/NginxLightIntegrationTest.java | 75 + .../proxy/nginx/NginxRebindIntegrationTest.java | 295 ++ .../nginx/NginxRebindWithHaIntegrationTest.java | 183 + .../nginx/NginxUrlMappingIntegrationTest.java | 528 ++ .../proxy/nginx/NginxWebClusterEc2LiveTest.java | 116 + .../AbstractWebAppFixtureIntegrationTest.java | 506 ++ ...lledDynamicWebAppClusterIntegrationTest.java | 184 + .../ControlledDynamicWebAppClusterTest.java | 213 + .../entity/webapp/DynamicWebAppClusterTest.java | 133 + .../entity/webapp/DynamicWebAppFabricTest.java | 127 + .../webapp/ElasticCustomLocationTest.java | 91 + ...ElasticJavaWebAppServiceIntegrationTest.java | 70 + .../webapp/FilenameToWebContextMapperTest.java | 86 + .../entity/webapp/HttpsSslConfigTest.java | 39 + .../webapp/TomcatAutoScalerPolicyTest.java | 125 + .../webapp/WebAppConcurrentDeployTest.java | 106 + .../webapp/WebAppLiveIntegrationTest.groovy | 115 + ...namicWebAppClusterRebindIntegrationTest.java | 163 + ...namicWebAppClusterRebindIntegrationTest.java | 153 + .../jboss/JBoss6ServerAwsEc2LiveTest.java | 73 + ...Boss6ServerNonInheritingIntegrationTest.java | 104 + .../webapp/jboss/JBoss7PasswordHashingTest.java | 62 + .../jboss/JBoss7ServerAwsEc2LiveTest.java | 79 + .../jboss/JBoss7ServerDockerLiveTest.java | 78 + ...Boss7ServerNonInheritingIntegrationTest.java | 191 + .../JBoss7ServerRebindingIntegrationTest.java | 126 + ...ultiVersionWebAppFixtureIntegrationTest.java | 108 + .../Jboss7ServerGoogleComputeLiveTest.java | 79 + .../JettyWebAppFixtureIntegrationTest.java | 70 + .../webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 61 + .../NodeJsWebAppFixtureIntegrationTest.java | 172 + .../NodeJsWebAppSimpleIntegrationTest.java | 84 + .../nodejs/NodeJsWebAppSoftlayerLiveTest.java | 60 + .../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 68 + .../Tomcat8ServerRestartIntegrationTest.java | 45 + .../tomcat/Tomcat8ServerSoftlayerLiveTest.java | 77 + ...mcat8ServerWebAppFixtureIntegrationTest.java | 178 + ...ableRetrieveUsageMetricsIntegrationTest.java | 66 + .../webapp/tomcat/TomcatServerEc2LiveTest.java | 71 + .../TomcatServerRestartIntegrationTest.java | 45 + .../tomcat/TomcatServerSoftlayerLiveTest.java | 79 + ...omcatServerWebAppFixtureIntegrationTest.java | 176 + .../test/entity/TestJavaWebAppEntity.java | 78 + .../test/entity/TestJavaWebAppEntityImpl.java | 62 + .../entity/dns/geoscaling/expectedScript.php | 79 - .../webapp/nodejs/nodejs-hello-world.yaml | 31 - .../entity/dns/geoscaling/expectedScript.php | 79 + .../webapp/nodejs/nodejs-hello-world.yaml | 31 + .../app/ClusterWebServerDatabaseSample.java | 10 +- .../sample/app/SingleWebServerSample.java | 4 +- .../app/SampleLocalhostIntegrationTest.java | 2 +- .../brooklyn/sample/app/SampleUnitTest.java | 4 +- .../service/CatalogServiceTypeResolver.java | 2 +- .../camp/brooklyn/AbstractYamlTest.java | 2 +- .../brooklyn/camp/brooklyn/AppYamlTest.java | 16 +- .../camp/brooklyn/DslAndRebindYamlTest.java | 2 +- .../EnrichersSlightlySimplerYamlTest.java | 2 +- .../camp/brooklyn/EnrichersYamlTest.java | 4 +- .../brooklyn/EntitiesYamlIntegrationTest.java | 6 +- .../camp/brooklyn/EntitiesYamlTest.java | 46 +- .../brooklyn/JavaWebAppsIntegrationTest.java | 6 +- .../camp/brooklyn/JavaWebAppsMatchingTest.java | 2 +- .../camp/brooklyn/LocationsYamlTest.java | 26 +- .../camp/brooklyn/MapReferenceYamlTest.java | 8 +- .../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 16 +- .../camp/brooklyn/PoliciesYamlTest.java | 6 +- .../brooklyn/camp/brooklyn/WrapAppTest.java | 12 +- .../catalog/AbstractCatalogXmlTest.java | 2 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 5 +- .../test/resources/example-with-function.yaml | 2 +- .../java-web-app-and-db-with-function-2.yaml | 2 +- .../java-web-app-and-db-with-function.yaml | 2 +- .../java-web-app-and-db-with-policy.yaml | 4 +- .../src/test/resources/java-web-app-simple.yaml | 2 +- ...est-app-with-enrichers-slightly-simpler.yaml | 2 +- .../test-cluster-with-member-spec.yaml | 2 +- .../resources/test-entity-basic-template.yaml | 2 +- .../test-entity-reference-map-template.yaml | 2 +- .../resources/test-entity-with-enricher.yaml | 2 +- .../resources/test-entity-with-init-config.yaml | 2 +- .../test/resources/test-entity-with-policy.yaml | 2 +- ...-java-web-app-spec-and-db-with-function.yaml | 4 +- .../resources/test-propagating-enricher.yaml | 2 +- .../src/test/resources/test-tomcat-cluster.yaml | 4 +- .../src/test/resources/test-tomcat-https.yaml | 4 +- .../test-webapp-with-averaging-enricher.yaml | 4 +- .../main/resources/brooklyn/default.catalog.bom | 2 +- .../java/org/apache/brooklyn/cli/CliTest.java | 2 +- .../app-add-wizard/required-config-entry.html | 2 +- .../javascript/specs/model/app-tree-spec.js | 2 +- .../specs/model/entity-summary-spec.js | 4 +- .../BrooklynEntityMirrorIntegrationTest.java | 4 +- .../brooklynnode/BrooklynNodeRestTest.java | 4 +- .../BrooklynLauncherHighAvailabilityTest.java | 4 +- .../BrooklynLauncherRebindCatalogTest.java | 3 +- .../BrooklynLauncherRebindTestFixture.java | 4 +- .../BrooklynLauncherRebindTestToFiles.java | 2 +- ...lynLauncherRebindToCloudObjectStoreTest.java | 4 +- .../brooklyn/launcher/BrooklynLauncherTest.java | 10 +- .../launcher/BrooklynWebServerTest.java | 3 +- .../launcher/SimpleYamlLauncherForTests.java | 3 +- .../src/test/resources/couchbase-w-loadgen.yaml | 2 +- .../java-web-app-and-db-with-function.yaml | 2 +- .../src/test/resources/mongo-sharded.yaml | 6 +- usage/launcher/src/test/resources/nginx.yaml | 2 +- .../src/test/resources/opengamma-cluster.yaml | 4 +- usage/launcher/src/test/resources/web.yaml | 2 +- .../qa/load/SimulatedJBoss7ServerImpl.java | 5 +- .../qa/load/SimulatedNginxControllerImpl.java | 6 +- .../brooklyn/qa/load/SimulatedTheeTierApp.java | 15 +- .../SoftlayerObtainPrivateLiveTest.java | 4 +- .../qa/longevity/webcluster/WebClusterApp.java | 6 +- .../brooklyn/rest/domain/EntitySummaryTest.java | 4 +- .../resources/fixtures/application-list.json | 2 +- .../resources/fixtures/application-tree.json | 12 +- .../resources/fixtures/entity-summary-list.json | 6 +- .../test/resources/fixtures/entity-summary.json | 6 +- .../rest/client/BrooklynApiRestClientTest.java | 3 +- .../BrooklynPropertiesSecurityFilterTest.java | 2 +- .../brooklyn/rest/domain/ApplicationTest.java | 2 +- .../brooklyn/rest/domain/SensorSummaryTest.java | 5 +- .../rest/resources/CatalogResourceTest.java | 8 +- .../rest/resources/EntityResourceTest.java | 3 +- .../SensorResourceIntegrationTest.java | 2 +- .../rest/resources/ServerShutdownTest.java | 2 +- .../rest/resources/UsageResourceTest.java | 3 +- .../rest/testing/BrooklynRestApiTest.java | 2 +- .../util/BrooklynRestResourceUtilsTest.java | 4 +- .../json/BrooklynJacksonSerializerTest.java | 6 +- 645 files changed, 28666 insertions(+), 28560 deletions(-) ----------------------------------------------------------------------
