brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [53/71] [abbrv] incubator-brooklyn git commit: Merge remote-tracking branch 'apache/master' into mobile-app
Date Sun, 29 Mar 2015 03:03:11 GMT
Merge remote-tracking branch 'apache/master' into mobile-app


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

Branch: refs/heads/master
Commit: d9850a168f1b762b78ca42ac622a76f77c8baf07
Parents: 1234266 21d9a91
Author: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Authored: Fri Feb 6 17:05:59 2015 +0000
Committer: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Committed: Fri Feb 6 17:05:59 2015 +0000

----------------------------------------------------------------------
 .gitattributes                                  |     6 +
 COPYRIGHT.md                                    |    13 -
 DISCLAIMER                                      |     8 +
 LICENSE                                         |   292 +
 LICENSE.md                                      |   176 -
 NOTICE                                          |     5 +
 README.md                                       |    44 +-
 api/pom.xml                                     |    13 +-
 .../basic/AbstractBrooklynObjectSpec.java       |    26 +-
 .../java/brooklyn/basic/BrooklynObject.java     |    20 +
 .../basic/internal/ApiObjectsFactory.java       |    61 +
 .../internal/ApiObjectsFactoryInterface.java    |    29 +
 .../java/brooklyn/catalog/BrooklynCatalog.java  |    57 +-
 .../main/java/brooklyn/catalog/CatalogItem.java |    77 +-
 api/src/main/java/brooklyn/entity/Entity.java   |    27 +-
 api/src/main/java/brooklyn/entity/Feed.java     |    76 +
 api/src/main/java/brooklyn/entity/Group.java    |     1 +
 .../java/brooklyn/entity/basic/EntityLocal.java |    36 +-
 .../entity/drivers/DriverDependentEntity.java   |     5 +
 .../brooklyn/entity/proxying/EntitySpec.java    |    25 +-
 .../entity/rebind/BrooklynObjectType.java       |    48 +-
 .../rebind/PersistenceExceptionHandler.java     |     2 +
 .../brooklyn/entity/rebind/RebindContext.java   |    30 +-
 .../entity/rebind/RebindExceptionHandler.java   |    36 +-
 .../brooklyn/entity/rebind/RebindManager.java   |    71 +-
 .../brooklyn/entity/rebind/RebindSupport.java   |     4 +-
 .../java/brooklyn/entity/rebind/Rebindable.java |     7 +
 .../java/brooklyn/event/AttributeSensor.java    |    28 +-
 .../location/LocationNotAvailableException.java |    35 +
 .../brooklyn/location/LocationRegistry.java     |    51 +-
 .../java/brooklyn/location/LocationSpec.java    |     2 +-
 .../java/brooklyn/location/MachineLocation.java |     4 +-
 .../location/MachineProvisioningLocation.java   |     4 +-
 .../location/NoMachinesAvailableException.java  |     2 +-
 .../brooklyn/location/ProvisioningLocation.java |    44 +
 .../brooklyn/management/ExecutionContext.java   |     8 +
 .../brooklyn/management/ExecutionManager.java   |    12 +-
 .../brooklyn/management/LocationManager.java    |     5 +-
 .../brooklyn/management/ManagementContext.java  |    35 +-
 .../management/SubscriptionManager.java         |     2 +-
 api/src/main/java/brooklyn/management/Task.java |     8 +
 .../management/TaskQueueingContext.java         |     2 +-
 .../java/brooklyn/management/TaskWrapper.java   |     2 -
 .../management/ha/HighAvailabilityManager.java  |    53 +-
 .../management/ha/HighAvailabilityMode.java     |    30 +-
 .../management/ha/ManagementNodeState.java      |    47 +
 .../management/ha/ManagementNodeSyncRecord.java |     2 +
 .../ha/ManagementPlaneSyncRecordPersister.java  |     1 +
 .../brooklyn/management/ha/MementoCopyMode.java |    29 +
 .../java/brooklyn/mementos/BrooklynMemento.java |    19 +-
 .../mementos/BrooklynMementoManifest.java       |    19 +-
 .../mementos/BrooklynMementoPersister.java      |    68 +-
 .../mementos/BrooklynMementoRawData.java        |   179 +
 .../brooklyn/mementos/CatalogItemMemento.java   |    47 +
 .../java/brooklyn/mementos/EntityMemento.java   |     5 +
 .../java/brooklyn/mementos/FeedMemento.java     |    33 +
 .../main/java/brooklyn/mementos/Memento.java    |     8 +
 api/src/main/java/brooklyn/policy/Enricher.java |     6 +
 .../main/java/brooklyn/policy/EnricherSpec.java |    70 +-
 .../java/brooklyn/policy/EntityAdjunct.java     |     2 +-
 api/src/main/java/brooklyn/policy/Policy.java   |     6 +
 .../main/java/brooklyn/policy/PolicySpec.java   |     2 +-
 brooklyn-install.sh                             |   315 +
 camp/camp-base/pom.xml                          |    10 +-
 .../io/brooklyn/camp/spi/AbstractResource.java  |    55 +-
 .../brooklyn/camp/spi/ApplicationComponent.java |    31 +-
 .../camp/spi/ApplicationComponentTemplate.java  |     7 +-
 .../java/io/brooklyn/camp/spi/Assembly.java     |    33 +-
 .../io/brooklyn/camp/spi/AssemblyTemplate.java  |    38 +-
 .../io/brooklyn/camp/spi/PlatformComponent.java |    33 +-
 .../camp/spi/PlatformComponentTemplate.java     |     7 +-
 .../brooklyn/camp/spi/PlatformRootSummary.java  |     7 +-
 .../spi/pdp/AssemblyTemplateConstructor.java    |     6 +
 .../brooklyn/camp/spi/pdp/DeploymentPlan.java   |    12 +-
 .../java/io/brooklyn/camp/spi/pdp/Service.java  |     2 +-
 .../brooklyn/camp/spi/resolve/PdpProcessor.java |    20 +-
 camp/camp-server/pom.xml                        |    29 +-
 .../main/java/io/brooklyn/camp/CampServer.java  |     2 +-
 camp/pom.xml                                    |     7 +-
 core/pom.xml                                    |    82 +-
 .../GeoIPJava-1.2.8/ASNumLookupTest.java        |    39 -
 .../GeoIPJava-1.2.8/ASNumLookupTestV6.java      |    39 -
 .../maxmind/GeoIPJava-1.2.8/BenchmarkGeoIP.java |    97 -
 core/src/3rd/maxmind/GeoIPJava-1.2.8/Changes    |   121 -
 .../maxmind/GeoIPJava-1.2.8/CityLookupTest.java |    54 -
 .../GeoIPJava-1.2.8/CityLookupTestV6.java       |    54 -
 .../GeoIPJava-1.2.8/CountryLookupTest.java      |    57 -
 .../GeoIPJava-1.2.8/CountryLookupTestV6.java    |    56 -
 .../GeoIPJava-1.2.8/DistributedServiceTest.java |    45 -
 core/src/3rd/maxmind/GeoIPJava-1.2.8/LICENSE    |   504 -
 .../GeoIPJava-1.2.8/NetSpeedCellLookupTest.java |    39 -
 .../GeoIPJava-1.2.8/NetspeedLookupTest.java     |    50 -
 .../maxmind/GeoIPJava-1.2.8/OrgLookupTest.java  |    42 -
 core/src/3rd/maxmind/GeoIPJava-1.2.8/README     |    77 -
 .../GeoIPJava-1.2.8/RegionLookupTest.java       |    41 -
 .../admin/generate_regionName.pl                |   113 -
 .../GeoIPJava-1.2.8/admin/generate_timeZone.pl  |    66 -
 .../admin/new_generate_TimeZone.pl              |   110 -
 .../source/com/maxmind/geoip/Country.java       |    61 -
 .../source/com/maxmind/geoip/DatabaseInfo.java  |   127 -
 .../source/com/maxmind/geoip/Location.java      |    60 -
 .../source/com/maxmind/geoip/LookupService.java |  1204 -
 .../source/com/maxmind/geoip/Region.java        |     8 -
 .../source/com/maxmind/geoip/regionName.java    | 12782 ---------
 .../source/com/maxmind/geoip/timeZone.java      |  1459 -
 .../brooklyn/basic/AbstractBrooklynObject.java  |   115 +-
 .../brooklyn/basic/BasicConfigurableObject.java |    78 +
 .../brooklyn/basic/BrooklynDynamicType.java     |     9 +-
 .../brooklyn/basic/BrooklynObjectInternal.java  |     7 +
 .../main/java/brooklyn/basic/BrooklynTypes.java |    13 +-
 .../basic/internal/ApiObjectsFactoryImpl.java   |    41 +
 .../api/AssemblyTemplateSpecInstantiator.java   |     8 +-
 .../api/HasBrooklynManagementContext.java       |     2 +-
 .../java/brooklyn/catalog/CatalogLoadMode.java  |    70 +
 .../brooklyn/catalog/CatalogPredicates.java     |    29 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |   572 +-
 .../internal/CatalogBundleConverter.java        |    63 +
 .../catalog/internal/CatalogBundleDto.java      |    74 +
 .../catalog/internal/CatalogClasspathDo.java    |    16 +-
 .../internal/CatalogConfigurationDto.java       |    44 -
 .../brooklyn/catalog/internal/CatalogDo.java    |   159 +-
 .../brooklyn/catalog/internal/CatalogDto.java   |    71 +-
 .../catalog/internal/CatalogItemBuilder.java    |   117 +
 .../catalog/internal/CatalogItemComparator.java |   142 +
 .../catalog/internal/CatalogItemDo.java         |    70 +-
 .../internal/CatalogItemDtoAbstract.java        |   342 +-
 .../brooklyn/catalog/internal/CatalogItems.java |    74 -
 .../catalog/internal/CatalogLibrariesDo.java    |    39 +-
 .../catalog/internal/CatalogLibrariesDto.java   |    51 +-
 .../brooklyn/catalog/internal/CatalogUtils.java |   230 +
 .../catalog/internal/CatalogXmlSerializer.java  |    18 +-
 .../java/brooklyn/config/BrooklynLogging.java   |    48 +
 .../brooklyn/config/BrooklynProperties.java     |    81 +-
 .../brooklyn/config/BrooklynServerConfig.java   |   182 +-
 .../brooklyn/config/BrooklynServerPaths.java    |   280 +
 .../config/BrooklynServiceAttributes.java       |     5 +-
 .../brooklyn/config/render/RendererHints.java   |   165 +-
 .../main/java/brooklyn/enricher/Enrichers.java  |   292 +-
 .../enricher/basic/AbstractAggregator.java      |   215 +
 .../enricher/basic/AbstractEnricher.java        |    47 +
 .../basic/AbstractMultipleSensorAggregator.java |   152 +
 .../basic/AbstractTypeTransformingEnricher.java |     1 +
 .../brooklyn/enricher/basic/Aggregator.java     |   180 +-
 .../java/brooklyn/enricher/basic/Combiner.java  |    12 +-
 .../enricher/basic/EnricherDynamicType.java     |     4 +
 .../brooklyn/enricher/basic/Propagator.java     |    18 +-
 .../basic/SensorPropagatingEnricher.java        |     1 +
 .../brooklyn/enricher/basic/Transformer.java    |    19 +-
 .../brooklyn/enricher/basic/UpdatingMap.java    |   159 +
 .../entity/basic/AbstractApplication.java       |    77 +-
 .../AbstractConfigurableEntityFactory.java      |    11 +-
 .../brooklyn/entity/basic/AbstractEffector.java |    23 +-
 .../brooklyn/entity/basic/AbstractEntity.java   |   450 +-
 .../brooklyn/entity/basic/AbstractGroup.java    |    20 +-
 .../entity/basic/AbstractGroupImpl.java         |    67 +-
 .../java/brooklyn/entity/basic/Attributes.java  |    60 +-
 .../entity/basic/BasicApplicationImpl.java      |     6 +-
 .../basic/BasicConfigurableEntityFactory.java   |     2 +
 .../entity/basic/BasicParameterType.java        |    25 +-
 .../entity/basic/BasicStartableImpl.java        |     2 +-
 .../entity/basic/BrooklynConfigKeys.java        |   138 +-
 .../brooklyn/entity/basic/BrooklynTags.java     |    66 +
 .../brooklyn/entity/basic/BrooklynTaskTags.java |   203 +-
 .../java/brooklyn/entity/basic/ConfigKeys.java  |    32 +-
 .../brooklyn/entity/basic/DataEntityImpl.java   |     2 +-
 .../brooklyn/entity/basic/DelegateEntity.java   |    28 +-
 .../brooklyn/entity/basic/DynamicGroup.java     |    15 +-
 .../brooklyn/entity/basic/DynamicGroupImpl.java |     7 +-
 .../java/brooklyn/entity/basic/Entities.java    |   391 +-
 .../brooklyn/entity/basic/EntityAdjuncts.java   |    70 +
 .../entity/basic/EntityAndAttribute.java        |    17 +-
 .../brooklyn/entity/basic/EntityConfigMap.java  |    82 +-
 .../brooklyn/entity/basic/EntityFactory.java    |     8 +-
 .../brooklyn/entity/basic/EntityFunctions.java  |    77 +-
 .../entity/basic/EntityInitializers.java        |     2 +-
 .../brooklyn/entity/basic/EntityInternal.java   |    44 +-
 .../brooklyn/entity/basic/EntityPredicates.java |   292 +-
 .../brooklyn/entity/basic/EntitySuppliers.java  |    47 +
 .../java/brooklyn/entity/basic/EntityTasks.java |    81 +
 .../basic/EntityTransientCopyInternal.java      |   123 +
 .../brooklyn/entity/basic/ExplicitEffector.java |     2 +-
 .../java/brooklyn/entity/basic/Lifecycle.java   |   100 +-
 .../java/brooklyn/entity/basic/QuorumCheck.java |   108 +
 .../entity/basic/ServiceStateLogic.java         |   621 +
 .../drivers/BasicEntityDriverManager.java       |     8 +
 .../drivers/ReflectiveEntityDriverFactory.java  |   218 +-
 .../downloads/BasicDownloadRequirement.java     |     2 +-
 .../drivers/downloads/BasicDownloadTargets.java |     2 +-
 .../DownloadProducerFromLocalRepo.java          |     1 +
 .../DownloadProducerFromProperties.java         |     2 +-
 .../drivers/downloads/FilenameProducers.java    |     6 +-
 .../entity/effector/AddChildrenEffector.java    |   118 +
 .../brooklyn/entity/effector/AddEffector.java   |    32 +-
 .../brooklyn/entity/effector/AddSensor.java     |    93 +-
 .../brooklyn/entity/effector/EffectorTasks.java |    15 +-
 .../brooklyn/entity/effector/Effectors.java     |     6 +
 .../group/AbstractMembershipTrackingPolicy.java |     9 +-
 .../brooklyn/entity/group/DynamicCluster.java   |    10 +-
 .../entity/group/DynamicClusterImpl.java        |   243 +-
 .../brooklyn/entity/group/DynamicFabric.java    |     2 +-
 .../entity/group/DynamicFabricImpl.java         |    15 +-
 .../entity/group/DynamicMultiGroup.java         |     5 +
 .../entity/group/DynamicMultiGroupImpl.java     |    62 +-
 .../entity/group/QuarantineGroupImpl.java       |     5 +
 .../entity/proxying/EntityProxyImpl.java        |   141 +-
 .../entity/proxying/InternalEntityFactory.java  |    46 +-
 .../proxying/InternalLocationFactory.java       |     7 +-
 .../entity/proxying/InternalPolicyFactory.java  |    21 +-
 .../AbstractBrooklynObjectRebindSupport.java    |    17 +-
 .../rebind/BasicCatalogItemRebindSupport.java   |    66 +
 .../rebind/BasicEnricherRebindSupport.java      |     7 +-
 .../entity/rebind/BasicEntityRebindSupport.java |    62 +-
 .../entity/rebind/BasicFeedRebindSupport.java   |    48 +
 .../rebind/BasicLocationRebindSupport.java      |    21 +-
 .../rebind/ImmediateDeltaChangeListener.java    |     6 +
 .../rebind/PeriodicDeltaChangeListener.java     |   370 +-
 .../rebind/PersistenceExceptionHandlerImpl.java |    16 +-
 .../entity/rebind/PersisterDeltaImpl.java       |   160 +-
 .../entity/rebind/RebindContextImpl.java        |    96 +-
 .../rebind/RebindContextLookupContext.java      |    57 +-
 .../rebind/RebindExceptionHandlerImpl.java      |   191 +-
 .../brooklyn/entity/rebind/RebindIteration.java |  1086 +
 .../entity/rebind/RebindManagerImpl.java        |   846 +-
 .../entity/rebind/dto/AbstractMemento.java      |    68 +-
 .../rebind/dto/BasicCatalogItemMemento.java     |   242 +
 .../entity/rebind/dto/BasicEnricherMemento.java |     5 +-
 .../entity/rebind/dto/BasicEntityMemento.java   |    51 +-
 .../entity/rebind/dto/BasicFeedMemento.java     |    92 +
 .../entity/rebind/dto/BasicLocationMemento.java |    32 +-
 .../entity/rebind/dto/BasicPolicyMemento.java   |     5 +-
 .../entity/rebind/dto/BrooklynMementoImpl.java  |    63 +-
 .../rebind/dto/BrooklynMementoManifestImpl.java |    81 +-
 .../rebind/dto/EntityMementoManifestImpl.java   |    56 +
 .../entity/rebind/dto/MementosGenerators.java   |    92 +-
 .../rebind/dto/MutableBrooklynMemento.java      |    71 +-
 .../AbstractBrooklynMementoPersister.java       |    43 +-
 .../BrooklynMementoPersisterInMemory.java       |    40 +-
 .../BrooklynMementoPersisterToMultiFile.java    |   123 +-
 .../BrooklynMementoPersisterToObjectStore.java  |   620 +-
 .../persister/BrooklynPersistenceUtils.java     |   270 +
 .../CatalogItemLibrariesConverter.java          |    68 +
 .../rebind/persister/FileBasedObjectStore.java  |    29 +-
 .../persister/FileBasedStoreObjectAccessor.java |    22 +-
 .../persister/LocationWithObjectStore.java      |    27 +
 .../persister/PersistenceActivityMetrics.java   |    83 +
 .../persister/RetryingMementoSerializer.java    |    17 +-
 .../persister/StoreObjectAccessorLocking.java   |     3 +-
 .../rebind/persister/XmlMementoSerializer.java  |    57 +-
 .../dto/BasicManagementNodeSyncRecord.java      |    22 +-
 .../transformer/BrooklynMementoTransformer.java |    32 +
 .../rebind/transformer/CompoundTransformer.java |   272 +
 .../transformer/CompoundTransformerLoader.java  |    97 +
 .../rebind/transformer/RawDataTransformer.java  |    30 +
 .../DeleteOrphanedLocationsTransformer.java     |   125 +
 .../transformer/impl/XsltTransformer.java       |    59 +
 .../java/brooklyn/entity/trait/Startable.java   |    53 +-
 .../brooklyn/entity/trait/StartableMethods.java |    27 +-
 .../java/brooklyn/event/basic/AttributeMap.java |    28 +-
 .../event/basic/BasicAttributeSensor.java       |    18 +-
 .../brooklyn/event/basic/BasicConfigKey.java    |    58 +-
 .../brooklyn/event/basic/BasicSensorEvent.java  |    38 +-
 .../event/basic/DependentConfiguration.java     |   594 +-
 .../brooklyn/event/basic/ListConfigKey.java     |     2 +-
 .../basic/PortAttributeSensorAndConfigKey.java  |    68 +-
 .../main/java/brooklyn/event/basic/Sensors.java |    81 +-
 .../java/brooklyn/event/basic/SetConfigKey.java |     2 +-
 .../java/brooklyn/event/feed/AbstractFeed.java  |   168 +-
 .../event/feed/AttributePollHandler.java        |    27 +-
 .../brooklyn/event/feed/ConfigToAttributes.java |     7 +-
 .../event/feed/DelegatingPollHandler.java       |     6 +-
 .../java/brooklyn/event/feed/FeedConfig.java    |    88 +
 .../java/brooklyn/event/feed/PollConfig.java    |    16 +-
 .../main/java/brooklyn/event/feed/Poller.java   |    34 +-
 .../event/feed/function/FunctionFeed.java       |    40 +-
 .../event/feed/function/FunctionPollConfig.java |    54 +-
 .../java/brooklyn/event/feed/http/HttpFeed.java |    36 +-
 .../event/feed/http/HttpPollConfig.java         |    41 +-
 .../brooklyn/event/feed/http/JsonFunctions.java |     2 +-
 .../brooklyn/event/feed/shell/ShellFeed.java    |    36 +-
 .../event/feed/shell/ShellPollConfig.java       |     6 +
 .../java/brooklyn/event/feed/ssh/SshFeed.java   |    89 +-
 .../brooklyn/event/feed/ssh/SshPollConfig.java  |    12 +
 .../windows/WindowsPerformanceCounterFeed.java  |   107 +-
 .../WindowsPerformanceCounterPollConfig.java    |    52 +
 .../internal/BrooklynFeatureEnablement.java     |   100 +-
 .../internal/BrooklynInitialization.java        |    81 +
 .../location/access/BrooklynAccessUtils.java    |     2 +-
 .../location/access/PortForwardManager.java     |   247 +-
 .../access/PortForwardManagerAuthority.java     |   221 +-
 .../access/PortForwardManagerClient.java        |   277 +-
 .../location/access/PortForwardManagerImpl.java |   449 +
 .../PortForwardManagerLocationResolver.java     |    89 +
 .../brooklyn/location/access/PortMapping.java   |    45 +-
 .../location/basic/AbstractLocation.java        |   128 +-
 .../basic/AbstractLocationResolver.java         |   189 +
 .../AggregatingMachineProvisioningLocation.java |     2 +-
 .../location/basic/BasicLocationRegistry.java   |    89 +-
 .../location/basic/ByonLocationResolver.java    |   126 +-
 .../FixedListMachineProvisioningLocation.java   |     2 +-
 .../location/basic/HostLocationResolver.java    |    76 +-
 .../basic/LocalhostLocationResolver.java        |    72 +
 .../LocalhostMachineProvisioningLocation.java   |    24 +-
 .../location/basic/LocalhostResolver.java       |   129 -
 .../location/basic/LocationConfigKeys.java      |     4 +-
 .../location/basic/LocationConfigUtils.java     |   353 +-
 .../location/basic/LocationInternal.java        |    12 +-
 .../java/brooklyn/location/basic/Locations.java |    51 +
 .../location/basic/NamedLocationResolver.java   |     1 +
 .../brooklyn/location/basic/PortRanges.java     |    18 +-
 .../location/basic/SimulatedLocation.java       |    17 +
 .../basic/SingleMachineLocationResolver.java    |    78 +-
 .../location/basic/SshMachineLocation.java      |   219 +-
 .../location/cloud/CloudLocationConfig.java     |    16 +-
 .../location/dynamic/LocationOwner.java         |     4 +
 .../java/brooklyn/location/geo/HostGeoInfo.java |    38 +-
 .../location/geo/LocalhostExternalIpLoader.java |     9 +-
 .../location/geo/MaxMind2HostGeoLookup.java     |   115 +
 .../location/geo/MaxMindHostGeoLookup.java      |    94 -
 .../location/geo/UtraceHostGeoLookup.java       |    52 +
 .../management/ManagementContextInjectable.java |    33 +
 .../BrooklynClassLoadingContextSequential.java  |    12 +-
 ...ssLoaderFromBrooklynClassLoadingContext.java |    64 +
 .../JavaBrooklynClassLoadingContext.java        |    61 +-
 .../OsgiBrooklynClassLoadingContext.java        |    54 +-
 .../entitlement/EntitlementManagerAdapter.java  |    99 +-
 .../management/entitlement/Entitlements.java    |   169 +-
 .../entitlement/NotEntitledException.java       |     5 +
 .../entitlement/PerUserEntitlementManager.java  |    97 +
 .../PerUserEntitlementManagerWithDefault.java   |    27 +-
 .../entitlement/WebEntitlementContext.java      |    11 +-
 .../management/ha/BasicMasterChooser.java       |   160 +-
 .../ha/HighAvailabilityManagerImpl.java         |   690 +-
 .../ha/ManagementPlaneSyncRecordDeltaImpl.java  |    21 +-
 ...mentPlaneSyncRecordPersisterToMultiFile.java |     4 -
 ...ntPlaneSyncRecordPersisterToObjectStore.java |    59 +-
 .../brooklyn/management/ha/OsgiManager.java     |   192 +-
 .../internal/AbstractManagementContext.java     |   135 +-
 .../internal/AbstractSubscriptionManager.java   |     2 +-
 .../internal/AsyncCollectionChangeAdapter.java  |    46 +-
 .../internal/BasicSubscriptionContext.java      |     4 +-
 .../internal/BrooklynGarbageCollector.java      |   578 +-
 .../management/internal/EffectorUtils.java      |   142 +-
 .../internal/EntityChangeListener.java          |    11 +-
 .../internal/EntityManagementSupport.java       |   110 +-
 .../internal/EntityManagementUtils.java         |   312 +
 .../internal/EntityManagerInternal.java         |    15 +
 .../management/internal/LocalAccessManager.java |     1 -
 .../management/internal/LocalEntityManager.java |   420 +-
 .../internal/LocalLocationManager.java          |   237 +-
 .../internal/LocalManagementContext.java        |    29 +-
 .../internal/LocalSubscriptionManager.java      |    23 +-
 .../management/internal/LocalUsageManager.java  |   140 +-
 .../internal/LocationManagerInternal.java       |    40 +
 .../internal/ManagementTransitionInfo.java      |    35 +-
 .../internal/NonDeploymentEntityManager.java    |    39 +
 .../internal/NonDeploymentLocationManager.java  |    51 +-
 .../NonDeploymentManagementContext.java         |   100 +-
 .../internal/NonDeploymentUsageManager.java     |    22 +
 .../management/internal/UsageManager.java       |    47 +
 .../management/usage/ApplicationUsage.java      |    18 +-
 .../management/usage/LocationUsage.java         |    22 +-
 .../policy/basic/AbstractEntityAdjunct.java     |    32 +-
 .../java/brooklyn/policy/basic/AdjunctType.java |    10 +-
 .../brooklyn/policy/basic/ConfigMapImpl.java    |     2 +-
 .../policy/basic/GeneralPurposePolicy.java      |     4 +
 .../policy/basic/PolicyDynamicType.java         |     4 +
 .../util/BrooklynLanguageExtensions.java        |    10 +-
 .../main/java/brooklyn/util/ResourceUtils.java  |   120 +-
 .../java/brooklyn/util/config/ConfigBag.java    |     8 +-
 .../brooklyn/util/crypto/FluentKeySigner.java   |    36 +-
 .../java/brooklyn/util/crypto/SecureKeys.java   |   247 +-
 .../java/brooklyn/util/file/ArchiveBuilder.java |    10 +-
 .../java/brooklyn/util/file/ArchiveTasks.java   |    11 +-
 .../java/brooklyn/util/file/ArchiveUtils.java   |    35 +-
 .../java/brooklyn/util/flags/FlagUtils.java     |   107 +-
 .../java/brooklyn/util/flags/TypeCoercions.java |   108 +-
 .../main/java/brooklyn/util/http/HttpTool.java  |    58 +-
 .../brooklyn/util/http/HttpToolResponse.java    |    26 +-
 .../util/internal/ConfigKeySelfExtracting.java  |    11 +-
 .../java/brooklyn/util/internal/Repeater.java   |    72 +-
 .../util/internal/ssh/ShellAbstractTool.java    |   177 +-
 .../brooklyn/util/internal/ssh/ShellTool.java   |    11 +-
 .../util/internal/ssh/process/ProcessTool.java  |     3 +-
 .../internal/ssh/sshj/SshjClientConnection.java |     2 +-
 .../util/internal/ssh/sshj/SshjTool.java        |   364 +-
 .../src/main/java/brooklyn/util/osgi/Osgis.java |   362 +-
 .../util/task/AbstractExecutionContext.java     |     7 +-
 .../util/task/BasicExecutionContext.java        |    21 +-
 .../util/task/BasicExecutionManager.java        |   487 +-
 .../main/java/brooklyn/util/task/BasicTask.java |   274 +-
 .../util/task/DynamicSequentialTask.java        |    57 +-
 .../java/brooklyn/util/task/DynamicTasks.java   |     1 -
 .../brooklyn/util/task/ExecutionListener.java   |     5 +
 .../java/brooklyn/util/task/ForwardingTask.java |    13 +-
 .../java/brooklyn/util/task/ScheduledTask.java  |   173 +-
 .../java/brooklyn/util/task/TaskInternal.java   |    14 +-
 .../main/java/brooklyn/util/task/TaskTags.java  |     6 +-
 .../src/main/java/brooklyn/util/task/Tasks.java |   289 +-
 .../java/brooklyn/util/task/ValueResolver.java  |   353 +
 .../util/task/system/ProcessTaskWrapper.java    |     4 +-
 .../system/internal/ExecWithLoggingHelpers.java |    29 +-
 .../brooklyn/util/text/DataUriSchemeParser.java |    28 +-
 .../brooklyn/util/text/TemplateProcessor.java   |   290 +-
 ...yn.basic.internal.ApiObjectsFactoryInterface |    19 +
 .../services/brooklyn.location.LocationResolver |     5 +-
 .../recursiveCopyWithExtraRules.xslt            |    32 +
 .../geo/external-ip-address-resolvers.txt       |    19 +-
 core/src/test/dependencies/osgi/README.md       |    29 +
 .../src/test/dependencies/osgi/entities/pom.xml |    15 +-
 .../java/brooklyn/osgi/tests/SimplePolicy.java  |    36 +
 .../dependencies/osgi/more-entities-v1/pom.xml  |    82 +
 .../brooklyn/osgi/tests/more/MoreEntity.java    |    38 +
 .../osgi/tests/more/MoreEntityImpl.java         |    44 +
 .../osgi/more-entities-v2-evil-twin/pom.xml     |    88 +
 .../brooklyn/osgi/tests/more/MoreEntity.java    |    38 +
 .../osgi/tests/more/MoreEntityImpl.java         |    47 +
 .../dependencies/osgi/more-entities-v2/pom.xml  |    87 +
 .../brooklyn/osgi/tests/more/MoreEntity.java    |    39 +
 .../osgi/tests/more/MoreEntityImpl.java         |    47 +
 .../brooklyn/camp/lite/CampYamlLiteTest.java    |   205 +-
 .../camp/lite/TestAppAssemblyInstantiator.java  |    50 +-
 .../catalog/internal/CatalogDtoTest.java        |    85 +-
 .../internal/CatalogItemComparatorTest.java     |    81 +
 .../catalog/internal/CatalogLoadTest.java       |    31 +-
 .../catalog/internal/CatalogScanTest.java       |    13 +-
 .../catalog/internal/CatalogVersioningTest.java |   133 +
 .../catalog/internal/MyCatalogItems.java        |     4 -
 .../enricher/CustomAggregatingEnricherTest.java |     2 +-
 .../java/brooklyn/enricher/EnrichersTest.java   |   107 +-
 .../enricher/basic/BasicEnricherTest.java       |    29 +-
 .../entity/BrooklynAppUnitTestSupport.java      |     6 +-
 .../java/brooklyn/entity/EffectorSayHiTest.java |    14 +-
 .../java/brooklyn/entity/SetFromFlagTest.groovy |   200 -
 .../java/brooklyn/entity/SetFromFlagTest.java   |   213 +
 .../entity/basic/AbstractEntityLegacyTest.java  |    31 +-
 .../brooklyn/entity/basic/AttributeMapTest.java |   143 +-
 .../entity/basic/BasicStartableTest.java        |     2 +-
 .../basic/ConfigEntityInheritanceTest.java      |    25 +-
 .../brooklyn/entity/basic/ConfigKeysTest.java   |    27 +
 .../basic/DependentConfigurationTest.java       |   118 +-
 .../entity/basic/DynamicEntityTest.java         |     3 +-
 .../brooklyn/entity/basic/DynamicGroupTest.java |    91 +-
 .../brooklyn/entity/basic/EntitiesTest.java     |    24 +-
 .../brooklyn/entity/basic/EntityConfigTest.java |    16 +-
 .../entity/basic/EntityFunctionsTest.java       |    12 +
 .../entity/basic/EntityLocationsTest.java       |    88 +-
 .../entity/basic/EntityPredicatesTest.java      |    15 +-
 .../brooklyn/entity/basic/EntitySpecTest.java   |    29 +-
 .../entity/basic/EntitySubscriptionTest.groovy  |   248 -
 .../entity/basic/EntitySubscriptionTest.java    |   251 +
 .../entity/basic/EntitySuppliersTest.java       |    70 +
 .../brooklyn/entity/basic/EntityTypeTest.java   |    58 +-
 .../entity/basic/LifecycleTransitionTest.java   |    38 +
 .../entity/basic/OwnedChildrenTest.groovy       |   209 -
 .../entity/basic/OwnedChildrenTest.java         |   211 +
 .../entity/basic/PolicyRegistrationTest.java    |     6 +-
 .../entity/basic/ServiceStateLogicTest.java     |   272 +
 .../ReflectiveEntityDriverFactoryTest.java      |    63 +-
 .../downloads/FilenameProducersTest.java        |     2 +-
 .../entity/group/DynamicClusterTest.java        |    30 +-
 .../entity/group/DynamicFabricTest.java         |    30 +-
 .../entity/group/DynamicMultiGroupTest.java     |    40 +-
 .../entity/group/GroupPickUpEntitiesTest.java   |    16 +-
 .../entity/hello/LocalEntitiesTest.java         |    77 +-
 .../java/brooklyn/entity/rebind/Dumpers.java    |     4 +-
 .../entity/rebind/RebindCatalogEntityTest.java  |    24 +-
 .../entity/rebind/RebindCatalogItemTest.java    |   204 +
 ...talogWhenCatalogPersistenceDisabledTest.java |    94 +
 .../entity/rebind/RebindEnricherTest.java       |    12 +-
 .../rebind/RebindEntityDynamicTypeInfoTest.java |     5 -
 .../entity/rebind/RebindEntityTest.java         |    53 +-
 .../entity/rebind/RebindFailuresTest.java       |    50 +-
 .../brooklyn/entity/rebind/RebindFeedTest.java  |   383 +
 .../entity/rebind/RebindFeedWithHaTest.java     |   132 +
 .../entity/rebind/RebindLocationTest.java       |    18 +-
 .../entity/rebind/RebindManagerSorterTest.java  |     2 +-
 .../brooklyn/entity/rebind/RebindOptions.java   |    92 +
 .../entity/rebind/RebindPolicyTest.java         |    10 +-
 .../entity/rebind/RebindTestFixture.java        |   203 +-
 .../entity/rebind/RebindTestFixtureWithApp.java |     3 +-
 .../brooklyn/entity/rebind/RebindTestUtils.java |   320 +-
 .../rebind/RecordingRebindExceptionHandler.java |    11 +-
 .../BrooklynMementoPersisterFileBasedTest.java  |     2 +-
 .../BrooklynMementoPersisterTestFixture.java    |    44 +-
 ...BrooklynMementoPersisterToMultiFileTest.java |     4 +-
 ...nceStoreObjectAccessorWriterTestFixture.java |     2 +-
 .../persister/XmlMementoSerializerTest.java     |   123 +-
 .../CompoundTransformerLoaderTest.java          |    77 +
 .../transformer/CompoundTransformerTest.java    |   442 +
 .../transformer/impl/XsltTransformerTest.java   |   168 +
 .../event/feed/function/FunctionFeedTest.java   |    59 +-
 .../brooklyn/event/feed/http/HttpFeedTest.java  |    20 +-
 .../feed/shell/ShellFeedIntegrationTest.java    |    21 +
 .../event/feed/ssh/SshFeedIntegrationTest.java  |    16 +
 .../WindowsPerformanceCounterFeedLiveTest.java  |    32 +-
 .../WindowsPerformanceCounterFeedTest.java      |     4 +-
 .../internal/BrooklynFeatureEnablementTest.java |    27 +
 .../PortForwardManagerLocationResolverTest.java |    83 +
 .../access/PortForwardManagerRebindTest.java    |    65 +-
 .../location/access/PortForwardManagerTest.java |   157 +
 .../location/basic/AbstractLocationTest.java    |    10 +-
 .../basic/ByonLocationResolverTest.java         |    81 +-
 ...stMachineProvisioningLocationRebindTest.java |    82 +-
 ...ixedListMachineProvisioningLocationTest.java |    12 +-
 .../basic/HostLocationResolverTest.java         |     8 +-
 .../basic/LegacyAbstractLocationTest.java       |     8 +-
 .../basic/LocalhostLocationResolverTest.java    |    42 +-
 ...ocalhostMachineProvisioningLocationTest.java |    25 +-
 .../location/basic/LocationConfigTest.java      |     2 +-
 .../location/basic/LocationConfigUtilsTest.java |   103 +-
 .../location/basic/LocationExtensionsTest.java  |     4 +-
 .../location/basic/LocationPredicatesTest.java  |     3 +-
 .../location/basic/LocationRegistryTest.java    |    17 +-
 .../location/basic/MachineDetailsTest.java      |     5 +-
 .../basic/MultiLocationResolverTest.java        |     3 +-
 .../location/basic/MultiLocationTest.java       |     3 +-
 .../SingleMachineLocationResolverTest.java      |    25 +-
 .../SingleMachineProvisioningLocationTest.java  |     3 +-
 .../SshMachineLocationIntegrationTest.java      |    65 +-
 .../SshMachineLocationPerformanceTest.java      |     2 +-
 .../SshMachineLocationReuseIntegrationTest.java |    39 +-
 .../location/basic/SshMachineLocationTest.java  |    13 +-
 .../basic/TestPortSupplierLocation.groovy       |    94 -
 .../basic/TestPortSupplierLocation.java         |    90 +
 .../location/cloud/CloudMachineNamerTest.java   |    13 +-
 .../location/cloud/CustomMachineNamerTest.java  |     3 +-
 .../location/geo/HostGeoInfoTest.groovy         |    69 -
 .../brooklyn/location/geo/HostGeoInfoTest.java  |    52 +
 .../geo/HostGeoLookupIntegrationTest.java       |    16 +-
 .../entitlement/AcmeEntitlementManager.java     |    24 +-
 .../entitlement/AcmeEntitlementManagerTest.java |   115 +-
 .../AcmeEntitlementManagerTestFixture.java      |   158 +
 .../entitlement/EntitlementsTest.java           |     8 +-
 .../entitlement/EntityEntitlementTest.java      |     9 +-
 ...PerUserEntitlementManagerPropertiesTest.java |    52 +
 .../ha/HighAvailabilityManagerInMemoryTest.java |    90 +
 .../HighAvailabilityManagerSplitBrainTest.java  |   214 +-
 .../ha/HighAvailabilityManagerTestFixture.java  |    32 +-
 .../brooklyn/management/ha/HotStandbyTest.java  |   660 +
 .../management/ha/MasterChooserTest.java        |    71 +-
 .../management/ha/TestEntityFailingRebind.java  |    56 +
 .../brooklyn/management/ha/WarmStandbyTest.java |   150 +
 .../internal/EntityExecutionManagerTest.java    |   338 +-
 .../internal/LocalManagementContextTest.java    |    15 +-
 .../brooklyn/management/osgi/OsgiPathTest.java  |   105 +
 .../management/osgi/OsgiStandaloneTest.java     |   109 +-
 .../management/osgi/OsgiTestResources.java      |    73 +
 .../osgi/OsgiVersionMoreEntityTest.java         |   433 +
 .../brooklyn/policy/basic/BasicPolicyTest.java  |     2 +-
 .../brooklyn/policy/basic/EnricherTypeTest.java |     2 +-
 .../policy/basic/PolicySubscriptionTest.groovy  |   138 -
 .../policy/basic/PolicySubscriptionTest.java    |   134 +
 .../EntityCleanupLongevityTestFixture.java      |     7 +-
 .../EntityPersistencePerformanceTest.java       |     1 +
 .../qa/performance/PerformanceTestUtils.java    |    99 -
 .../test/java/brooklyn/test/HttpService.java    |     5 +-
 .../entity/LocalManagementContextForTests.java  |   113 +-
 .../brooklyn/test/entity/TestApplication.java   |     2 +
 .../test/entity/TestApplicationImpl.java        |    12 +-
 .../entity/TestApplicationNoEnrichersImpl.java  |    29 +
 .../brooklyn/test/entity/TestClusterImpl.java   |     9 +
 .../java/brooklyn/test/entity/TestEntity.java   |     4 +-
 .../brooklyn/test/entity/TestEntityImpl.java    |    27 +-
 .../test/entity/TestEntityNoEnrichersImpl.java  |    32 +
 .../entity/TestEntityTransientCopyImpl.java     |    28 +
 .../util/BrooklynMavenArtifactsTest.java        |    27 +-
 .../brooklyn/util/ResourceUtilsHttpTest.java    |   244 +
 .../java/brooklyn/util/ResourceUtilsTest.java   |    18 +-
 .../util/crypto/SecureKeysAndSignerTest.java    |    41 +
 .../brooklyn/util/internal/FlagUtilsTest.java   |    66 +-
 .../brooklyn/util/internal/RepeaterTest.groovy  |     3 +-
 .../util/internal/TypeCoercionsTest.java        |    37 +
 .../util/internal/ssh/RecordingSshTool.java     |     1 +
 .../internal/ssh/ShellToolAbstractTest.java     |     7 +-
 .../ssh/SshToolAbstractIntegrationTest.java     |    13 +
 .../sshj/SshjToolAsyncStubIntegrationTest.java  |   177 +
 .../ssh/sshj/SshjToolIntegrationTest.java       |   115 +-
 .../test/java/brooklyn/util/osgi/OsgisTest.java |    41 +
 .../task/BasicTaskExecutionPerformanceTest.java |     4 +
 .../util/task/BasicTaskExecutionTest.java       |    10 +-
 .../util/task/CompoundTaskExecutionTest.java    |     9 -
 .../util/task/ScheduledExecutionTest.java       |   264 +-
 .../test/java/brooklyn/util/task/TasksTest.java |    55 +
 .../brooklyn/util/task/ValueResolverTest.java   |   132 +
 .../util/text/TemplateProcessorTest.java        |   179 +
 .../util/xstream/StringKeyMapConverterTest.java |     2 +-
 .../camp/lite/test-app-service-blueprint.yaml   |     4 +-
 .../brooklyn/catalog/internal/osgi-catalog.xml  |     4 +-
 .../entity/rebind/brooklyn-AppInCatalog.jar     |   Bin 843 -> 2387 bytes
 .../entity/rebind/brooklyn-AppInCatalog.txt     |    28 +
 .../rebind/rebind-catalog-item-test-catalog.xml |    28 +
 .../rebind/transformer/impl/renameClass.xslt    |    35 +
 .../rebind/transformer/impl/renameField.xslt    |    35 +
 .../rebind/transformer/impl/renameType.xslt     |    41 +
 .../brooklyn/location/basic/sample_id_rsa       |    27 +
 .../brooklyn/location/basic/sample_id_rsa.pub   |     1 +
 core/src/test/resources/brooklyn/osgi/README.md |    10 +-
 .../osgi/brooklyn-osgi-test-a_0.1.0.txt         |    26 +
 .../osgi/brooklyn-test-osgi-entities.jar        |   Bin 10891 -> 12406 bytes
 .../osgi/brooklyn-test-osgi-entities.txt        |    26 +
 .../brooklyn-test-osgi-more-entities_0.1.0.jar  |   Bin 0 -> 12452 bytes
 .../brooklyn-test-osgi-more-entities_0.1.0.txt  |    26 +
 .../brooklyn-test-osgi-more-entities_0.2.0.jar  |   Bin 0 -> 12615 bytes
 .../brooklyn-test-osgi-more-entities_0.2.0.txt  |    26 +
 ...-test-osgi-more-entities_evil-twin_0.2.0.jar |   Bin 0 -> 12757 bytes
 ...-test-osgi-more-entities_evil-twin_0.2.0.txt |    26 +
 .../test/resources/hello-world-no-mapping.txt   |    18 +
 .../test/resources/hello-world-no-mapping.war   |   Bin 0 -> 14693 bytes
 core/src/test/resources/hello-world.txt         |    18 +
 core/src/test/resources/hello-world.war         |   Bin 14718 -> 14729 bytes
 docs/.gitignore                                 |     2 +
 docs/Gemfile                                    |    30 +-
 docs/Gemfile.lock                               |   102 +-
 docs/README.md                                  |   282 +
 docs/_build/build.sh                            |   297 +
 docs/_build/config-exclude-all-but-guide.yml    |     1 +
 docs/_build/config-exclude-guide.yml            |     1 +
 docs/_build/config-exclude-root-index.yml       |     1 +
 docs/_build/config-guide-latest.yml             |     3 +
 docs/_build/config-guide-root.yml               |     2 +
 docs/_build/config-guide-version.yml            |     6 +
 docs/_build/config-production.yml               |     5 +
 docs/_build/config-pygments.yml                 |    28 +
 docs/_build/config-rdiscount.yml                |    28 +
 docs/_build/config-style-latest.yml             |     2 +
 docs/_build/config-subpath-brooklyn.yml         |     9 +
 docs/_build/config-website-root.yml             |     3 +
 docs/_build/help.txt                            |    22 +
 docs/_build/htmlproof-brooklyn.sh               |    21 +
 docs/_build/javadoc-overview.html               |    22 +
 docs/_build/make-javadoc.sh                     |    66 +
 docs/_build/quick-make-few-javadoc.sh           |     6 +
 docs/_build/serve-public-site.sh                |     1 +
 docs/_build/serve-site.sh                       |     1 +
 docs/_build/tests/jsonball/test_jsonball.md     |    18 +
 .../tests/jsonball/test_jsonball_file.json      |     1 +
 .../tests/jsonball/test_jsonball_page.json      |     2 +
 docs/_build/tests/jsonball/toc.json             |     6 +
 docs/_config.yml                                |    39 +-
 .../_extra/big_examples/before-begin.include.md |    56 +
 .../console-geoscaling-details-w700.png         |   Bin 0 -> 167441 bytes
 .../console-geoscaling-details.png              |   Bin 0 -> 176651 bytes
 .../global-web-fabric/console-map-w700.png      |   Bin 0 -> 201060 bytes
 .../global-web-fabric/console-map.png           |   Bin 0 -> 331520 bytes
 .../geopaas-deployed-app-w700.png               |   Bin 0 -> 153738 bytes
 .../global-web-fabric/geopaas-deployed-app.png  |   Bin 0 -> 114615 bytes
 .../big_examples/global-web-fabric/index.md     |   378 +
 docs/_extra/big_examples/index.md               |    18 +
 docs/_extra/big_examples/messaging/index.md     |   181 +
 .../nosql-cassandra/cassandra.include.md        |   282 +
 .../big_examples/nosql-cassandra/index.md       |     7 +
 docs/_extra/big_examples/simple-web-cluster.md  |     9 +
 docs/_extra/big_examples/toc.json               |    13 +
 docs/_extra/big_examples/webcluster.md          |     9 +
 docs/_extra/big_examples/webcluster/index.md    |     7 +
 .../webcluster/webcluster.include.md            |   124 +
 docs/_extra/brooklyn-gpg-public-key.asc         |    21 +
 docs/_extra/deploying-yaml.md                   |    39 +
 docs/_extra/highlevel1.md                       |    50 +
 docs/_extra/list-of-blueprints.md               |   160 +
 docs/_extra/local-artifact-repo.md              |    32 +
 docs/_extra/release.md                          |   288 +
 .../example_files/tomcat_multi-location.java    |    15 +
 .../example_files/tomcat_nginx.java             |    17 +
 .../example_files/tomcat_simple.java            |     9 +
 docs/_extra/simple_java_examples/examples.md    |   121 +
 docs/_extra/update-docs.md                      |    14 +
 docs/_includes/base-head.html                   |    17 +
 docs/_includes/base-scss.scss                   |    36 +
 docs/_includes/breadcrumbs.html                 |    71 -
 docs/_includes/feature-image.html               |     4 +
 docs/_includes/feature-item-end.html            |    14 +
 docs/_includes/feature-item.html                |     4 +
 docs/_includes/fields.md                        |    54 +-
 docs/_includes/footer.html                      |    20 +
 docs/_includes/java_link.html                   |    18 +
 docs/_includes/list-children.html               |     9 +
 docs/_includes/sidebar.html                     |    77 -
 docs/_includes/sidemenu.html                    |   244 +
 docs/_includes/sitemap-item.html                |    36 +
 docs/_includes/topbar.html                      |    49 -
 docs/_includes/topmenu.html                     |    75 +
 docs/_javadoc/make-javadoc.sh                   |    47 -
 docs/_javadoc/quick-make-few-javadoc.sh         |    39 -
 docs/_layouts/base.html                         |   186 +
 docs/_layouts/page.html                         |   247 -
 docs/_layouts/website-base.html                 |    33 +
 docs/_layouts/website-landing.html              |    50 +
 docs/_layouts/website-normal.html               |    39 +
 docs/_plugins/brooklyn_jekyll_util.rb           |   129 +
 docs/_plugins/brooklyn_metadata.rb              |    72 +
 docs/_plugins/dependency_url.rb                 |    31 +
 docs/_plugins/read.rb                           |    56 +-
 docs/_plugins/site_structure.rb                 |   334 +
 docs/_scripts/build.sh                          |    21 -
 docs/_scripts/help.txt                          |    34 -
 docs/_scripts/jekyll-debug.sh                   |     6 -
 docs/dev/build/developers-catalog.xml           |   105 -
 docs/dev/build/eclipse.include.md               |    15 -
 docs/dev/build/ide.md                           |    95 -
 docs/dev/build/index.md                         |   184 -
 docs/dev/build/tests.md                         |    26 -
 docs/dev/build/toc.json                         |     8 -
 docs/dev/code/entity.md                         |    91 -
 docs/dev/code/index.include.md                  |    98 -
 docs/dev/code/index.md                          |     7 -
 docs/dev/code/policy.md                         |    47 -
 docs/dev/code/toc.json                          |    10 -
 docs/dev/how-to-contrib.md                      |    38 -
 docs/dev/index.md                               |     7 -
 docs/dev/links.md                               |    18 -
 docs/dev/tips/index.md                          |    50 -
 docs/dev/tips/local-artifact-repo.md            |    32 -
 docs/dev/tips/logging.md                        |   140 -
 docs/dev/tips/release.md                        |   284 -
 docs/dev/tips/standards.md                      |    15 -
 docs/dev/tips/toc.json                          |    14 -
 docs/dev/tips/update-docs.md                    |    70 -
 docs/dev/toc.json                               |    26 -
 docs/guide/concepts/advanced-concepts.md        |    14 +
 .../concepts/application-parent-membership.md   |    25 +
 ...ooklyn-flow-websequencediagrams.com-w400.png |   Bin 0 -> 58518 bytes
 .../brooklyn-flow-websequencediagrams.com.png   |   Bin 0 -> 106928 bytes
 .../concepts/configuration-sensor-effectors.md  |    42 +
 docs/guide/concepts/dependent-configuration.md  |    34 +
 docs/guide/concepts/entities.md                 |    23 +
 docs/guide/concepts/execution.md                |    34 +
 docs/guide/concepts/index.md                    |    21 +
 .../concepts/lifecycle-managementcontext.md     |    44 +
 docs/guide/concepts/location.md                 |    22 +
 docs/guide/concepts/policies.md                 |    11 +
 docs/guide/dev/code/index.md                    |    97 +
 docs/guide/dev/code/tests.md                    |    26 +
 docs/guide/dev/env/ide/eclipse.include.md       |    13 +
 docs/guide/dev/env/ide/index.md                 |   122 +
 docs/guide/dev/env/index.md                     |    13 +
 docs/guide/dev/env/maven-build.md               |   180 +
 docs/guide/dev/index.md                         |    37 +
 .../guide/dev/tips/debugging-remote-brooklyn.md |   138 +
 docs/guide/dev/tips/index.md                    |    49 +
 docs/guide/dev/tips/logging.md                  |   143 +
 docs/guide/index.md                             |    20 +
 docs/guide/java/archetype.md                    |    64 +
 docs/guide/java/common-usage.md                 |   140 +
 docs/guide/java/defining-and-deploying.md       |   125 +
 docs/guide/java/entities.md                     |   126 +
 docs/guide/java/entitlements.md                 |    42 +
 docs/guide/java/entity.md                       |    90 +
 docs/guide/java/index.md                        |    23 +
 docs/guide/java/policies.md                     |   123 +
 docs/guide/java/policy.md                       |    46 +
 docs/guide/java/service-state.md                |    73 +
 ...topology-dependencies-management-policies.md |    69 +
 docs/guide/java/wt-deployed-application-700.png |   Bin 0 -> 176494 bytes
 docs/guide/java/wt-deployed-application.png     |   Bin 0 -> 127347 bytes
 docs/guide/java/wt-starting-700.png             |   Bin 0 -> 303892 bytes
 docs/guide/java/wt-starting.png                 |   Bin 0 -> 332710 bytes
 docs/guide/java/wt-tree-jboss-sensors-700.png   |   Bin 0 -> 268853 bytes
 docs/guide/java/wt-tree-jboss-sensors.png       |   Bin 0 -> 169929 bytes
 docs/guide/misc/download.md                     |   176 +
 docs/guide/misc/index.md                        |    20 +
 docs/guide/misc/javadoc/index.md                |    11 +
 docs/guide/misc/known-issues.md                 |    27 +
 docs/guide/misc/release-notes.md                |    50 +
 docs/guide/ops/brooklyn_properties.md           |   189 +
 docs/guide/ops/catalog/index.md                 |   174 +
 .../guide/ops/catalog/mysql-in-catalog-w700.png |   Bin 0 -> 92767 bytes
 docs/guide/ops/catalog/mysql-in-catalog.png     |   Bin 0 -> 168831 bytes
 docs/guide/ops/cli.md                           |   143 +
 docs/guide/ops/index.md                         |    13 +
 docs/guide/ops/locations/index.md               |   268 +
 docs/guide/ops/locations/more-locations.md      |    55 +
 docs/guide/ops/locations/ssh-keys.md            |    85 +
 docs/guide/ops/logging.md                       |    46 +
 docs/guide/ops/persistence/index.md             |   281 +
 docs/guide/start/_my-web-cluster.yaml           |    21 +
 docs/guide/start/blueprints.md                  |    63 +
 docs/guide/start/brooklyn.properties            |   324 +
 docs/guide/start/catalog.xml                    |    22 +
 ...cation-catalog-web-cluster-with-db-large.png |   Bin 0 -> 131618 bytes
 ...talog-web-cluster-with-db-location-large.png |   Bin 0 -> 152721 bytes
 ...ion-catalog-web-cluster-with-db-location.png |   Bin 0 -> 86425 bytes
 ...-application-catalog-web-cluster-with-db.png |   Bin 0 -> 76065 bytes
 .../start/images/add-application-modal-yaml.png |   Bin 0 -> 68401 bytes
 .../images/jboss7-cluster-policies-large.png    |   Bin 0 -> 157883 bytes
 .../start/images/jboss7-cluster-policies.png    |   Bin 0 -> 94056 bytes
 .../start/images/my-db-activities-large.png     |   Bin 0 -> 208313 bytes
 docs/guide/start/images/my-db-activities.png    |   Bin 0 -> 130262 bytes
 .../start/images/my-web-cluster-starting.png    |   Bin 0 -> 32948 bytes
 .../my-web-cluster-stop-confirm-large.png       |   Bin 0 -> 148155 bytes
 .../images/my-web-cluster-stop-confirm.png      |   Bin 0 -> 79280 bytes
 .../guide/start/images/my-web-summary-large.png |   Bin 0 -> 178785 bytes
 docs/guide/start/images/my-web-summary.png      |   Bin 0 -> 80583 bytes
 docs/guide/start/images/my-web.png              |   Bin 0 -> 83081 bytes
 docs/guide/start/index.md                       |    12 +
 docs/guide/start/managing.md                    |    56 +
 docs/guide/start/policies.md                    |    51 +
 docs/guide/start/running.md                     |    68 +
 docs/guide/yaml/chef/about-chef.md              |    50 +
 .../yaml/chef/advanced-chef-integration.md      |    48 +
 docs/guide/yaml/chef/chef-call-flow.png         |   Bin 0 -> 36222 bytes
 docs/guide/yaml/chef/creating-blueprints.md     |   103 +
 .../yaml/chef/example_yaml/mysql-chef-1.yaml    |    24 +
 .../yaml/chef/example_yaml/mysql-chef-2.yaml    |    28 +
 docs/guide/yaml/chef/index.md                   |    18 +
 docs/guide/yaml/chef/writing-chef.md            |    79 +
 docs/guide/yaml/clusters-and-policies.md        |    42 +
 docs/guide/yaml/clusters.md                     |    34 +
 docs/guide/yaml/configuring-vms.md              |    31 +
 docs/guide/yaml/creating-yaml.md                |    78 +
 docs/guide/yaml/custom-entities.md              |   107 +
 .../appserver-clustered-w-db-concise.yaml       |    15 +
 .../example_yaml/appserver-clustered-w-db.yaml  |    18 +
 .../appserver-configured-in-config.yaml         |     6 +
 .../yaml/example_yaml/appserver-configured.yaml |     5 +
 .../appserver-w-db-other-flavor.yaml            |    17 +
 .../guide/yaml/example_yaml/appserver-w-db.yaml |    15 +
 .../yaml/example_yaml/appserver-w-policy.yaml   |    26 +
 docs/guide/yaml/example_yaml/cluster-vm.yaml    |    12 +
 .../simple-appserver-with-location-byon.yaml    |    12 +
 .../simple-appserver-with-location.yaml         |     8 +
 .../yaml/example_yaml/simple-appserver.yaml     |     4 +
 docs/guide/yaml/example_yaml/simple-vm.yaml     |     8 +
 .../example_yaml/vanilla-bash-netcat-file.yaml  |     6 +
 .../vanilla-bash-netcat-restarter.yaml          |    20 +
 .../vanilla-bash-netcat-w-client.yaml           |    76 +
 .../yaml/example_yaml/vanilla-bash-netcat.yaml  |    18 +
 docs/guide/yaml/index.md                        |    17 +
 docs/guide/yaml/multiple-services.md            |    97 +
 docs/guide/yaml/setting-locations.md            |    45 +
 docs/guide/yaml/web-console-yaml-700.png        |   Bin 0 -> 138229 bytes
 docs/guide/yaml/web-console-yaml.png            |   Bin 0 -> 661136 bytes
 docs/guide/yaml/yaml-reference.md               |   181 +
 docs/index.md                                   |    21 +-
 .../contributor-agreements/brooklyn-ccla.txt    |   175 -
 .../contributor-agreements/brooklyn-icla.txt    |   128 -
 .../corporate-update-schedule.md                |     7 -
 .../license/contributor-agreements/corporate.md |     7 -
 docs/license/contributor-agreements/index.md    |    36 -
 .../contributor-agreements/individual.md        |     7 -
 docs/license/contributor-agreements/toc.json    |    14 -
 docs/license/index.md                           |    21 -
 docs/license/license.md                         |   194 -
 docs/license/toc.json                           |     8 -
 docs/meta/brooklyn-gpg-public-key.asc           |    21 -
 docs/meta/contact.include.md                    |     9 -
 docs/meta/contact.md                            |     7 -
 docs/meta/governance.md                         |    60 -
 docs/meta/irc.md                                |    31 -
 docs/meta/toc.json                              |    10 -
 docs/meta/verify.md                             |    36 -
 docs/meta/versions.md                           |   106 -
 docs/start/docs-summary.include.md              |     7 -
 docs/start/docs-summary.md                      |     9 -
 docs/start/download.md                          |   185 -
 docs/start/index.include.md                     |    50 -
 docs/start/index.md                             |     8 -
 docs/start/known-issues.md                      |    28 -
 docs/start/release-notes.md                     |    56 -
 docs/start/toc.json                             |    10 -
 docs/start/video.md                             |     7 -
 docs/start/walkthrough/index.md                 |   240 -
 .../walkthrough/wt-deployed-application-700.png |   Bin 176494 -> 0 bytes
 .../walkthrough/wt-deployed-application.png     |   Bin 127347 -> 0 bytes
 docs/start/walkthrough/wt-starting-700.png      |   Bin 303892 -> 0 bytes
 docs/start/walkthrough/wt-starting.png          |   Bin 332710 -> 0 bytes
 .../walkthrough/wt-tree-jboss-sensors-700.png   |   Bin 268853 -> 0 bytes
 .../start/walkthrough/wt-tree-jboss-sensors.png |   Bin 169929 -> 0 bytes
 docs/style/css/_archive_warning.scss            |    31 +
 docs/style/css/_basic.scss                      |    62 +
 docs/style/css/_blueprint_tour.scss             |   181 +
 docs/style/css/_code_blocks.scss                |    98 +
 docs/style/css/_feature_list.scss               |    60 +
 docs/style/css/_footer.scss                     |    36 +
 docs/style/css/_landing.scss                    |    26 +
 docs/style/css/_main_container.scss             |    84 +
 docs/style/css/_menu.scss                       |   201 +
 docs/style/css/_search.scss                     |    29 +
 docs/style/css/_tooltips.scss                   |    14 +
 docs/style/css/_util.scss                       |    27 +
 docs/style/css/code.css                         |    79 +
 docs/style/css/javadoc.scss                     |   119 +
 docs/style/css/website.scss                     |    20 +
 docs/style/deps/README.md                       |     3 +
 .../glyphicons-halflings-regular.eot            |   Bin 0 -> 20335 bytes
 .../glyphicons-halflings-regular.svg            |   229 +
 .../glyphicons-halflings-regular.ttf            |   Bin 0 -> 41280 bytes
 .../glyphicons-halflings-regular.woff           |   Bin 0 -> 23320 bytes
 docs/style/deps/bootstrap-theme.css             |   346 +
 docs/style/deps/bootstrap.css                   |  5784 ++++
 docs/style/deps/bootstrap.js                    |  1951 ++
 docs/style/deps/bootstrap.min.css               |     7 +
 docs/style/deps/bootstrap.min.js                |     6 +
 docs/style/deps/font-awesome-4.2.0/_LICENSE     |     1 +
 .../font-awesome-4.2.0/css/font-awesome.css     |  1672 ++
 .../font-awesome-4.2.0/css/font-awesome.min.css |     4 +
 .../font-awesome-4.2.0/fonts/FontAwesome.otf    |   Bin 0 -> 85908 bytes
 .../fonts/fontawesome-webfont.eot               |   Bin 0 -> 56006 bytes
 .../fonts/fontawesome-webfont.svg               |   520 +
 .../fonts/fontawesome-webfont.ttf               |   Bin 0 -> 112160 bytes
 .../fonts/fontawesome-webfont.woff              |   Bin 0 -> 65452 bytes
 .../less/bordered-pulled.less                   |    16 +
 .../deps/font-awesome-4.2.0/less/core.less      |    11 +
 .../font-awesome-4.2.0/less/fixed-width.less    |     6 +
 .../font-awesome-4.2.0/less/font-awesome.less   |    17 +
 .../deps/font-awesome-4.2.0/less/icons.less     |   552 +
 .../deps/font-awesome-4.2.0/less/larger.less    |    13 +
 .../deps/font-awesome-4.2.0/less/list.less      |    19 +
 .../deps/font-awesome-4.2.0/less/mixins.less    |    25 +
 .../deps/font-awesome-4.2.0/less/path.less      |    14 +
 .../less/rotated-flipped.less                   |    20 +
 .../deps/font-awesome-4.2.0/less/spinning.less  |    29 +
 .../deps/font-awesome-4.2.0/less/stacked.less   |    20 +
 .../deps/font-awesome-4.2.0/less/variables.less |   561 +
 .../scss/_bordered-pulled.scss                  |    16 +
 .../deps/font-awesome-4.2.0/scss/_core.scss     |    11 +
 .../font-awesome-4.2.0/scss/_fixed-width.scss   |     6 +
 .../deps/font-awesome-4.2.0/scss/_icons.scss    |   552 +
 .../deps/font-awesome-4.2.0/scss/_larger.scss   |    13 +
 .../deps/font-awesome-4.2.0/scss/_list.scss     |    19 +
 .../deps/font-awesome-4.2.0/scss/_mixins.scss   |    25 +
 .../deps/font-awesome-4.2.0/scss/_path.scss     |    14 +
 .../scss/_rotated-flipped.scss                  |    20 +
 .../deps/font-awesome-4.2.0/scss/_spinning.scss |    29 +
 .../deps/font-awesome-4.2.0/scss/_stacked.scss  |    20 +
 .../font-awesome-4.2.0/scss/_variables.scss     |   561 +
 .../font-awesome-4.2.0/scss/font-awesome.scss   |    17 +
 .../images/ui-bg_flat_0_aaaaaa_40x100.png       |   Bin 0 -> 180 bytes
 .../images/ui-bg_flat_75_ffffff_40x100.png      |   Bin 0 -> 178 bytes
 .../images/ui-bg_glass_55_fbf9ee_1x400.png      |   Bin 0 -> 120 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png      |   Bin 0 -> 105 bytes
 .../images/ui-bg_glass_75_dadada_1x400.png      |   Bin 0 -> 111 bytes
 .../images/ui-bg_glass_75_e6e6e6_1x400.png      |   Bin 0 -> 110 bytes
 .../images/ui-bg_glass_95_fef1ec_1x400.png      |   Bin 0 -> 119 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png    |   Bin 0 -> 101 bytes
 .../images/ui-icons_222222_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_2e83ff_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_454545_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_888888_256x240.png          |   Bin 0 -> 4369 bytes
 .../images/ui-icons_cd0a0a_256x240.png          |   Bin 0 -> 4369 bytes
 .../deps/jquery-ui/jquery-ui-1.8.18.custom.css  |   565 +
 .../jquery-ui/jquery-ui-1.8.18.custom.min.js    |   356 +
 docs/style/deps/jquery.cookie.js                |    94 +
 docs/style/deps/jquery.js                       |  9190 ++++++
 docs/style/deps/jquery.min.js                   |     4 +
 docs/style/deps/octicons/LICENSE.txt            |     9 +
 docs/style/deps/octicons/README.md              |     1 +
 docs/style/deps/octicons/octicons-local.ttf     |   Bin 0 -> 52764 bytes
 docs/style/deps/octicons/octicons.css           |   235 +
 docs/style/deps/octicons/octicons.eot           |   Bin 0 -> 31440 bytes
 docs/style/deps/octicons/octicons.less          |   233 +
 docs/style/deps/octicons/octicons.svg           |   198 +
 docs/style/deps/octicons/octicons.ttf           |   Bin 0 -> 31272 bytes
 docs/style/deps/octicons/octicons.woff          |   Bin 0 -> 17492 bytes
 .../style/deps/octicons/sprockets-octicons.scss |   230 +
 docs/style/deps/superfish.js                    |   121 +
 docs/style/deps/underscore-min.js               |     6 +
 docs/style/deps/underscore-min.map              |     1 +
 docs/style/docs/code.css                        |    79 -
 docs/style/icons/clipboard-green-click.png      |   Bin 51832 -> 0 bytes
 docs/style/icons/clipboard-green-hover.png      |   Bin 51473 -> 0 bytes
 docs/style/icons/clipboard-green-normal.png     |   Bin 61853 -> 0 bytes
 docs/style/icons/clipboard.png                  |   Bin 3981 -> 0 bytes
 docs/style/icons/ok.png                         |   Bin 595 -> 0 bytes
 docs/style/icons/warning.png                    |   Bin 29886 -> 0 bytes
 docs/style/images/bridge.png                    |   Bin 20450 -> 0 bytes
 docs/style/images/brooklyn.gif                  |   Bin 4873 -> 0 bytes
 docs/style/images/divider-quicklinks.gif        |   Bin 817 -> 0 bytes
 .../img/apache-brooklyn-logo-244px-wide.png     |   Bin 0 -> 4892 bytes
 .../img/apache-brooklyn-logo-817px-wide.png     |   Bin 0 -> 10688 bytes
 docs/style/img/bridge-large-no-title.png        |   Bin 0 -> 66113 bytes
 docs/style/img/bridge.png                       |   Bin 0 -> 20450 bytes
 docs/style/img/brooklyn.gif                     |   Bin 0 -> 4873 bytes
 docs/style/img/clipboard-green-click.png        |   Bin 0 -> 51832 bytes
 docs/style/img/clipboard-green-hover.png        |   Bin 0 -> 51473 bytes
 docs/style/img/clipboard-green-normal.png       |   Bin 0 -> 61853 bytes
 docs/style/img/clipboard.png                    |   Bin 0 -> 3981 bytes
 docs/style/img/divider-quicklinks.gif           |   Bin 0 -> 817 bytes
 docs/style/img/feather.png                      |   Bin 0 -> 40042 bytes
 docs/style/img/github-1024-black.png            |   Bin 0 -> 15613 bytes
 docs/style/img/github-256-black.png             |   Bin 0 -> 12166 bytes
 docs/style/img/github-256-green.png             |   Bin 0 -> 13875 bytes
 docs/style/img/irc-256-black.png                |   Bin 0 -> 4446 bytes
 docs/style/img/irc-256-green.png                |   Bin 0 -> 5731 bytes
 docs/style/img/irc-icon.graffle                 |   640 +
 docs/style/img/ok.png                           |   Bin 0 -> 595 bytes
 docs/style/img/twitter-256-black.png            |   Bin 0 -> 10590 bytes
 docs/style/img/twitter-256-green.png            |   Bin 0 -> 11732 bytes
 docs/style/img/twitter-4096-black.png           |   Bin 0 -> 45680 bytes
 docs/style/img/warning.png                      |   Bin 0 -> 29886 bytes
 docs/style/js/_readme.txt                       |     2 +
 docs/style/js/jquery.cookie.js                  |    94 -
 docs/style/js/jquery/jquery-1.7.1.min.js        |     4 -
 .../js/jquery/jquery-ui-1.8.18.custom.min.js    |   356 -
 .../images/ui-bg_flat_0_aaaaaa_40x100.png       |   Bin 180 -> 0 bytes
 .../images/ui-bg_flat_75_ffffff_40x100.png      |   Bin 178 -> 0 bytes
 .../images/ui-bg_glass_55_fbf9ee_1x400.png      |   Bin 120 -> 0 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png      |   Bin 105 -> 0 bytes
 .../images/ui-bg_glass_75_dadada_1x400.png      |   Bin 111 -> 0 bytes
 .../images/ui-bg_glass_75_e6e6e6_1x400.png      |   Bin 110 -> 0 bytes
 .../images/ui-bg_glass_95_fef1ec_1x400.png      |   Bin 119 -> 0 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png    |   Bin 101 -> 0 bytes
 .../images/ui-icons_222222_256x240.png          |   Bin 4369 -> 0 bytes
 .../images/ui-icons_2e83ff_256x240.png          |   Bin 4369 -> 0 bytes
 .../images/ui-icons_454545_256x240.png          |   Bin 4369 -> 0 bytes
 .../images/ui-icons_888888_256x240.png          |   Bin 4369 -> 0 bytes
 .../images/ui-icons_cd0a0a_256x240.png          |   Bin 4369 -> 0 bytes
 .../smoothness/jquery-ui-1.8.18.custom.css      |   565 -
 docs/style/js/superfish.js                      |   121 -
 docs/style/js/underscore-min.js                 |     6 +
 docs/style/js/underscore-min.map                |     1 +
 docs/style/js/zeroclipboard/ZeroClipboard.js    |  1010 -
 .../style/js/zeroclipboard/ZeroClipboard.min.js |     9 -
 docs/style/js/zeroclipboard/ZeroClipboard.swf   |   Bin 1891 -> 0 bytes
 docs/style/style.css                            |   152 -
 docs/style/toc.css                              |    88 -
 docs/tests/jsonball/test_jsonball.md            |    18 -
 docs/tests/jsonball/test_jsonball_file.json     |     1 -
 docs/tests/jsonball/test_jsonball_page.json     |     2 -
 docs/tests/jsonball/toc.json                    |     6 -
 docs/toc-menu.json                              |    20 -
 docs/toc.json                                   |    21 -
 docs/use/api/index.md                           |    11 -
 docs/use/contact.md                             |     7 -
 docs/use/examples/before-begin.include.md       |    57 -
 .../console-geoscaling-details-w700.png         |   Bin 167441 -> 0 bytes
 .../console-geoscaling-details.png              |   Bin 176651 -> 0 bytes
 .../global-web-fabric/console-map-w700.png      |   Bin 201060 -> 0 bytes
 .../examples/global-web-fabric/console-map.png  |   Bin 331520 -> 0 bytes
 .../geopaas-deployed-app-w700.png               |   Bin 153738 -> 0 bytes
 .../global-web-fabric/geopaas-deployed-app.png  |   Bin 114615 -> 0 bytes
 docs/use/examples/global-web-fabric/index.md    |   378 -
 docs/use/examples/index.md                      |    18 -
 docs/use/examples/messaging/index.md            |   183 -
 .../nosql-cassandra/cassandra.include.md        |   282 -
 docs/use/examples/nosql-cassandra/index.md      |     7 -
 docs/use/examples/simple-web-cluster.md         |     9 -
 docs/use/examples/toc.json                      |    13 -
 docs/use/examples/webcluster.md                 |     9 -
 docs/use/examples/webcluster/index.md           |     7 -
 .../examples/webcluster/webcluster.include.md   |   124 -
 .../defining-applications/advanced-concepts.md  |   137 -
 .../guide/defining-applications/archetype.md    |    64 -
 .../defining-applications/basic-concepts.md     |    95 -
 ...ooklyn-flow-websequencediagrams.com-w400.png |   Bin 58518 -> 0 bytes
 .../brooklyn-flow-websequencediagrams.com.png   |   Bin 106928 -> 0 bytes
 .../defining-applications/chef-blueprints.md    |   235 -
 .../guide/defining-applications/common-usage.md |   145 -
 .../defining-applications/creating-yaml.md      |   417 -
 .../defining-applications/deploying-yaml.md     |    37 -
 .../example_files/tomcat_multi-location.java    |    33 -
 .../example_files/tomcat_nginx.java             |    35 -
 .../example_files/tomcat_simple.java            |    27 -
 .../appserver-clustered-w-db-concise.yaml       |    33 -
 .../example_yaml/appserver-clustered-w-db.yaml  |    36 -
 .../appserver-configured-in-config.yaml         |    24 -
 .../example_yaml/appserver-configured.yaml      |    23 -
 .../appserver-w-db-other-flavor.yaml            |    35 -
 .../example_yaml/appserver-w-db.yaml            |    33 -
 .../example_yaml/appserver-w-policy.yaml        |    44 -
 .../example_yaml/cluster-vm.yaml                |    30 -
 .../example_yaml/mysql-chef-1.yaml              |    42 -
 .../example_yaml/mysql-chef-2.yaml              |    46 -
 .../simple-appserver-with-location-byon.yaml    |    30 -
 .../simple-appserver-with-location.yaml         |    26 -
 .../example_yaml/simple-appserver.yaml          |    22 -
 .../example_yaml/simple-vm.yaml                 |    26 -
 .../example_yaml/vanilla-bash-netcat-file.yaml  |    24 -
 .../vanilla-bash-netcat-restarter.yaml          |    37 -
 .../vanilla-bash-netcat-w-client.yaml           |    90 -
 .../example_yaml/vanilla-bash-netcat.yaml       |    36 -
 .../use/guide/defining-applications/examples.md |   120 -
 docs/use/guide/defining-applications/toc.json   |    17 -
 .../web-console-yaml-700.png                    |   Bin 138229 -> 0 bytes
 .../defining-applications/web-console-yaml.png  |   Bin 661136 -> 0 bytes
 .../defining-applications/yaml-reference.md     |   183 -
 docs/use/guide/entities/index.md                |   133 -
 docs/use/guide/entities/toc.json                |    12 -
 docs/use/guide/extras/index.md                  |   160 -
 docs/use/guide/extras/toc.json                  |    11 -
 docs/use/guide/guide_toc.json                   |    25 -
 docs/use/guide/index.md                         |    33 -
 docs/use/guide/locations/index.md               |   104 -
 docs/use/guide/locations/toc.json               |     1 -
 docs/use/guide/management/index.md              |   383 -
 docs/use/guide/management/toc.json              |    18 -
 .../management/webconsole-dashboard-w400.png    |   Bin 137463 -> 0 bytes
 .../guide/management/webconsole-dashboard.png   |   Bin 214723 -> 0 bytes
 .../guide/management/webconsole-detail-w400.png |   Bin 111993 -> 0 bytes
 docs/use/guide/management/webconsole-detail.png |   Bin 165359 -> 0 bytes
 docs/use/guide/persistence/index.md             |   219 -
 docs/use/guide/persistence/toc.json             |    14 -
 docs/use/guide/policies/index.md                |   129 -
 docs/use/guide/policies/toc.json                |     8 -
 docs/use/guide/quickstart/brooklyn.properties   |   324 -
 docs/use/guide/quickstart/catalog.xml           |    41 -
 ...cation-catalog-web-cluster-with-db-large.png |   Bin 131618 -> 0 bytes
 ...talog-web-cluster-with-db-location-large.png |   Bin 152721 -> 0 bytes
 ...ion-catalog-web-cluster-with-db-location.png |   Bin 86425 -> 0 bytes
 ...-application-catalog-web-cluster-with-db.png |   Bin 76065 -> 0 bytes
 .../images/add-application-modal-yaml.png       |   Bin 68401 -> 0 bytes
 .../images/jboss7-cluster-policies-large.png    |   Bin 157883 -> 0 bytes
 .../images/jboss7-cluster-policies.png          |   Bin 94056 -> 0 bytes
 .../images/my-db-activities-large.png           |   Bin 208313 -> 0 bytes
 .../quickstart/images/my-db-activities.png      |   Bin 130262 -> 0 bytes
 .../images/my-web-cluster-starting.png          |   Bin 32948 -> 0 bytes
 .../my-web-cluster-stop-confirm-large.png       |   Bin 148155 -> 0 bytes
 .../images/my-web-cluster-stop-confirm.png      |   Bin 79280 -> 0 bytes
 .../quickstart/images/my-web-summary-large.png  |   Bin 178785 -> 0 bytes
 .../guide/quickstart/images/my-web-summary.png  |   Bin 80583 -> 0 bytes
 docs/use/guide/quickstart/images/my-web.png     |   Bin 83081 -> 0 bytes
 docs/use/guide/quickstart/index.md              |   221 -
 docs/use/guide/quickstart/my-web-cluster.yaml   |    37 -
 .../guide/quickstart/policies-and-catalogs.md   |    66 -
 docs/use/guide/quickstart/toc.json              |     4 -
 docs/use/guide/toc.json                         |    25 -
 docs/use/index.md                               |     9 -
 docs/use/toc.json                               |    12 -
 .../website/community/how-to-contribute-docs.md |   158 +
 docs/website/community/index.md                 |    73 +
 docs/website/community/irc.md                   |    14 +
 docs/website/community/mailing-lists.md         |    36 +
 docs/website/developers/code-standards.md       |    14 +
 docs/website/developers/committers/index.md     |    10 +
 .../committers/merging-contributed-code.md      |   118 +
 docs/website/developers/fork-after.png          |   Bin 0 -> 134377 bytes
 docs/website/developers/fork-before.png         |   Bin 0 -> 131674 bytes
 docs/website/developers/fork-new.png            |   Bin 0 -> 137626 bytes
 docs/website/developers/how-to-contribute.md    |   109 +
 docs/website/developers/index.md                |    42 +
 docs/website/developers/links.md                |    22 +
 docs/website/developers/pull-request.png        |   Bin 0 -> 94166 bytes
 docs/website/documentation/faq.md               |    22 +
 docs/website/documentation/glossary.md          |    92 +
 docs/website/documentation/increase-entropy.md  |    31 +
 docs/website/documentation/index.md             |    34 +
 docs/website/documentation/install-on-server.md |   128 +
 docs/website/documentation/other-docs.md        |    11 +
 docs/website/download/index.md                  |    42 +
 docs/website/download/verify.md                 |    92 +
 docs/website/index.md                           |    76 +
 docs/website/learnmore/blueprint-tour.md        |   191 +
 docs/website/learnmore/catalog/common.js        |    94 +
 .../brooklyn.enricher.DeltaEnricher.html        |    59 +
 .../brooklyn.enricher.HttpLatencyDetector.html  |    59 +
 .../brooklyn.enricher.RollingMeanEnricher.html  |    59 +
 ....enricher.RollingTimeWindowMeanEnricher.html |    59 +
 ...klyn.enricher.TimeFractionDeltaEnricher.html |    59 +
 ...klyn.enricher.TimeWeightedDeltaEnricher.html |    59 +
 .../brooklyn.enricher.basic.Aggregator.html     |    59 +
 .../brooklyn.enricher.basic.Combiner.html       |    59 +
 .../brooklyn.enricher.basic.Propagator.html     |    59 +
 .../brooklyn.enricher.basic.Transformer.html    |    59 +
 ...ooklyn.policy.ha.ServiceFailureDetector.html |    59 +
 ...lyn.entity.basic.VanillaSoftwareProcess.html |    66 +
 ...ntity.brooklynnode.BrooklynEntityMirror.html |    66 +
 ...ooklyn.entity.brooklynnode.BrooklynNode.html |    66 +
 ...lyn.entity.database.mariadb.MariaDbNode.html |    66 +
 ...rooklyn.entity.database.mysql.MySqlNode.html |    66 +
 ...tity.database.postgresql.PostgreSqlNode.html |    66 +
 ...lyn.entity.database.rubyrep.RubyRepNode.html |    66 +
 .../brooklyn.entity.machine.MachineEntity.html  |    66 +
 ...ntity.messaging.activemq.ActiveMQBroker.html |    66 +
 ...lyn.entity.messaging.kafka.KafkaCluster.html |    66 +
 ...ooklyn.entity.messaging.qpid.QpidBroker.html |    66 +
 ...yn.entity.messaging.rabbit.RabbitBroker.html |    66 +
 .../brooklyn.entity.messaging.storm.Storm.html  |    66 +
 ....entity.messaging.storm.StormDeployment.html |    66 +
 ...oklyn.entity.monitoring.monit.MonitNode.html |    66 +
 ...oklyn.entity.network.bind.BindDnsServer.html |    66 +
 ...ity.nosql.cassandra.CassandraDatacenter.html |    66 +
 ....entity.nosql.cassandra.CassandraFabric.html |    66 +
 ...yn.entity.nosql.cassandra.CassandraNode.html |    66 +
 ...entity.nosql.couchbase.CouchbaseCluster.html |    66 +
 ...yn.entity.nosql.couchbase.CouchbaseNode.html |    66 +
 ...ooklyn.entity.nosql.couchdb.CouchDBNode.html |    66 +
 ...osql.elasticsearch.ElasticSearchCluster.html |    66 +
 ...y.nosql.elasticsearch.ElasticSearchNode.html |    66 +
 ...klyn.entity.nosql.mongodb.MongoDBServer.html |    66 +
 ...ty.nosql.mongodb.sharding.MongoDBRouter.html |    66 +
 ...ngodb.sharding.MongoDBShardedDeployment.html |    66 +
 ...rooklyn.entity.nosql.redis.RedisCluster.html |    66 +
 .../brooklyn.entity.nosql.redis.RedisStore.html |    66 +
 .../brooklyn.entity.nosql.riak.RiakCluster.html |    66 +
 .../brooklyn.entity.nosql.riak.RiakNode.html    |    66 +
 .../brooklyn.entity.nosql.solr.SolrServer.html  |    66 +
 ...ooklyn.entity.osgi.karaf.KarafContainer.html |    66 +
 .../brooklyn.entity.pool.ServerPool.html        |    66 +
 ...klyn.entity.proxy.nginx.NginxController.html |    66 +
 ...y.webapp.ControlledDynamicWebAppCluster.html |    66 +
 ...klyn.entity.webapp.DynamicWebAppCluster.html |    66 +
 ...ooklyn.entity.webapp.jboss.JBoss6Server.html |    66 +
 ...ooklyn.entity.webapp.jboss.JBoss7Server.html |    66 +
 ...ooklyn.entity.webapp.jetty.Jetty6Server.html |    66 +
 ...ntity.webapp.nodejs.NodeJsWebAppService.html |    66 +
 ...oklyn.entity.webapp.tomcat.TomcatServer.html |    66 +
 ...klyn.entity.zookeeper.ZooKeeperEnsemble.html |    66 +
 ...brooklyn.entity.zookeeper.ZooKeeperNode.html |    66 +
 docs/website/learnmore/catalog/index.md         |   131 +
 docs/website/learnmore/catalog/items.css        |   153 +
 docs/website/learnmore/catalog/items.js         | 24674 +++++++++++++++++
 .../learnmore/catalog/libs/js/bloodhound.js     |   727 +
 ...brooklyn.entity.pool.ServerPoolLocation.html |    62 +
 .../brooklyn.location.AddressableLocation.html  |    62 +
 .../brooklyn.location.MachineLocation.html      |    62 +
 ...tMixins$RichMachineProvisioningLocation.html |    62 +
 ...yn.location.MachineProvisioningLocation.html |    62 +
 ...rooklyn.location.basic.AbstractLocation.html |    62 +
 ....AggregatingMachineProvisioningLocation.html |    62 +
 ...ic.FixedListMachineProvisioningLocation.html |    62 +
 ...neProvisioningLocation$LocalhostMachine.html |    62 +
 ...ic.LocalhostMachineProvisioningLocation.html |    62 +
 ...rooklyn.location.basic.LocationInternal.html |    62 +
 .../brooklyn.location.basic.MultiLocation.html  |    62 +
 ...ooklyn.location.basic.SimulatedLocation.html |    62 +
 ...basic.SingleMachineProvisioningLocation.html |    62 +
 ...oklyn.location.basic.SshMachineLocation.html |    62 +
 ...bstractCloudMachineProvisioningLocation.html |    62 +
 ...AbstractJcloudsSubnetSshMachineLocation.html |    62 +
 ...ooklyn.location.jclouds.JcloudsLocation.html |    62 +
 ...ation.jclouds.JcloudsSshMachineLocation.html |    62 +
 ...followthesun.DefaultFollowTheSunModel$1.html |    62 +
 ...lyn.policy.autoscaling.AutoScalerPolicy.html |    59 +
 ....policy.followthesun.FollowTheSunPolicy.html |    59 +
 ...lyn.policy.ha.ConnectionFailureDetector.html |    59 +
 .../brooklyn.policy.ha.ServiceReplacer.html     |    59 +
 .../brooklyn.policy.ha.ServiceRestarter.html    |    59 +
 ...olicy.loadbalancing.LoadBalancingPolicy.html |    59 +
 .../learnmore/features/blueprint-compose.png    |   Bin 0 -> 15299 bytes
 .../features/blueprint-machine-specs.png        |   Bin 0 -> 16214 bytes
 docs/website/learnmore/features/blueprinting.md |    24 +
 docs/website/learnmore/features/index.md        |    18 +
 .../learnmore/features/java-hierarchy.png       |   Bin 0 -> 106962 bytes
 docs/website/learnmore/features/java.md         |    41 +
 docs/website/learnmore/features/operations.md   |    75 +
 docs/website/learnmore/features/ops-console.png |   Bin 0 -> 491417 bytes
 docs/website/learnmore/features/ops-rest.png    |   Bin 0 -> 62894 bytes
 .../learnmore/features/policy-based-mgmt.md     |    28 +
 docs/website/learnmore/index.md                 |    30 +
 docs/website/learnmore/theory.md                |   184 +
 docs/website/meta/license.md                    |   205 +
 docs/website/meta/sitemap.md                    |    25 +
 docs/website/meta/versions.md                   |    73 +
 examples/global-web-fabric/pom.xml              |     6 +-
 .../brooklyn/demo/GlobalWebFabricExample.java   |     2 +-
 examples/pom.xml                                |    30 +-
 examples/simple-messaging-pubsub/pom.xml        |    18 +-
 .../src/main/java/brooklyn/demo/Publish.java    |    18 +-
 .../demo/StandaloneQpidBrokerExample.java       |    24 +-
 .../src/main/resources/passwd                   |    18 +
 examples/simple-nosql-cluster/pom.xml           |     9 +-
 .../brooklyn/demo/CumulusRDFApplication.java    |    37 +-
 .../demo/HighAvailabilityCassandraCluster.java  |     7 +-
 .../java/brooklyn/demo/ResilientMongoDbApp.java |     4 +-
 .../java/brooklyn/demo/RiakClusterExample.java  |    11 +-
 .../brooklyn/demo/SimpleCassandraCluster.java   |     2 +-
 .../main/java/brooklyn/demo/StormSampleApp.java |     2 +-
 .../brooklyn/demo/WideAreaCassandraCluster.java |    13 +-
 .../brooklyn/demo/ha-cassandra-cluster.yaml     |    45 +
 .../brooklyn/demo/simple-cassandra-cluster.yaml |    28 +
 .../demo/wide-area-cassandra-cluster.yaml       |    41 +
 .../src/main/resources/cumulusrdf-0.6.1-pre.jar |   Bin 22259221 -> 0 bytes
 .../src/main/resources/cumulusrdf.war           |   Bin 21491919 -> 0 bytes
 examples/simple-open-loop-policy/README.txt     |    72 -
 .../org.marre.smsj-1.0.0-20051126.jar           |   Bin 134604 -> 0 bytes
 .../org.marre.smsj-1.0.0-20051126.pom           |     9 -
 .../org.marre.smsj/maven-metadata-local.xml     |    30 -
 examples/simple-open-loop-policy/pom.xml        |   141 -
 .../resources/jmeter-test-plan.jmx              |   143 -
 .../src/main/java/brooklyn/demo/Sms.java        |    63 -
 .../demo/WebClusterDatabaseOpenLoopExample.java |   157 -
 .../main/resources/visitors-creation-script.sql |    35 -
 .../src/test/java/brooklyn/demo/SmsTest.java    |    50 -
 examples/simple-web-cluster/pom.xml             |    14 +-
 .../brooklyn/demo/NodeJsTodoApplication.java    |    59 +
 .../brooklyn/demo/SingleWebServerExample.java   |     2 +-
 .../demo/WebClusterDatabaseExample.java         |     2 +-
 .../demo/WebClusterDatabaseExampleApp.java      |     8 +-
 .../demo/WebClusterDatabaseExampleGroovy.groovy |     2 +-
 .../java/brooklyn/demo/WebClusterExample.java   |     2 +-
 .../resources/brooklyn/demo/nodejs-todo.yaml    |    53 +
 ...lusterDatabaseExampleAppIntegrationTest.java |    31 +-
 examples/webapps/hello-world-sql/.gitignore     |     1 +
 examples/webapps/hello-world-sql/pom.xml        |    28 +-
 .../src/main/webapp/available.jsp               |   156 +-
 .../hello-world-sql/src/main/webapp/db.jsp      |   246 +-
 .../src/main/webapp/hadoop-chat.jsp             |   220 +-
 .../src/main/webapp/hadoop-wordcount.jsp        |   228 +-
 .../hello-world-sql/src/main/webapp/index.html  |    50 +-
 .../hello-world-sql/src/main/webapp/riak.jsp    |   148 +
 examples/webapps/hello-world-webapp/.gitignore  |     1 +
 examples/webapps/hello-world-webapp/pom.xml     |     2 +-
 .../src/main/webapp/available.jsp               |   152 +-
 .../hello-world-webapp/src/main/webapp/db.jsp   |   246 +-
 .../src/main/webapp/hadoop-chat.jsp             |   220 +-
 .../src/main/webapp/hadoop-wordcount.jsp        |   228 +-
 .../src/main/webapp/index.html                  |    50 +-
 examples/webapps/pom.xml                        |     5 +-
 locations/jclouds/pom.xml                       |    64 +-
 .../JcloudsBlobStoreBasedObjectStore.java       |    67 +-
 .../jclouds/JcloudsStoreObjectAccessor.java     |     2 +-
 .../location/jclouds/BrooklynImageChooser.java  |    44 +-
 .../jclouds/ComputeServiceRegistry.java         |    28 +
 .../jclouds/ComputeServiceRegistryImpl.java     |   175 +
 .../jclouds/JcloudsByonLocationResolver.java    |    22 +-
 .../location/jclouds/JcloudsLocation.java       |   594 +-
 .../location/jclouds/JcloudsLocationConfig.java |    50 +-
 .../jclouds/JcloudsLocationResolver.java        |   223 +
 .../location/jclouds/JcloudsMachineNamer.java   |    14 +-
 .../location/jclouds/JcloudsResolver.java       |   222 -
 .../jclouds/JcloudsSshMachineLocation.java      |    53 +-
 .../brooklyn/location/jclouds/JcloudsUtil.java  |   190 +-
 .../jclouds/SudoTtyFixingCustomizer.java        |    56 +
 .../BrooklynStandardJcloudsGuiceModule.java     |    32 -
 ...SoftLayerFastVirtualGuestToNodeMetadata.java |    96 -
 .../JcloudsPortForwarderExtension.java          |    13 +
 .../services/brooklyn.location.LocationResolver |     2 +-
 .../resources/sample/script/setup-server.sh     |     2 +-
 .../persister/jclouds/BlobStoreExpiryTest.java  |    32 +-
 ...nMementoPersisterJcloudsObjectStoreTest.java |    12 +-
 .../JcloudsBlobStoreBasedObjectStoreTest.java   |   119 +
 .../JcloudsObjectStoreAccessorWriterTest.java   |    89 +-
 .../jclouds/AbstractJcloudsLiveTest.java        |   158 +
 .../jclouds/AbstractJcloudsStubbedLiveTest.java |   133 +
 .../location/jclouds/AbstractJcloudsTest.java   |   151 -
 .../jclouds/BrooklynMachinePoolLiveTest.java    |     2 +-
 .../jclouds/DelegatingComputeService.java       |   229 +
 .../JcloudsByonLocationResolverAwsLiveTest.java |   178 +
 ...dsByonLocationResolverSoftlayerLiveTest.java |   105 +
 .../JcloudsByonLocationResolverTest.java        |   172 +-
 .../JcloudsHardwareProfilesStubbedLiveTest.java |    78 +
 .../jclouds/JcloudsLocationMetadataTest.java    |     3 +-
 .../JcloudsLocationRebindMachineLiveTest.java   |    13 +-
 .../jclouds/JcloudsLocationResolverTest.java    |    21 +-
 ...ationTemplateOptionsCustomisersLiveTest.java |    96 +
 .../location/jclouds/JcloudsLocationTest.java   |    14 +-
 .../location/jclouds/JcloudsLoginLiveTest.java  |    67 +-
 .../location/jclouds/JcloudsMinRamLiveTest.java |    59 -
 .../location/jclouds/JcloudsSshingLiveTest.java |    61 +
 .../location/jclouds/LiveTestEntity.java        |    15 +-
 .../jclouds/RebindJcloudsLocationLiveTest.java  |    36 +-
 ...loudsLocationUserLoginAndConfigLiveTest.java |     3 +-
 ...hineProvisioningLocationJcloudsLiveTest.java |     2 +-
 .../jclouds/StandaloneJcloudsLiveTest.java      |     4 +-
 .../JcloudsPortForwardingLiveTest.java          |   117 -
 .../JcloudsPortForwardingStubbedLiveTest.java   |   197 +
 .../pool/JcloudsMachinePoolLiveTest.java        |     4 +-
 .../GreenhouseDataLocationLiveTest.groovy       |    59 -
 .../zone/AwsAvailabilityZoneExtensionTest.java  |     8 +-
 ...location-test-various-login-credentials.yaml |    67 +
 policy/pom.xml                                  |    33 +-
 .../java/brooklyn/enricher/DeltaEnricher.java   |     3 +
 .../brooklyn/enricher/HttpLatencyDetector.java  |    43 +-
 .../brooklyn/enricher/RollingMeanEnricher.java  |     3 +
 .../enricher/RollingTimeWindowMeanEnricher.java |     3 +
 .../enricher/TimeFractionDeltaEnricher.java     |     3 +
 .../enricher/TimeWeightedDeltaEnricher.java     |     4 +
 .../policy/autoscaling/AutoScalerPolicy.java    |    56 +-
 .../policy/followthesun/FollowTheSunPolicy.java |     3 +-
 .../policy/followthesun/WeightedObject.java     |    94 +-
 .../policy/ha/ConnectionFailureDetector.java    |     3 +
 .../policy/ha/MemberFailureDetectionPolicy.java |     8 +-
 .../policy/ha/ServiceFailureDetector.java       |   462 +-
 .../brooklyn/policy/ha/ServiceReplacer.java     |     9 +-
 .../brooklyn/policy/ha/ServiceRestarter.java    |     8 +-
 .../loadbalancing/BalanceableContainer.java     |    13 +-
 .../loadbalancing/BalanceableWorkerPool.java    |     3 +
 .../BalanceableWorkerPoolImpl.java              |     6 +-
 .../DefaultBalanceablePoolModel.java            |     2 +-
 .../loadbalancing/LoadBalancingPolicy.java      |    22 +-
 .../entity/brooklyn/BrooklynMetricsTest.java    |    25 +-
 .../autoscaling/AutoScalerPolicyMetricTest.java |    54 +-
 .../autoscaling/AutoScalerPolicyRebindTest.java |     8 +-
 .../AutoScalerPolicyReconfigurationTest.java    |    29 +-
 .../autoscaling/AutoScalerPolicyTest.java       |    76 +-
 .../AbstractFollowTheSunPolicyTest.java         |     7 +-
 .../FollowTheSunPolicySoakTest.java             |    16 +-
 .../brooklyn/policy/ha/HaPolicyRebindTest.java  |     9 +-
 ...ServiceFailureDetectorStabilizationTest.java |    38 +-
 .../policy/ha/ServiceFailureDetectorTest.java   |   207 +-
 .../brooklyn/policy/ha/ServiceReplacerTest.java |    39 +-
 .../policy/ha/ServiceRestarterTest.java         |     4 +-
 .../AbstractLoadBalancingPolicyTest.java        |     2 +-
 .../loadbalancing/LoadBalancingPolicyTest.java  |     7 +-
 .../loadbalancing/MockContainerEntity.java      |     5 +-
 .../loadbalancing/MockContainerEntityImpl.java  |     9 +-
 .../policy/loadbalancing/MockItemEntity.java    |     1 +
 pom.xml                                         |   499 +-
 sandbox/cassandra-multicloud-snitch/pom.xml     |     2 +-
 sandbox/database/pom.xml                        |    28 +-
 .../entity/database/derby/DerbyDatabase.java    |     4 +-
 sandbox/dropwizard/README.txt                   |    31 -
 sandbox/dropwizard/brooklyn                     |    25 -
 sandbox/dropwizard/brooklynd                    |    21 -
 sandbox/dropwizard/config.sample.yml            |    65 -
 sandbox/dropwizard/pom.xml                      |   232 -
 .../AppByType_WebClusterDatabaseExample.json    |     7 -
 .../AppByType_WebClusterDatabaseExample.sh      |    21 -
 .../samples/WebClusterWithMySQLDatabase.groovy  |    83 -
 sandbox/dropwizard/samples/location.json        |     1 -
 sandbox/dropwizard/samples/mysql.json           |    10 -
 sandbox/dropwizard/samples/redis.json           |    11 -
 .../src/main/java/brooklyn/cli/Client.java      |   116 -
 .../brooklyn/cli/commands/BrooklynCommand.java  |   245 -
 .../cli/commands/CatalogEntitiesCommand.java    |    58 -
 .../cli/commands/CatalogPoliciesCommand.java    |    58 -
 .../cli/commands/CommandExecutionException.java |    33 -
 .../brooklyn/cli/commands/DeployCommand.java    |   220 -
 .../java/brooklyn/cli/commands/HelpCommand.java |    40 -
 .../cli/commands/ListApplicationsCommand.java   |    60 -
 .../brooklyn/cli/commands/UndeployCommand.java  |    62 -
 .../brooklyn/cli/commands/VersionCommand.java   |    50 -
 .../brooklyn/rest/BrooklynConfiguration.java    |    96 -
 .../java/brooklyn/rest/BrooklynService.java     |   175 -
 .../brooklyn/rest/ExecutorConfiguration.java    |    40 -
 .../brooklyn/rest/auth/BasicAuthFilter.java     |   120 -
 .../rest/auth/ConfigBasedAuthenticator.java     |    54 -
 .../src/main/java/brooklyn/rest/auth/User.java  |    84 -
 .../brooklyn/rest/commands/BrooklynCommand.java |   190 -
 .../applications/DeleteApplicationCommand.java  |    53 -
 .../applications/InvokeEffectorCommand.java     |    62 -
 .../applications/ListApplicationsCommand.java   |    53 -
 .../applications/ListEffectorsCommand.java      |    83 -
 .../applications/QuerySensorsCommand.java       |    84 -
 .../applications/StartApplicationCommand.java   |   101 -
 .../catalog/CatalogEntityDetailsCommand.java    |    56 -
 .../catalog/ListCatalogEntitiesCommand.java     |    48 -
 .../catalog/ListCatalogPoliciesCommand.java     |    47 -
 .../rest/commands/catalog/LoadClassCommand.java |    61 -
 .../commands/locations/AddLocationCommand.java  |    59 -
 .../locations/ListLocationsCommand.java         |    49 -
 .../rest/health/GeneralHealthCheck.java         |    33 -
 .../brooklyn/rest/views/SwaggerUiResource.java  |    52 -
 .../java/brooklyn/rest/views/SwaggerUiView.java |   114 -
 .../brooklyn/rest/views/WebClientResource.java  |    52 -
 .../dropwizard/logging/AsyncAppender.java       |    98 -
 .../dropwizard/src/main/resources/banner.txt    |     8 -
 .../brooklyn/rest/views/swagger-ui.ftl          |   192 -
 .../java/brooklyn/cli/ClientNoAuthTest.java     |    37 -
 .../src/test/java/brooklyn/cli/ClientTest.java  |   214 -
 .../java/brooklyn/cli/ClientWithAuthTest.java   |    53 -
 .../src/test/java/brooklyn/cli/ExampleApp.java  |    38 -
 .../cli/commands/DeployCommandTest.java         |    61 -
 .../ApplicationCommandsIntegrationTest.java     |   115 -
 .../rest/commands/ApplicationCommandsTest.java  |   120 -
 .../rest/commands/BrooklynCommandTest.java      |   106 -
 .../rest/commands/CatalogCommandsTest.java      |    95 -
 .../rest/commands/LocationCommandsTest.java     |    51 -
 .../brooklyn/rest/views/SwaggerUiViewTest.java  |   113 -
 .../resources/config/test-config-with-auth.yml  |    64 -
 .../src/test/resources/config/test-config.yml   |    59 -
 .../demo/todo/CustomLocationInfo.groovy         |   164 -
 .../brooklyn/demo/todo/GemfireExample.groovy    |    77 -
 .../brooklyn/demo/todo/PreBuiltImages.groovy    |   123 -
 .../demo/todo/WebAppFabricExample.groovy        |   116 -
 .../demo/todo/WebAppWideAreaExample.groovy      |   134 -
 .../todo/WebClusterExampleNewDsl.groovyMock     |   106 -
 .../demo/tomcat/todo/TomcatClusterApp.groovy    |    51 -
 .../todo/TomcatClusterWithNginxApp.groovy       |    63 -
 .../demo/tomcat/todo/TomcatFabricApp.groovy     |    72 -
 .../demo/tomcat/todo/TomcatServerApp.groovy     |    42 -
 .../brooklyn/earlythoughts/BigAppBixby.groovy   |    54 -
 .../earlythoughts/BigAppBrooklyn.groovy         |    54 -
 .../earlythoughts/PretendLocations.groovy       |    90 -
 .../main/resources/gemfire/gemfire-myapp.jar    |     0
 .../src/main/resources/gemfire/server-conf.xml  |    50 -
 .../gemfire/springtravel-datamodel.jar          |   Bin 704694 -> 0 bytes
 .../examples/src/main/resources/hello-world.war |   Bin 85280 -> 0 bytes
 .../src/main/resources/swf-booking-mvc.war      |   Bin 12415853 -> 0 bytes
 sandbox/examples/src/main/scripts/amis.txt      |     5 -
 .../src/main/scripts/create-all-instances.sh    |    63 -
 .../src/main/scripts/create-instance.sh         |   121 -
 .../src/main/scripts/run-at-instances.sh        |    47 -
 .../examples/src/main/scripts/stop-instances.sh |    40 -
 sandbox/extra/pom.xml                           |    16 +-
 sandbox/monitoring/pom.xml                      |    12 +-
 .../entity/monitoring/zabbix/ZabbixFeed.java    |    86 +-
 .../monitoring/zabbix/ZabbixPollConfig.java     |     6 +
 sandbox/nosql/pom.xml                           |    30 +-
 .../nosql/infinispan/Infinispan5Server.java     |     4 +-
 .../nosql/infinispan/Infinispan5SshDriver.java  |     5 -
 software/base/pom.xml                           |    25 +-
 .../basic/AbstractSoftwareProcessDriver.java    |   121 +-
 .../basic/AbstractSoftwareProcessSshDriver.java |   339 +-
 .../entity/basic/EmptySoftwareProcessImpl.java  |    11 +-
 .../basic/EmptySoftwareProcessSshDriver.java    |    27 +-
 .../brooklyn/entity/basic/SameServerEntity.java |     7 +-
 .../entity/basic/SameServerEntityImpl.java      |    24 +-
 .../brooklyn/entity/basic/SoftwareProcess.java  |   193 +-
 .../entity/basic/SoftwareProcessDriver.java     |     4 +-
 ...wareProcessDriverLifecycleEffectorTasks.java |    58 +-
 .../entity/basic/SoftwareProcessImpl.java       |   201 +-
 .../entity/basic/VanillaSoftwareProcess.java    |    46 +-
 .../basic/VanillaSoftwareProcessSshDriver.java  |     2 -
 .../entity/basic/lifecycle/ScriptHelper.java    |    31 +-
 .../entity/brooklynnode/BrooklynCluster.java    |    65 +
 .../brooklynnode/BrooklynClusterImpl.java       |   116 +
 .../brooklynnode/BrooklynEntityMirror.java      |     5 +
 .../brooklynnode/BrooklynEntityMirrorImpl.java  |   160 +-
 .../entity/brooklynnode/BrooklynNode.java       |   139 +-
 .../entity/brooklynnode/BrooklynNodeDriver.java |     2 +
 .../entity/brooklynnode/BrooklynNodeImpl.java   |   281 +-
 .../brooklynnode/BrooklynNodeSshDriver.java     |    93 +-
 .../entity/brooklynnode/EntityHttpClient.java   |    67 +
 .../brooklynnode/EntityHttpClientImpl.java      |   153 +
 .../entity/brooklynnode/LocalBrooklynNode.java  |    37 +
 .../brooklynnode/LocalBrooklynNodeImpl.java     |    46 +
 .../brooklynnode/RemoteEffectorBuilder.java     |    84 +
 .../BrooklynClusterUpgradeEffectorBody.java     |   207 +
 .../BrooklynNodeUpgradeEffectorBody.java        |   229 +
 .../effector/SelectMasterEffectorBody.java      |   175 +
 .../SetHighAvailabilityModeEffectorBody.java    |    64 +
 ...SetHighAvailabilityPriorityEffectorBody.java |    55 +
 .../brooklyn/entity/chef/ChefAttributeFeed.java |   112 +-
 .../entity/chef/ChefAttributePollConfig.java    |    53 +
 .../entity/chef/ChefLifecycleEffectorTasks.java |    10 +-
 .../java/brooklyn/entity/chef/ChefTasks.java    |    14 +-
 .../brooklyn/entity/chef/KnifeTaskFactory.java  |     4 +-
 .../java/JavaSoftwareProcessSshDriver.java      |    32 +-
 .../java/brooklyn/entity/java/JmxSupport.java   |   129 +-
 .../java/brooklyn/entity/java/UsesJava.java     |     2 +-
 .../main/java/brooklyn/entity/java/UsesJmx.java |   125 +-
 .../entity/machine/MachineAttributes.java       |     3 -
 .../brooklyn/entity/machine/MachineEntity.java  |     2 +
 .../entity/machine/MachineEntityImpl.java       |    16 +-
 .../java/brooklyn/entity/pool/ServerPool.java   |     7 +-
 .../brooklyn/entity/pool/ServerPoolImpl.java    |     8 +-
 .../software/MachineLifecycleEffectorTasks.java |   460 +-
 .../entity/software/http/HttpRequestSensor.java |    65 +-
 .../software/java/JmxAttributeSensor.java       |   123 +
 .../entity/software/ssh/SshCommandEffector.java |     6 +-
 .../entity/software/ssh/SshCommandSensor.java   |    97 +-
 .../event/feed/jmx/JmxAttributePollConfig.java  |     7 +-
 .../java/brooklyn/event/feed/jmx/JmxFeed.java   |   122 +-
 .../java/brooklyn/event/feed/jmx/JmxHelper.java |    10 +-
 .../jmx/JmxNotificationSubscriptionConfig.java  |    14 +
 .../event/feed/jmx/JmxOperationPollConfig.java  |     4 +
 .../entity/brooklynnode/brooklyn-cluster.yaml   |    33 +
 .../brooklyn-node-persisting-to-tmp.yaml        |    27 +
 .../entity/brooklynnode/brooklyn-node.yaml      |    35 +
 .../brooklyn/entity/AbstractEc2LiveTest.java    |     6 +-
 .../entity/AbstractSoftlayerLiveTest.java       |    10 +-
 ...ctSoftwareProcessRestartIntegrationTest.java |    93 +
 .../entity/basic/SameServerEntityTest.java      |     2 +-
 .../entity/basic/SoftwareProcessEntityTest.java |   237 +-
 ...SoftwareProcessSshDriverIntegrationTest.java |   110 +-
 .../basic/SoftwareProcessSubclassTest.java      |    21 +-
 ...ftwareProcessAndChildrenIntegrationTest.java |     2 +-
 .../entity/basic/lifecycle/MyEntityImpl.java    |     3 +-
 .../basic/lifecycle/NaiveScriptRunnerTest.java  |     3 +
 .../basic/lifecycle/ScriptHelperTest.java       |    60 +-
 .../lifecycle/StartStopSshDriverTest.groovy     |   135 -
 .../basic/lifecycle/StartStopSshDriverTest.java |   166 +
 .../BrooklynNodeIntegrationTest.java            |   344 +-
 .../entity/brooklynnode/BrooklynNodeTest.java   |    48 +-
 .../brooklynnode/CallbackEntityHttpClient.java  |    95 +
 .../entity/brooklynnode/MockBrooklynNode.java   |    68 +
 .../brooklynnode/SameBrooklynNodeImpl.java      |     5 +
 .../brooklynnode/SelectMasterEffectorTest.java  |   257 +
 .../entity/chef/ChefLiveTestSupport.java        |    11 +-
 .../AbstractChefToyMySqlEntityLiveTest.java     |     3 +-
 .../ChefSoloDriverMySqlEntityLiveTest.java      |     3 +-
 ...micChefAutodetectToyMySqlEntityLiveTest.java |     3 +-
 ...DynamicChefServerToyMySqlEntityLiveTest.java |     3 +-
 .../DynamicChefSoloToyMySqlEntityLiveTest.java  |     3 +-
 .../brooklyn/entity/java/EntityPollingTest.java |     8 +-
 .../brooklyn/entity/java/JmxSupportTest.java    |     2 +-
 .../entity/java/VanillaJavaAppTest.java         |     8 +-
 .../entity/machine/MachineEntityRebindTest.java |    45 +
 .../entity/pool/AbstractServerPoolTest.java     |    29 +-
 .../entity/pool/ServerPoolRebindTest.java       |    15 +-
 .../brooklyn/entity/pool/ServerPoolTest.java    |    44 +-
 .../MachineLifecycleEffectorTasksTest.java      |    51 +
 .../entity/software/SoftwareEffectorTest.java   |     3 +-
 .../entity/software/SshEffectorTasksTest.java   |     2 +-
 .../software/http/HttpRequestSensorTest.java    |    13 +-
 .../mysql/AbstractToyMySqlEntityTest.java       |    18 +-
 .../mysql/DynamicToyMySqlEntityBuilder.java     |     9 +
 .../mysql/DynamicToyMySqlEntityTest.java        |     6 +-
 .../software/ssh/SshCommandIntegrationTest.java |    19 +-
 .../brooklyn/event/feed/jmx/JmxFeedTest.java    |     2 +-
 .../event/feed/jmx/RebindJmxFeedTest.java       |   146 +
 .../usage/ApplicationUsageTrackingTest.java     |   182 +
 .../usage/LocationUsageTrackingTest.java        |   108 +-
 .../usage/RecordingUsageListener.java           |    70 +
 .../management/usage/UsageListenerTest.java     |   108 +
 .../resources/brooklyn/entity/basic/frogs.txt   |    27 +
 .../brooklyn/entity/basic/template.yaml         |    23 +
 .../basic/template_with_extra_substitutions.txt |    17 +
 software/database/pom.xml                       |    61 +-
 .../entity/database/mariadb/MariaDbNode.java    |     9 +-
 .../database/mariadb/MariaDbSshDriver.java      |    16 +-
 .../entity/database/mysql/MySqlNodeImpl.java    |     2 +-
 .../entity/database/mysql/MySqlSshDriver.java   |    15 +-
 .../database/postgresql/PostgreSqlNodeImpl.java |    30 +-
 .../database/rubyrep/RubyRepSshDriver.java      |    13 +-
 .../brooklyn/entity/database/mariadb/my.cnf     |    19 -
 .../brooklyn/entity/database/mysql/mysql.conf   |    19 -
 .../entity/database/postgresql/postgresql.conf  |    17 -
 .../entity/database/rubyrep/rubyrep.conf        |    17 -
 .../database/mariadb/MariaDbLiveEc2Test.java    |     7 +-
 .../mysql/MySqlRestartIntegrationTest.java      |    42 +
 .../PostgreSqlRebindIntegrationTest.java        |    58 +
 .../PostgreSqlRestartIntegrationTest.java       |    50 +
 software/messaging/pom.xml                      |    44 +-
 .../messaging/activemq/ActiveMQBroker.java      |    11 +-
 .../messaging/activemq/ActiveMQBrokerImpl.java  |    32 +-
 .../activemq/ActiveMQDestinationImpl.java       |    16 +-
 .../messaging/activemq/ActiveMQDriver.java      |     2 +
 .../messaging/activemq/ActiveMQQueueImpl.java   |     5 +-
 .../messaging/activemq/ActiveMQSshDriver.java   |    14 +-
 .../entity/messaging/jms/JMSBrokerImpl.java     |    25 +-
 .../kafka/AbstractfKafkaSshDriver.java          |    11 +-
 .../entity/messaging/qpid/QpidBroker.java       |    10 -
 .../entity/messaging/qpid/QpidSshDriver.java    |    17 +-
 .../messaging/rabbit/RabbitBrokerImpl.java      |     2 +-
 .../messaging/rabbit/RabbitSshDriver.java       |    10 +-
 .../brooklyn/entity/messaging/storm/Storm.java  |     6 +-
 .../entity/messaging/storm/StormDeployment.java |     4 +
 .../messaging/storm/StormDeploymentImpl.java    |     1 +
 .../entity/messaging/storm/StormSshDriver.java  |    10 +-
 .../entity/zookeeper/ZooKeeperEnsemble.java     |     3 +
 .../entity/zookeeper/ZooKeeperEnsembleImpl.java |    22 +-
 .../entity/zookeeper/ZooKeeperNode.java         |     3 +
 .../entity/zookeeper/ZooKeeperSshDriver.java    |     9 +-
 .../entity/messaging/activemq/activemq.xml      |    20 +-
 .../entity/messaging/kafka/server.properties    |    17 -
 .../entity/messaging/kafka/zookeeper.properties |    17 -
 .../brooklyn/entity/messaging/storm/storm.yaml  |    17 -
 .../activemq/ActiveMQIntegrationTest.java       |    18 +-
 .../messaging/qpid/QpidIntegrationTest.groovy   |   250 -
 .../messaging/qpid/QpidIntegrationTest.java     |   254 +
 .../messaging/rabbit/RabbitIntegrationTest.java |    10 +-
 .../src/test/resources/qpid-test-plugin.jar     |   Bin 11821 -> 0 bytes
 software/monitoring/pom.xml                     |    22 +-
 .../entity/monitoring/monit/MonitNode.java      |     2 +-
 .../entity/monitoring/monit/MonitNodeImpl.java  |     3 +-
 .../entity/monitoring/monit/MonitSshDriver.java |    26 +-
 .../monitoring/monit/MonitIntegrationTest.java  |   157 +-
 .../entity/monitoring/monit/monit.monitrc       |     4 +-
 .../monit/monitmysqlwithrestart.monitrc         |     2 +-
 software/network/pom.xml                        |    18 +-
 .../entity/network/bind/BindDnsServer.java      |    92 +-
 .../network/bind/BindDnsServerDriver.java       |    15 +-
 .../entity/network/bind/BindDnsServerImpl.java  |   350 +-
 .../network/bind/BindDnsServerSshDriver.java    |   123 +-
 .../entity/network/bind/BindOsSupport.java      |   113 +
 .../brooklyn/entity/network/bind/domain.zone    |    13 +-
 .../brooklyn/entity/network/bind/named.conf     |    27 +-
 .../brooklyn/entity/network/bind/named.empty    |    30 +
 .../entity/network/bind/named.localhost         |    32 +
 .../brooklyn/entity/network/bind/named.loopback |    31 +
 .../brooklyn/entity/network/bind/reverse.zone   |     5 +-
 .../brooklyn/entity/network/bind/rfc1912.zone   |    52 +
 .../network/bind/BindDnsServerByonLiveTest.java |    45 +
 .../network/bind/BindDnsServerEc2LiveTest.java  |    63 +
 .../bind/BindDnsServerIntegrationTest.java      |   261 +
 .../network/bind/BindDnsServerLiveTest.java     |   111 +-
 .../bind/BindDnsServerSoftlayerLiveTest.java    |    33 +
 .../entity/network/bind/BindDnsServerTest.java  |    67 -
 .../bind/DoNothingSoftwareProcessDriver.java    |    56 +
 .../network/bind/PrefixAndIdEnricher.java       |    57 +
 .../network/bind/TestBindDnsServerImpl.java     |    92 +
 software/nosql/pom.xml                          |    69 +-
 .../cassandra/CassandraDatacenterImpl.java      |    38 +-
 .../nosql/cassandra/CassandraFabricImpl.java    |     8 +-
 .../entity/nosql/cassandra/CassandraNode.java   |     4 +
 .../nosql/cassandra/CassandraNodeImpl.java      |    20 +-
 .../nosql/cassandra/CassandraNodeSshDriver.java |    34 +-
 .../nosql/couchbase/CouchbaseCluster.java       |    52 +-
 .../nosql/couchbase/CouchbaseClusterImpl.java   |   345 +-
 .../nosql/couchbase/CouchbaseLoadGenerator.java |    59 -
 .../couchbase/CouchbaseLoadGeneratorDriver.java |    28 -
 .../couchbase/CouchbaseLoadGeneratorImpl.java   |    50 -
 .../CouchbaseLoadGeneratorSshDriver.java        |   122 -
 .../entity/nosql/couchbase/CouchbaseNode.java   |    41 +-
 .../nosql/couchbase/CouchbaseNodeDriver.java    |     9 +
 .../nosql/couchbase/CouchbaseNodeImpl.java      |   134 +-
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |   385 +-
 .../nosql/couchbase/CouchbaseSyncGateway.java   |    75 +
 .../couchbase/CouchbaseSyncGatewayDriver.java   |    27 +
 .../couchbase/CouchbaseSyncGatewayImpl.java     |    82 +
 .../CouchbaseSyncGatewaySshDriver.java          |   176 +
 .../nosql/couchdb/CouchDBClusterImpl.java       |    21 +-
 .../entity/nosql/couchdb/CouchDBNodeImpl.java   |     6 +-
 .../elasticsearch/ElasticSearchCluster.java     |     4 +
 .../elasticsearch/ElasticSearchClusterImpl.java |    10 -
 .../nosql/elasticsearch/ElasticSearchNode.java  |     4 +
 .../ElasticSearchNodeSshDriver.java             |    12 +-
 .../nosql/mongodb/AbstractMongoDBServer.java    |     8 +-
 .../nosql/mongodb/AbstractMongoDBSshDriver.java |    12 +-
 .../nosql/mongodb/MongoDBClientSshDriver.java   |    40 +-
 .../nosql/mongodb/MongoDBClientSupport.java     |     9 +-
 .../entity/nosql/mongodb/MongoDBReplicaSet.java |     5 +-
 .../nosql/mongodb/MongoDBReplicaSetImpl.java    |    49 +-
 .../entity/nosql/mongodb/MongoDBServer.java     |    16 +-
 .../entity/nosql/mongodb/MongoDBServerImpl.java |    27 +-
 .../entity/nosql/mongodb/ReplicaSetConfig.java  |    31 +-
 .../sharding/CoLocatedMongoDBRouter.java        |    14 +-
 .../sharding/CoLocatedMongoDBRouterImpl.java    |    33 +-
 .../MongoDBConfigServerClusterImpl.java         |    20 +-
 .../nosql/mongodb/sharding/MongoDBRouter.java   |     4 +
 .../sharding/MongoDBRouterClusterImpl.java      |     8 +-
 .../mongodb/sharding/MongoDBRouterImpl.java     |     2 +-
 .../sharding/MongoDBShardClusterImpl.java       |   109 +-
 .../sharding/MongoDBShardedDeployment.java      |    31 +
 .../sharding/MongoDBShardedDeploymentImpl.java  |    25 +-
 .../entity/nosql/redis/RedisStoreSshDriver.java |    13 +-
 .../brooklyn/entity/nosql/riak/RiakCluster.java |    19 +-
 .../entity/nosql/riak/RiakClusterImpl.java      |   119 +-
 .../brooklyn/entity/nosql/riak/RiakNode.java    |    67 +-
 .../entity/nosql/riak/RiakNodeDriver.java       |     2 +
 .../entity/nosql/riak/RiakNodeImpl.java         |    36 +-
 .../entity/nosql/riak/RiakNodeSshDriver.java    |   227 +-
 .../brooklyn/entity/nosql/solr/SolrServer.java  |     7 +-
 .../entity/nosql/solr/SolrServerDriver.java     |     3 +-
 .../entity/nosql/solr/SolrServerImpl.java       |    16 +-
 .../entity/nosql/solr/SolrServerSshDriver.java  |    24 +-
 .../entity/nosql/cassandra/cassandra-1.2.yaml   |    17 -
 .../entity/nosql/cassandra/cassandra-2.0.yaml   |    17 -
 .../cassandra/cassandra-multicloud-snitch.txt   |    33 +
 .../nosql/cassandra/cassandra-rackdc.properties |    18 -
 .../entity/nosql/couchbase/pillowfight.yaml     |    77 +
 .../brooklyn/entity/nosql/couchdb/couch.ini     |    17 -
 .../entity/nosql/mongodb/default-mongod.conf    |     7 +
 .../entity/nosql/mongodb/default-mongodb.conf   |    28 -
 .../brooklyn/entity/nosql/mongodb/default.conf  |     2 +
 .../brooklyn/entity/nosql/redis/redis.conf      |    19 -
 .../brooklyn/entity/nosql/redis/slave.conf      |    19 -
 .../brooklyn/entity/nosql/riak/app.config       |    21 +-
 .../brooklyn/entity/nosql/riak/riak-mac.conf    |   494 +
 .../nosql/riak/riak-with-webapp-cluster.yaml    |    42 +
 .../entity/nosql/riak/riak-with-webapp.yaml     |    36 +
 .../brooklyn/entity/nosql/riak/riak.conf        |   494 +
 .../brooklyn/entity/nosql/riak/vm.args          |     2 +-
 .../brooklyn/entity/nosql/solr/solr.xml         |    18 -
 .../nosql/src/main/resources/couchbase-logo.png |   Bin 0 -> 88089 bytes
 .../CassandraDatacenterIntegrationTest.java     |    18 +-
 ...assandraDatacenterRebindIntegrationTest.java |    15 +-
 .../nosql/cassandra/CassandraFabricTest.java    |     5 +-
 .../cassandra/CassandraNodeIntegrationTest.java |    54 +-
 .../nosql/cassandra/CassandraNodeLiveTest.java  |    14 +-
 .../nosql/couchbase/CouchbaseOfflineTest.java   |    62 +
 .../CouchbaseSyncGatewayEc2LiveTest.java        |   137 +
 .../nosql/couchdb/CouchDBNodeLiveTest.java      |    14 +-
 .../ElasticSearchClusterIntegrationTest.java    |    50 +-
 .../nosql/mongodb/MongoDBIntegrationTest.java   |     2 +-
 .../mongodb/MongoDBRebindIntegrationTest.java   |    60 +
 .../MongoDBReplicaSetIntegrationTest.java       |    30 +-
 .../mongodb/MongoDBRestartIntegrationTest.java  |    42 +
 .../entity/nosql/mongodb/MongoDBTestHelper.java |    15 +-
 .../MongoDBConfigServerIntegrationTest.java     |     3 +-
 .../MongoDBShardedDeploymentEc2LiveTest.java    |    12 +-
 ...MongoDBShardedDeploymentIntegrationTest.java |    29 +-
 .../nosql/redis/RedisIntegrationTest.java       |    15 +-
 .../nosql/riak/RiakClusterEc2LiveTest.java      |    32 +-
 .../nosql/riak/RiakNodeIntegrationTest.java     |     7 +-
 .../entity/nosql/solr/SolrServerLiveTest.java   |    14 +-
 .../nosql/src/test/resources/solr/example.txt   |    18 +
 .../resources/test-mongodb-configserver.conf    |     6 +
 .../src/test/resources/test-mongodb-router.conf |     6 +
 .../nosql/src/test/resources/test-mongodb.conf  |    29 +-
 software/osgi/pom.xml                           |    40 +-
 .../entity/osgi/karaf/KarafContainerImpl.java   |     7 +-
 .../entity/osgi/karaf/KarafSshDriver.java       |    11 +-
 .../osgi/src/main/java/org/osgi/jmx/Item.java   |    30 +-
 .../main/java/org/osgi/jmx/JmxConstants.java    |    30 +-
 .../entity/osgi/karaf/KarafContainerTest.groovy |   157 -
 .../entity/osgi/karaf/KarafContainerTest.java   |   147 +
 .../osgi/src/test/resources/hello-world.jar     |   Bin 727 -> 2088 bytes
 .../osgi/src/test/resources/hello-world.txt     |    26 +
 software/webapp/pom.xml                         |    63 +-
 .../entity/dns/AbstractGeoDnsService.java       |     2 +-
 .../entity/dns/AbstractGeoDnsServiceImpl.java   |    43 +-
 .../dns/geoscaling/GeoscalingDnsService.java    |     6 +-
 .../geoscaling/GeoscalingDnsServiceImpl.java    |    22 +-
 .../dns/geoscaling/GeoscalingWebClient.java     |    23 +-
 .../entity/proxy/AbstractController.java        |     2 +-
 .../entity/proxy/AbstractControllerImpl.java    |    43 +-
 .../AbstractNonProvisionedControllerImpl.java   |     2 +-
 .../brooklyn/entity/proxy/LoadBalancer.java     |    29 +-
 .../entity/proxy/LoadBalancerClusterImpl.java   |    33 +-
 .../brooklyn/entity/proxy/ProxySslConfig.java   |   203 +-
 .../proxy/nginx/NginxConfigFileGenerator.java   |   250 +-
 .../entity/proxy/nginx/NginxConfigTemplate.java |    79 -
 .../entity/proxy/nginx/NginxController.java     |    13 +-
 .../entity/proxy/nginx/NginxControllerImpl.java |    86 +-
 .../nginx/NginxDefaultConfigGenerator.java      |   258 +
 .../entity/proxy/nginx/NginxSshDriver.java      |    45 +-
 .../nginx/NginxTemplateConfigGenerator.java     |    82 +
 .../brooklyn/entity/proxy/nginx/UrlMapping.java |     3 -
 .../entity/proxy/nginx/UrlMappingImpl.java      |     7 +-
 .../webapp/ControlledDynamicWebAppCluster.java  |     7 +-
 .../ControlledDynamicWebAppClusterImpl.java     |    72 +-
 .../entity/webapp/DynamicWebAppCluster.java     |     8 +-
 .../entity/webapp/DynamicWebAppClusterImpl.java |    41 -
 .../entity/webapp/DynamicWebAppFabricImpl.java  |    10 +-
 .../brooklyn/entity/webapp/HttpsSslConfig.java  |    21 +
 .../entity/webapp/JavaWebAppDriver.java         |    10 +-
 .../entity/webapp/JavaWebAppService.java        |    10 +-
 .../webapp/JavaWebAppSoftwareProcess.java       |    10 +
 .../webapp/JavaWebAppSoftwareProcessImpl.java   |    56 +-
 .../entity/webapp/JavaWebAppSshDriver.java      |     2 +
 .../entity/webapp/WebAppServiceConstants.java   |     8 +-
 .../entity/webapp/WebAppServiceMethods.java     |    52 +-
 .../entity/webapp/WebAppServiceMetrics.java     |     8 +-
 .../entity/webapp/jboss/JBoss6SshDriver.java    |     9 +-
 .../entity/webapp/jboss/JBoss7Server.java       |     1 +
 .../entity/webapp/jboss/JBoss7ServerImpl.java   |    57 +-
 .../entity/webapp/jboss/JBoss7SshDriver.java    |    12 +-
 .../entity/webapp/jetty/Jetty6ServerImpl.java   |     2 +-
 .../entity/webapp/jetty/Jetty6SshDriver.java    |    11 +-
 .../webapp/nodejs/NodeJsWebAppDriver.java       |    29 +
 .../webapp/nodejs/NodeJsWebAppService.java      |    74 +
 .../webapp/nodejs/NodeJsWebAppServiceImpl.java  |    92 +
 .../webapp/nodejs/NodeJsWebAppSshDriver.java    |   182 +
 .../entity/webapp/tomcat/Tomcat7SshDriver.java  |    70 +-
 .../entity/webapp/tomcat/TomcatServer.java      |    17 +-
 .../entity/webapp/tomcat/TomcatServerImpl.java  |    16 +-
 .../brooklyn/entity/proxy/nginx/server.conf     |     6 +-
 .../entity/webapp/jboss/jboss7-standalone.xml   |    20 +-
 .../entity/webapp/jetty/jetty-brooklyn.xml      |    18 -
 .../entity/webapp/sample-java-keystore.jks      |   Bin 0 -> 1355 bytes
 .../entity/webapp/sample-java-keystore.txt      |    22 +
 .../brooklyn/entity/webapp/tomcat/server.xml    |   151 +
 .../brooklyn/entity/webapp/tomcat/web.xml       |  4615 +++
 .../webapp/src/main/resources/jetty-logo.svg    |    88 -
 .../webapp/src/main/resources/nodejs-logo.png   |   Bin 0 -> 9620 bytes
 .../geoscaling/GeoscalingIntegrationTest.java   |    90 +-
 .../geoscaling/GeoscalingWebClientTest.groovy   |    85 -
 .../dns/geoscaling/GeoscalingWebClientTest.java |    93 +
 .../entity/proxy/ProxySslConfigTest.java        |    60 +
 .../brooklyn/entity/proxy/UrlMappingTest.java   |    14 +-
 .../nginx/NginxClusterIntegrationTest.java      |    67 +-
 .../nginx/NginxHttpsSslIntegrationTest.groovy   |   171 -
 .../nginx/NginxHttpsSslIntegrationTest.java     |   238 +
 .../proxy/nginx/NginxIntegrationTest.groovy     |   432 -
 .../proxy/nginx/NginxIntegrationTest.java       |   453 +
 .../proxy/nginx/NginxLightIntegrationTest.java  |    22 +-
 .../proxy/nginx/NginxRebindIntegrationTest.java |    97 +-
 .../nginx/NginxRebindWithHaIntegrationTest.java |   182 +
 .../nginx/NginxUrlMappingIntegrationTest.groovy |   503 -
 .../nginx/NginxUrlMappingIntegrationTest.java   |   523 +
 .../nginx/NginxWebClusterEc2LiveTest.groovy     |   107 -
 .../proxy/nginx/NginxWebClusterEc2LiveTest.java |   115 +
 .../AbstractWebAppFixtureIntegrationTest.java   |   113 +-
 ...lledDynamicWebAppClusterIntegrationTest.java |   173 +
 .../ControlledDynamicWebAppClusterTest.java     |   149 +-
 .../entity/webapp/DynamicWebAppClusterTest.java |    69 +-
 .../entity/webapp/DynamicWebAppFabricTest.java  |    44 +-
 ...ElasticJavaWebAppServiceIntegrationTest.java |    17 +-
 .../entity/webapp/HttpsSslConfigTest.java       |    38 +
 .../brooklyn/entity/webapp/JBossExample.groovy  |    48 -
 .../webapp/TomcatAutoScalerPolicyTest.java      |    16 +-
 ...namicWebAppClusterRebindIntegrationTest.java |    37 +-
 ...namicWebAppClusterRebindIntegrationTest.java |    36 +-
 .../jboss/JBoss6ServerAwsEc2LiveTest.java       |    72 +
 ...Boss6ServerNonInheritingIntegrationTest.java |   106 +
 .../jboss/JBoss7ServerAwsEc2LiveTest.java       |    78 +
 .../jboss/JBoss7ServerDockerLiveTest.java       |    74 +
 ...Boss7ServerNonInheritingIntegrationTest.java |   185 +
 .../JBoss7ServerRebindingIntegrationTest.java   |   125 +
 ...ultiVersionWebAppFixtureIntegrationTest.java |   106 +
 .../webapp/jboss/Jboss6ServerEc2LiveTest.java   |    68 -
 .../jboss/Jboss6ServerIntegrationTest.java      |   106 -
 .../webapp/jboss/Jboss7DockerLiveTest.java      |    70 -
 .../webapp/jboss/Jboss7ServerEc2LiveTest.java   |    74 -
 .../Jboss7ServerGoogleComputeLiveTest.java      |    12 +-
 .../jboss/Jboss7ServerIntegrationTest.java      |   213 -
 .../Jboss7ServerRebindIntegrationTest.java      |   126 -
 ...JbossServerWebAppFixtureIntegrationTest.java |   106 -
 .../JettyWebAppFixtureIntegrationTest.java      |     8 +
 .../webapp/nodejs/NodeJsWebAppEc2LiveTest.java  |    60 +
 .../NodeJsWebAppFixtureIntegrationTest.java     |   201 +
 .../NodeJsWebAppSimpleIntegrationTest.java      |    82 +
 .../nodejs/NodeJsWebAppSoftlayerLiveTest.java   |    59 +
 .../webapp/tomcat/TomcatServerEc2LiveTest.java  |    12 +-
 .../TomcatServerRestartIntegrationTest.java     |    44 +
 .../tomcat/TomcatServerSoftlayerLiveTest.java   |    12 +-
 ...omcatServerWebAppFixtureIntegrationTest.java |    64 +-
 .../test/entity/TestJavaWebAppEntity.groovy     |    75 -
 .../test/entity/TestJavaWebAppEntity.java       |    35 +
 .../test/entity/TestJavaWebAppEntityImpl.java   |    94 +
 .../webapp/nodejs/nodejs-hello-world.yaml       |    31 +
 .../webapp/src/test/resources/hello-world.war   |   Bin 14718 -> 0 bytes
 .../src/test/resources/seam-booking-as6.war     |   Bin 6273067 -> 0 bytes
 .../src/test/resources/seam-booking-as7.war     |   Bin 6333783 -> 0 bytes
 .../src/test/resources/swf-booking-mvc.war      |   Bin 12415853 -> 0 bytes
 storage/hazelcast/pom.xml                       |    15 +-
 usage/all/pom.xml                               |    27 +-
 usage/all/start-mgmt-web.sh                     |     2 +-
 usage/archetypes/quickstart/NOTES.txt           |     4 +-
 usage/archetypes/quickstart/pom.xml             |    34 +-
 .../quickstart/src/brooklyn-sample/pom.xml      |   282 +-
 .../src/main/assembly/assembly.xml              |    24 +-
 .../src/main/assembly/files/README.txt          |     6 +-
 .../src/main/assembly/files/conf/logback.xml    |    18 -
 .../src/main/assembly/scripts/start.sh          |     4 +-
 .../com/acme/sample/brooklyn/SampleMain.java    |    18 -
 .../app/ClusterWebServerDatabaseSample.java     |    18 -
 .../sample/app/SingleWebServerSample.java       |    18 -
 .../src/main/resources/logback-custom.xml       |    18 -
 .../app/SampleLocalhostIntegrationTest.java     |    18 -
 .../brooklyn/sample/app/SampleUnitTest.java     |    18 -
 .../META-INF/maven/archetype-metadata.xml       |     4 +-
 usage/camp/pom.xml                              |    44 +-
 .../camp/brooklyn/BrooklynCampPlatform.java     |     1 +
 .../camp/brooklyn/YamlLauncherAbstract.java     |    32 +-
 .../BrooklynAssemblyTemplateInstantiator.java   |   125 +-
 .../BrooklynComponentTemplateResolver.java      |   110 +-
 .../BrooklynEntityDecorationResolver.java       |    32 +-
 .../spi/creation/BrooklynEntityMatcher.java     |    22 +-
 .../creation/BrooklynYamlLocationResolver.java  |    46 +-
 .../creation/BrooklynYamlTypeInstantiator.java  |    12 +-
 .../camp/brooklyn/spi/dsl/DslUtils.java         |     7 +
 .../spi/dsl/methods/BrooklynDslCommon.java      |   268 +-
 .../brooklyn/spi/dsl/methods/DslComponent.java  |   251 +-
 .../lookup/AbstractTemplateBrooklynLookup.java  |     9 +-
 .../lookup/AssemblyTemplateBrooklynLookup.java  |     2 +-
 ...PlatformComponentTemplateBrooklynLookup.java |     2 +-
 .../camp/brooklyn/AbstractYamlTest.java         |    27 +-
 .../BrooklynYamlTypeInstantiatorTest.java       |     2 +-
 .../brooklyn/camp/brooklyn/CatalogYamlTest.java |   250 -
 .../camp/brooklyn/EnrichersYamlTest.java        |    23 +-
 .../camp/brooklyn/EntitiesYamlTest.java         |   181 +-
 ...aWebAppWithDslYamlRebindIntegrationTest.java |     2 +
 .../brooklyn/JavaWebAppsIntegrationTest.java    |     5 +-
 .../camp/brooklyn/MapReferenceYamlTest.java     |   130 +
 .../brooklyn/camp/brooklyn/ObjectsYamlTest.java |   235 +
 .../camp/brooklyn/ReferencedYamlTest.java       |    10 +-
 .../brooklyn/ReferencingYamlTestEntity.java     |     8 +
 .../brooklyn/VanillaBashNetcatYamlTest.java     |    14 +-
 .../CatalogOsgiVersionMoreEntityTest.java       |   153 +
 .../brooklyn/catalog/CatalogYamlEntityTest.java |   491 +
 .../brooklyn/catalog/CatalogYamlPolicyTest.java |   139 +
 .../catalog/CatalogYamlVersioningTest.java      |   203 +
 .../more-entity-v1-called-v1-osgi-catalog.yaml  |    27 +
 .../catalog/more-entity-v1-osgi-catalog.yaml    |    27 +
 ...more-entity-v1-with-policy-osgi-catalog.yaml |    29 +
 .../catalog/more-entity-v2-osgi-catalog.yaml    |    28 +
 .../catalog/simple-policy-osgi-catalog.yaml     |    27 +
 .../java-web-app-and-db-with-function-2.yaml    |     2 +-
 usage/camp/src/test/resources/mysql-chef.yaml   |     3 +
 .../test-entity-reference-map-template.yaml     |    28 +
 .../resources/test-referencing-entities.yaml    |    23 +-
 .../src/test/resources/test-tomcat-https.yaml   |    28 +
 .../resources/vanilla-bash-netcat-w-client.yaml |    10 +-
 usage/camp/src/test/resources/yaml-ref-app.yaml |     2 +-
 .../src/test/resources/yaml-ref-catalog.yaml    |     2 +-
 .../src/test/resources/yaml-ref-entity.yaml     |     2 +-
 usage/cli/pom.xml                               |    52 +-
 .../main/java/brooklyn/cli/AbstractMain.java    |   231 +
 .../main/java/brooklyn/cli/CloudExplorer.java   |   107 +-
 .../src/main/java/brooklyn/cli/ItemLister.java  |   237 +
 usage/cli/src/main/java/brooklyn/cli/Main.java  |   355 +-
 .../java/brooklyn/cli/lister/ClassFinder.java   |   148 +
 .../brooklyn/cli/lister/ItemDescriptors.java    |   158 +
 .../main/resources/brooklyn-object-list.html    |   147 +
 usage/cli/src/main/resources/common.js          |    94 +
 usage/cli/src/main/resources/enricher.html      |    59 +
 usage/cli/src/main/resources/entity.html        |    66 +
 usage/cli/src/main/resources/items.css          |   153 +
 .../src/main/resources/libs/js/bloodhound.js    |   727 +
 usage/cli/src/main/resources/location.html      |    62 +
 usage/cli/src/main/resources/policy.html        |    59 +
 .../cli/src/test/java/brooklyn/cli/CliTest.java |     6 +-
 .../brooklyn/cli/CloudExplorerLiveTest.java     |    27 +-
 usage/dist/pom.xml                              |    64 +-
 .../main/config/build-distribution-archive.xml  |    24 +-
 .../src/main/config/build-distribution-dir.xml  |    25 +-
 usage/dist/src/main/dist/bin/.gitattributes     |     3 +
 usage/dist/src/main/dist/bin/brooklyn           |     8 +-
 usage/dist/src/main/dist/bin/brooklyn.ps1       |   270 +-
 usage/dist/src/main/dist/bin/cloud-explorer     |    47 -
 usage/dist/src/main/dist/conf/catalog.xml       |    36 +-
 usage/downstream-parent/pom.xml                 |   583 +
 usage/jsgui/.gitignore                          |     1 +
 usage/jsgui/pom.xml                             |    59 +-
 usage/jsgui/src/build/.gitattributes            |     2 +
 usage/jsgui/src/main/dev/info.txt               |    15 -
 .../src/main/dev/js/libs/jquery.dataTables.js   | 12099 --------
 usage/jsgui/src/main/dev/js/libs/jquery.js      |  9404 -------
 usage/jsgui/src/main/dev/js/libs/moment.js      |  1662 --
 usage/jsgui/src/main/webapp/LICENSE             |   176 +
 usage/jsgui/src/main/webapp/assets/css/base.css |    78 +-
 .../src/main/webapp/assets/css/brooklyn.css     |     4 +
 .../assets/images/main-menu-tab-active.png      |   Bin 974 -> 1051 bytes
 .../assets/img/magnifying-glass-right-icon.png  |   Bin 0 -> 958 bytes
 usage/jsgui/src/main/webapp/assets/js/config.js |    13 +-
 .../jsgui/src/main/webapp/assets/js/libs/URI.js |     2 +-
 .../main/webapp/assets/js/libs/ZeroClipboard.js |     7 +-
 .../webapp/assets/js/libs/ZeroClipboard.swf     |   Bin 1891 -> 0 bytes
 .../src/main/webapp/assets/js/libs/bootstrap.js |    36 +-
 .../webapp/assets/js/libs/brooklyn-utils.js     |   115 -
 .../main/webapp/assets/js/libs/brooklyn-view.js |    74 -
 .../src/main/webapp/assets/js/libs/brooklyn.js  |    53 -
 .../assets/js/libs/dataTables.extensions.js     |     4 +-
 .../assets/js/libs/handlebars-1.0.rc.1.js       |     3 +
 .../webapp/assets/js/libs/jquery.slideto.min.js |     6 +
 .../webapp/assets/js/libs/json-formatter.js     |    88 -
 .../src/main/webapp/assets/js/libs/moment.js    |  1662 ++
 .../main/webapp/assets/js/libs/moment.min.js    |     6 -
 .../main/webapp/assets/js/libs/swagger-ui.js    |   334 +-
 .../src/main/webapp/assets/js/libs/swagger.js   |     2 +
 .../webapp/assets/js/model/entity-summary.js    |     1 +
 .../src/main/webapp/assets/js/model/entity.js   |    15 +
 .../src/main/webapp/assets/js/model/location.js |     6 +-
 .../main/webapp/assets/js/model/task-summary.js |     2 +-
 usage/jsgui/src/main/webapp/assets/js/router.js |    78 +-
 .../webapp/assets/js/util/brooklyn-utils.js     |   180 +
 .../main/webapp/assets/js/util/brooklyn-view.js |   352 +
 .../src/main/webapp/assets/js/util/brooklyn.js  |    86 +
 .../webapp/assets/js/view/activity-details.js   |    37 +-
 .../webapp/assets/js/view/add-child-invoke.js   |    61 +
 .../src/main/webapp/assets/js/view/apidoc.js    |     4 +-
 .../assets/js/view/application-add-wizard.js    |   126 +-
 .../webapp/assets/js/view/application-tree.js   |    20 +-
 .../js/view/catalog-add-location-modal.js       |   115 -
 .../src/main/webapp/assets/js/view/catalog.js   |   167 +-
 .../webapp/assets/js/view/change-name-invoke.js |    57 +
 .../webapp/assets/js/view/effector-invoke.js    |    12 +-
 .../webapp/assets/js/view/entity-activities.js  |     2 +-
 .../webapp/assets/js/view/entity-advanced.js    |   177 +
 .../main/webapp/assets/js/view/entity-config.js |   521 +-
 .../webapp/assets/js/view/entity-details.js     |    28 +-
 .../webapp/assets/js/view/entity-lifecycle.js   |    54 -
 .../webapp/assets/js/view/entity-policies.js    |    92 +-
 .../webapp/assets/js/view/entity-sensors.js     |    77 +-
 .../webapp/assets/js/view/entity-summary.js     |    93 +-
 .../webapp/assets/js/view/expunge-invoke.js     |    63 -
 .../main/webapp/assets/js/view/ha-summary.js    |    33 +-
 .../src/main/webapp/assets/js/view/home.js      |    36 +-
 .../assets/js/view/policy-config-invoke.js      |    83 +-
 .../main/webapp/assets/js/view/policy-new.js    |    82 +
 .../main/webapp/assets/js/view/script-groovy.js |     1 +
 .../src/main/webapp/assets/js/view/viewutils.js |    14 +-
 .../assets/tpl/app-add-wizard/create.html       |     8 +
 .../tpl/app-add-wizard/deploy-location-row.html |     4 +-
 .../webapp/assets/tpl/apps/add-child-modal.html |    35 +
 .../main/webapp/assets/tpl/apps/advanced.html   |    75 +
 .../assets/tpl/apps/change-name-modal.html      |    29 +
 .../webapp/assets/tpl/apps/config-name.html     |    24 +
 .../src/main/webapp/assets/tpl/apps/config.html |     6 +-
 .../main/webapp/assets/tpl/apps/details.html    |     6 +-
 .../webapp/assets/tpl/apps/expunge-modal.html   |    38 -
 .../main/webapp/assets/tpl/apps/lifecycle.html  |    40 -
 .../src/main/webapp/assets/tpl/apps/param.html  |     4 +-
 .../assets/tpl/apps/policy-config-modal.html    |    41 -
 .../main/webapp/assets/tpl/apps/policy-new.html |    37 +
 .../tpl/apps/policy-parameter-config.html       |    30 +
 .../src/main/webapp/assets/tpl/apps/policy.html |    10 +-
 .../main/webapp/assets/tpl/apps/summary.html    |    39 +-
 .../assets/tpl/catalog/add-catalog-entry.html   |     1 +
 .../assets/tpl/catalog/add-location-modal.html  |    66 -
 .../webapp/assets/tpl/catalog/add-location.html |    37 +
 .../assets/tpl/catalog/details-entity.html      |    49 +-
 .../assets/tpl/catalog/details-location.html    |     8 +-
 .../assets/tpl/catalog/location-config.html     |    24 -
 .../webapp/assets/tpl/catalog/nav-entry.html    |     2 +-
 .../src/main/webapp/assets/tpl/help/page.html   |     4 +-
 .../webapp/assets/tpl/home/applications.html    |    19 +-
 .../assets/tpl/home/server-not-ha-master.html   |     4 +-
 .../src/main/webapp/assets/tpl/labs/page.html   |     2 +-
 .../main/webapp/assets/tpl/lib/basic-modal.html |    29 +
 .../lib/config-key-type-value-input-pair.html   |    23 +
 .../main/webapp/assets/tpl/script/groovy.html   |     2 +-
 .../main/webapp/assets/tpl/script/swagger.html  |     3 +
 usage/jsgui/src/main/webapp/index.html          |     9 +-
 .../jsgui/BrooklynJavascriptGuiLauncher.java    |     6 +
 .../BrooklynJavascriptGuiLauncherTest.java      |    13 +-
 usage/jsgui/src/test/javascript/config.txt      |    27 +-
 .../src/test/javascript/specs/brooklyn-spec.js  |    54 +-
 .../javascript/specs/brooklyn-utils-spec.js     |    18 +
 .../src/test/javascript/specs/library-spec.js   |    12 +-
 .../src/test/javascript/specs/router-spec.js    |     8 +-
 .../specs/view/effector-invoke-spec.js          |     5 +
 .../specs/view/entity-details-spec.js           |     8 +-
 usage/launcher/pom.xml                          |    67 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |   413 +-
 .../brooklyn/launcher/BrooklynWebServer.java    |    87 +-
 .../launcher/config/BrooklynGlobalConfig.java   |     7 +-
 .../BrooklynEntityMirrorIntegrationTest.java    |    19 +-
 .../brooklynnode/BrooklynNodeRestTest.java      |     2 +-
 .../BrooklynLauncherHighAvailabilityTest.java   |    25 +-
 .../BrooklynLauncherRebindTestFixture.java      |    11 +-
 .../BrooklynLauncherRebindTestToFiles.java      |    56 +-
 ...lynLauncherRebindToCloudObjectStoreTest.java |    75 +-
 .../brooklyn/launcher/BrooklynLauncherTest.java |     3 +-
 .../launcher/BrooklynWebServerTest.java         |     4 +-
 .../brooklyn/launcher/WebAppRunnerTest.java     |    10 +-
 .../blueprints/AbstractBlueprintTest.java       |   202 +
 .../blueprints/MongoDbBlueprintTest.java        |    51 +
 .../basic-empty-app-and-entity-blueprint.yaml   |    30 +
 .../couchbase-replication-w-pillowfight.yaml    |    56 +
 .../src/test/resources/couchbase-w-loadgen.yaml |    54 +
 .../test/resources/couchbase-w-pillowfight.yaml |    35 +
 .../launcher/src/test/resources/couchbase.yaml  |    14 +-
 .../launcher/src/test/resources/hello-world.war |   Bin 4606 -> 0 bytes
 .../src/test/resources/mongo-blueprint.yaml     |     3 +-
 .../src/test/resources/mongo-scripts.yaml       |     1 -
 .../src/test/resources/mongo-sharded.yaml       |     5 +-
 usage/launcher/src/test/resources/nginx.yaml    |    27 +
 usage/launcher/src/test/resources/web.yaml      |     2 +-
 usage/logback-includes/pom.xml                  |    17 +-
 .../JcloudsPersistenceThreadDiscriminator.java  |    65 +
 .../brooklyn/logback-appender-jclouds.xml       |    39 +-
 .../brooklyn/logback-logger-debug-jclouds.xml   |    22 +-
 .../resources/brooklyn/logback-logger-trace.xml |    26 +
 usage/logback-xml/pom.xml                       |     6 +-
 usage/qa/log-exclusions.txt                     |    17 +
 usage/qa/pom.xml                                |    26 +-
 .../qa/load/SimulatedJBoss7ServerImpl.java      |   240 +
 .../qa/load/SimulatedMySqlNodeImpl.java         |   183 +
 .../qa/load/SimulatedNginxControllerImpl.java   |   196 +
 .../brooklyn/qa/load/SimulatedTheeTierApp.java  |   140 +
 .../java/brooklyn/qa/longevity/Monitor.java     |     4 +-
 .../webcluster/SinusoidalLoadGenerator.java     |    90 -
 .../qa/longevity/webcluster/WebClusterApp.java  |   101 -
 usage/qa/src/main/resources/hello-world.txt     |    24 +
 usage/qa/src/main/resources/hello-world.war     |   Bin 4606 -> 14693 bytes
 .../test/java/brooklyn/qa/load/LoadTest.java    |   243 +
 .../webcluster/SinusoidalLoadGenerator.java     |    90 +
 .../qa/longevity/webcluster/WebClusterApp.java  |   101 +
 usage/rest-api/pom.xml                          |    18 +-
 .../java/brooklyn/rest/api/ActivityApi.java     |    54 +-
 .../java/brooklyn/rest/api/ApplicationApi.java  |   316 +-
 .../main/java/brooklyn/rest/api/CatalogApi.java |   136 +-
 .../java/brooklyn/rest/api/EffectorApi.java     |    88 +-
 .../main/java/brooklyn/rest/api/EntityApi.java  |   325 +-
 .../java/brooklyn/rest/api/EntityConfigApi.java |   145 +-
 .../java/brooklyn/rest/api/LocationApi.java     |    66 +-
 .../main/java/brooklyn/rest/api/PolicyApi.java  |   225 +-
 .../java/brooklyn/rest/api/PolicyConfigApi.java |   138 +-
 .../main/java/brooklyn/rest/api/ScriptApi.java  |     6 +-
 .../main/java/brooklyn/rest/api/SensorApi.java  |   156 +-
 .../main/java/brooklyn/rest/api/ServerApi.java  |   113 +-
 .../main/java/brooklyn/rest/api/VersionApi.java |     6 +-
 .../brooklyn/rest/domain/AccessSummary.java     |     2 +-
 .../java/brooklyn/rest/domain/ApiError.java     |     4 +
 .../brooklyn/rest/domain/ApplicationSpec.java   |   243 +-
 .../rest/domain/ApplicationSummary.java         |     2 +-
 .../rest/domain/CatalogEntitySummary.java       |    11 +-
 .../rest/domain/CatalogItemSummary.java         |    50 +-
 .../rest/domain/CatalogPolicySummary.java       |    12 +-
 .../brooklyn/rest/domain/ConfigSummary.java     |   257 +-
 .../brooklyn/rest/domain/EffectorSummary.java   |   252 +-
 .../rest/domain/EntityConfigSummary.java        |    62 +-
 .../java/brooklyn/rest/domain/EntitySpec.java   |   135 +-
 .../brooklyn/rest/domain/EntitySummary.java     |   103 +-
 .../java/brooklyn/rest/domain/HasConfig.java    |    28 +
 .../rest/domain/HighAvailabilitySummary.java    |   135 +-
 .../brooklyn/rest/domain/LinkWithMetadata.java  |     2 +-
 .../java/brooklyn/rest/domain/LocationSpec.java |   117 +-
 .../brooklyn/rest/domain/LocationSummary.java   |   101 +-
 .../rest/domain/PolicyConfigSummary.java        |    49 +-
 .../brooklyn/rest/domain/PolicySummary.java     |   146 +-
 .../rest/domain/ScriptExecutionSummary.java     |    13 +-
 .../brooklyn/rest/domain/SensorSummary.java     |   146 +-
 .../rest/domain/SummaryComparators.java         |    36 +-
 .../java/brooklyn/rest/domain/TaskSummary.java  |   333 +-
 .../brooklyn/rest/domain/UsageStatistic.java    |    16 +-
 .../brooklyn/rest/domain/UsageStatistics.java   |    31 +-
 .../brooklyn/rest/domain/VersionSummary.java    |    61 +
 usage/rest-api/src/main/webapp/WEB-INF/web.xml  |    24 +-
 .../java/brooklyn/rest/domain/ApiErrorTest.java |     6 +-
 .../rest/domain/ApplicationSpecTest.java        |    49 +-
 .../rest/domain/EffectorSummaryTest.java        |    51 +-
 .../brooklyn/rest/domain/EntitySpecTest.java    |    41 +-
 .../brooklyn/rest/domain/EntitySummaryTest.java |    60 +-
 .../brooklyn/rest/domain/LocationSpecTest.java  |    48 +-
 .../brooklyn/rest/util/RestApiTestUtils.java    |    58 +
 .../test/resources/fixtures/entity-summary.json |     2 +-
 usage/rest-client/pom.xml                       |    19 +-
 .../java/brooklyn/rest/client/BrooklynApi.java  |   136 +-
 .../ApplicationResourceIntegrationTest.java     |    51 +-
 .../rest/client/BrooklynApiRestClientTest.java  |     7 +-
 .../rest-client/src/test/webapp/WEB-INF/web.xml |    24 +-
 usage/rest-server/pom.xml                       |    60 +-
 .../java/brooklyn/rest/BrooklynRestApi.java     |     6 +-
 .../java/brooklyn/rest/BrooklynWebConfig.java   |    50 +-
 .../BrooklynPropertiesSecurityFilter.java       |   175 +
 .../rest/filter/HaMasterCheckFilter.java        |    85 +
 .../brooklyn/rest/filter/LoggingFilter.java     |   157 +
 .../brooklyn/rest/filter/NoCacheFilter.java     |    40 +
 .../rest/filter/RequestTaggingFilter.java       |    62 +
 .../resources/AbstractBrooklynRestResource.java |    17 +-
 .../rest/resources/ActivityResource.java        |    53 +-
 .../rest/resources/ApplicationResource.java     |    57 +-
 .../rest/resources/CatalogResource.java         |   196 +-
 .../rest/resources/EffectorResource.java        |    13 +-
 .../rest/resources/EntityConfigResource.java    |   157 +-
 .../brooklyn/rest/resources/EntityResource.java |   242 +-
 .../rest/resources/LocationResource.java        |     3 +-
 .../rest/resources/PolicyConfigResource.java    |   113 +-
 .../brooklyn/rest/resources/PolicyResource.java |     6 +-
 .../brooklyn/rest/resources/ScriptResource.java |     9 +-
 .../brooklyn/rest/resources/SensorResource.java |    68 +-
 .../brooklyn/rest/resources/ServerResource.java |   272 +-
 .../rest/resources/VersionResource.java         |    11 +-
 .../BrooklynPropertiesSecurityFilter.java       |   174 -
 .../provider/AbstractSecurityProvider.java      |    56 +
 .../provider/AnyoneSecurityProvider.java        |     1 -
 .../provider/BlackholeSecurityProvider.java     |     1 -
 ...nUserWithRandomPasswordSecurityProvider.java |    68 +
 .../provider/DelegatingSecurityProvider.java    |   100 +-
 .../provider/ExplicitUsersSecurityProvider.java |    77 +-
 .../security/provider/LdapSecurityProvider.java |    30 +-
 .../rest/transform/ApplicationTransformer.java  |     2 +-
 .../rest/transform/CatalogTransformer.java      |    24 +-
 .../rest/transform/EffectorTransformer.java     |    28 +-
 .../rest/transform/EntityTransformer.java       |    54 +-
 .../rest/transform/LocationTransformer.java     |    13 +-
 .../rest/transform/PolicyTransformer.java       |     3 +-
 .../rest/transform/SensorTransformer.java       |    19 +-
 .../rest/transform/TaskTransformer.java         |     1 -
 .../rest/util/BrooklynRestResourceUtils.java    |    57 +-
 .../rest/util/DefaultExceptionMapper.java       |    33 +-
 .../brooklyn/rest/util/EntityLocationUtils.java |     1 -
 .../brooklyn/rest/util/FormMapProvider.java     |     1 -
 .../brooklyn/rest/util/HaMasterCheckFilter.java |    78 -
 .../brooklyn/rest/util/WebResourceUtils.java    |    76 +-
 .../rest/util/json/BidiSerialization.java       |   175 +
 .../util/json/BrooklynJacksonJsonProvider.java  |   172 +
 .../json/ConfigurableSerializerProvider.java    |    94 +
 .../ErrorAndToStringUnknownTypeSerializer.java  |   125 +
 .../rest/util/json/MultimapSerializer.java      |    62 +
 ...StrictPreferringFieldsVisibilityChecker.java |   107 +
 .../main/resources/build-metadata.properties    |    18 +
 .../rest-server/src/main/webapp/WEB-INF/web.xml |    22 +-
 .../brooklynnode/DeployBlueprintTest.java       |    30 +-
 .../BrooklynPropertiesSecurityFilterTest.java   |    17 +-
 .../brooklyn/rest/BrooklynRestApiLauncher.java  |    72 +-
 .../brooklyn/rest/domain/ApplicationTest.java   |    94 +-
 .../rest/domain/LocationSummaryTest.java        |    38 +-
 .../brooklyn/rest/domain/SensorSummaryTest.java |   114 +-
 .../rest/resources/AccessResourceTest.java      |     2 -
 .../rest/resources/ApiDocResourceTest.java      |    44 +-
 .../ApplicationResourceIntegrationTest.java     |    37 +-
 .../rest/resources/ApplicationResourceTest.java |   904 +-
 .../rest/resources/CatalogResourceTest.java     |   367 +-
 .../resources/EntityConfigResourceTest.java     |    93 +-
 .../rest/resources/EntityResourceTest.java      |   113 +-
 .../rest/resources/ErrorResponseTest.java       |     1 +
 .../rest/resources/LocationResourceTest.java    |   103 +-
 .../rest/resources/PolicyResourceTest.java      |     2 +
 .../SensorResourceIntegrationTest.java          |    83 +
 .../rest/resources/SensorResourceTest.java      |   212 +-
 .../ServerResourceIntegrationTest.java          |    75 +-
 .../rest/resources/ServerResourceTest.java      |    11 +-
 .../rest/resources/VersionResourceTest.java     |    36 +-
 .../security/provider/TestSecurityProvider.java |     4 +
 .../rest/testing/BrooklynRestApiTest.java       |    98 +-
 .../rest/testing/BrooklynRestResourceTest.java  |    27 +-
 .../rest/testing/mocks/NameMatcherGroup.java    |    30 +
 .../testing/mocks/NameMatcherGroupImpl.java     |    33 +
 .../rest/testing/mocks/RestMockApp.java         |     8 -
 .../rest/testing/mocks/RestMockAppBuilder.java  |     5 +-
 .../testing/mocks/RestMockSimpleEntity.java     |    14 +-
 .../util/BrooklynRestResourceUtilsTest.java     |    98 +-
 .../json/BrooklynJacksonSerializerTest.java     |   399 +
 usage/scripts/change-version.sh                 |    88 +-
 usage/scripts/grep-in-poms.sh                   |     2 +-
 usage/test-support/pom.xml                      |    23 +-
 .../java/brooklyn/test/EntityTestUtils.java     |    27 +-
 .../main/java/brooklyn/test/HttpTestUtils.java  |   129 +-
 .../java/brooklyn/test/NetworkingTestUtils.java |    68 +
 .../brooklyn/test/PerformanceTestUtils.java     |    99 +
 .../main/java/brooklyn/test/TestUtils.groovy    |     8 +-
 .../main/java/brooklyn/test/WebAppMonitor.java  |     6 +-
 utils/common/pom.xml                            |     9 +-
 .../java/brooklyn/config/ConfigInheritance.java |    47 +
 .../main/java/brooklyn/config/ConfigKey.java    |     7 +
 .../src/main/java/brooklyn/test/Asserts.java    |    35 +-
 .../util/collections/CollectionFunctionals.java |   178 +-
 .../java/brooklyn/util/collections/Jsonya.java  |     2 +-
 .../brooklyn/util/collections/MutableList.java  |    45 +-
 .../brooklyn/util/collections/MutableMap.java   |    32 +-
 .../brooklyn/util/collections/MutableSet.java   |    48 +-
 .../brooklyn/util/collections/QuorumCheck.java  |   236 +
 .../util/crypto/AuthorizedKeysParser.java       |   134 +
 .../crypto/SecureKeysWithoutBouncyCastle.java   |   161 +
 .../brooklyn/util/exceptions/Exceptions.java    |   103 +-
 .../util/exceptions/NotManagedException.java    |    36 +
 .../util/exceptions/ReferenceWithError.java     |    28 +-
 .../exceptions/RuntimeTimeoutException.java     |    36 +
 .../java/brooklyn/util/guava/Functionals.java   |   110 +
 .../java/brooklyn/util/guava/IfFunctions.java   |   158 +
 .../guava/IllegalStateExceptionSupplier.java    |    43 +
 .../main/java/brooklyn/util/guava/Maybe.java    |   135 +-
 .../main/java/brooklyn/util/io/FileUtil.java    |    18 +
 .../util/javalang/AggregateClassLoader.java     |    19 +-
 .../main/java/brooklyn/util/javalang/Enums.java |    30 +-
 .../java/brooklyn/util/javalang/Equals.java     |    94 +
 .../util/javalang/MemoryUsageTracker.java       |    72 +
 .../brooklyn/util/javalang/Reflections.java     |   776 +-
 .../util/javalang/StackTraceSimplifier.java     |    25 +-
 .../util/logging/SimpleOneLineLogFormatter.java |   208 +-
 .../java/brooklyn/util/math/MathPredicates.java |    24 +-
 .../brooklyn/util/maven/MavenRetriever.java     |    36 +-
 .../src/main/java/brooklyn/util/net/Cidr.java   |     7 +-
 .../brooklyn/util/net/HasNetworkAddresses.java  |    48 +
 .../main/java/brooklyn/util/net/Networking.java |   173 +-
 .../src/main/java/brooklyn/util/net/Urls.java   |    47 +-
 .../src/main/java/brooklyn/util/os/Os.java      |     9 +-
 .../java/brooklyn/util/repeat/Repeater.java     |    20 +-
 .../java/brooklyn/util/ssh/BashCommands.java    |    16 +-
 .../brooklyn/util/ssh/IptablesCommands.java     |    17 +-
 .../brooklyn/util/stream/StreamGobbler.java     |    50 +-
 .../main/java/brooklyn/util/stream/Streams.java |    10 +
 .../brooklyn/util/text/ByteSizeStrings.java     |    68 +
 .../java/brooklyn/util/text/KeyValueParser.java |     3 +-
 .../util/text/NaturalOrderComparator.java       |   219 +-
 .../util/text/QuotedStringTokenizer.java        |   268 +-
 .../java/brooklyn/util/text/StringEscapes.java  |     6 +-
 .../brooklyn/util/text/StringFunctions.java     |    16 +-
 .../brooklyn/util/text/StringPredicates.java    |   180 +-
 .../main/java/brooklyn/util/text/Strings.java   |   642 +-
 .../main/java/brooklyn/util/time/Duration.java  |    52 +
 .../main/java/brooklyn/util/time/Durations.java |    26 +
 .../src/main/java/brooklyn/util/time/Time.java  |   423 +-
 .../src/main/java/brooklyn/util/yaml/Yamls.java |    17 +-
 .../collections/CollectionFunctionalsTest.java  |    51 +
 .../util/collections/MutableListTest.java       |    63 +
 .../util/collections/QuorumChecksTest.java      |   105 +
 .../util/exceptions/ExceptionsTest.java         |    86 +
 .../brooklyn/util/guava/FunctionalsTest.java    |    58 +
 .../brooklyn/util/guava/IfFunctionsTest.java    |   106 +
 .../guava/KeyTransformingLoadingCacheTest.java  |     1 -
 .../util/internal/CommandLineUtilTest.java      |    62 +-
 .../util/javalang/MemoryUsageTrackerTest.java   |    89 +
 .../util/javalang/StackTraceSimplifierTest.java |    36 +-
 .../brooklyn/util/maven/MavenArtifactTest.java  |    81 +-
 .../brooklyn/util/net/NetworkingUtilsTest.java  |    28 +-
 .../test/java/brooklyn/util/net/UrlsTest.java   |    15 +-
 .../src/test/java/brooklyn/util/os/OsTest.java  |    31 +
 .../java/brooklyn/util/repeat/RepeaterTest.java |    18 +-
 .../brooklyn/util/ssh/IptablesCommandsTest.java |    82 +-
 .../brooklyn/util/stream/StreamGobblerTest.java |    90 +
 .../brooklyn/util/text/ByteSizeStringsTest.java |    32 +
 .../util/text/NaturalOrderComparatorTest.java   |    26 +-
 .../brooklyn/util/text/StringEscapesTest.java   |    24 +-
 .../util/text/StringPredicatesTest.java         |    74 +
 .../java/brooklyn/util/text/StringsTest.java    |    30 +
 .../brooklyn/util/text/WildcardGlobsTest.java   |   396 +-
 .../java/brooklyn/util/time/DurationTest.java   |     8 +
 .../test/java/brooklyn/util/time/TimeTest.java  |     4 +-
 utils/groovy/pom.xml                            |    22 +-
 utils/jmx/jmxmp-ssl-agent/pom.xml               |    15 +-
 utils/jmx/jmxrmi-agent/pom.xml                  |     7 +-
 .../brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java   |     4 +-
 utils/rest-swagger/pom.xml                      |     9 +-
 .../brooklyn/rest/apidoc/ApidocEndpoint.java    |    10 +-
 .../brooklyn/rest/apidoc/ApidocResource.java    |     8 +-
 .../java/brooklyn/rest/apidoc/ApidocRoot.java   |    47 +
 utils/test-support/pom.xml                      |     5 +-
 .../main/java/brooklyn/test/StatusListener.java |     8 +-
 .../test/TestResourceUnavailableException.java  |   140 +
 2357 files changed, 157164 insertions(+), 87358 deletions(-)
----------------------------------------------------------------------



Mime
View raw message