You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/18 15:42:23 UTC

[12/12] git commit: This closes #77

This closes #77


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

Branch: refs/heads/master
Commit: f0b8f296d0211ef57df933ec8c0e2da5ddcc879d
Parents: 935236e 3fc4370
Author: Aled Sage <al...@gmail.com>
Authored: Fri Jul 18 14:41:48 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Jul 18 14:41:48 2014 +0100

----------------------------------------------------------------------
 .../brooklyn/location/LocationRegistry.java     |   2 +-
 .../java/brooklyn/location/LocationSpec.java    |   7 +-
 .../brooklyn/management/LocationManager.java    |   6 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |   3 +-
 .../brooklyn/catalog/internal/CatalogDto.java   |  25 ++-
 .../catalog/internal/CatalogDtoUtils.java       |   5 +-
 .../entity/basic/ApplicationBuilder.java        |   6 +
 .../entity/basic/EntityDynamicType.java         |  16 +-
 .../location/basic/BasicLocationRegistry.java   |  10 +-
 .../management/entitlement/Entitlements.java    |   1 +
 .../entitlement/WebEntitlementContext.java      |   9 +-
 .../internal/AbstractManagementContext.java     |   4 +-
 .../internal/LocalLocationManager.java          |  19 ++-
 .../management/internal/LocalUsageManager.java  |  11 +-
 .../java/brooklyn/util/config/ConfigBag.java    |  15 +-
 .../catalog/internal/CatalogDtoTest.java        |   9 +-
 ...stomAggregatingEnricherDeprecatedTest.groovy |   3 +-
 .../TransformingEnricherDeprecatedTest.groovy   |   2 +-
 .../entity/EffectorSayHiGroovyTest.groovy       |   3 +-
 .../entity/basic/AbstractEntityLegacyTest.java  |   4 +-
 .../entity/basic/ConfigMapGroovyTest.groovy     |   2 +-
 .../entity/basic/EntitySubscriptionTest.groovy  |   2 +-
 ...apListAndOtherStructuredConfigKeyTest.groovy |   2 +-
 .../java/brooklyn/entity/group/GroupTest.java   |   3 +-
 .../entity/rebind/RebindEntityTest.java         |   2 +-
 .../entity/rebind/RebindManagerSorterTest.java  |   4 +-
 ...regatingMachineProvisioningLocationTest.java |   3 +-
 .../basic/TestPortSupplierLocation.groovy       |   3 +-
 .../entitlement/AcmeEntitlementManagerTest.java |   8 +-
 .../HighAvailabilityManagerSplitBrainTest.java  |   2 +-
 .../policy/basic/PolicySubscriptionTest.groovy  |   2 +-
 .../brooklyn/test/entity/TestApplication.java   |   8 +-
 .../enricher/HttpLatencyDetectorTest.java       |   2 +-
 .../enricher/TimeFractionDeltaEnricherTest.java |   2 +-
 .../brooklyn/policy/ha/ServiceReplacerTest.java |   3 +-
 .../entity/brooklynnode/BrooklynNodeTest.java   |   4 +-
 .../brooklyn/entity/java/EntityPollingTest.java |   2 +-
 .../entity/java/VanillaJavaAppTest.java         |   8 +-
 .../camp/brooklyn/JavaWebAppsMatchingTest.java  |   4 +-
 usage/cli/src/main/java/brooklyn/cli/Main.java  |   4 +-
 .../brooklyn/launcher/WebAppRunnerTest.groovy   | 163 -------------------
 .../brooklyn/launcher/WebAppRunnerTest.java     | 160 ++++++++++++++++++
 .../java/brooklyn/rest/domain/ApiError.java     |  24 +++
 .../fixtures/api-error-no-details.json          |   3 +-
 .../rest/resources/CatalogResource.java         |  24 ++-
 .../brooklyn/rest/resources/UsageResource.java  |   5 +-
 .../BrooklynPropertiesSecurityFilter.java       |  44 ++++-
 .../rest/util/DefaultExceptionMapper.java       |  57 ++++---
 .../brooklyn/rest/util/WebResourceUtils.java    |   2 +-
 .../brooklyn/rest/domain/SensorSummaryTest.java |   3 +-
 .../rest/resources/UsageResourceTest.java       |   2 +-
 .../brooklyn/util/exceptions/Exceptions.java    |  21 +--
 .../util/exceptions/FatalRuntimeException.java  |   2 +-
 .../util/exceptions/UserFacingException.java    |  39 +++++
 54 files changed, 487 insertions(+), 292 deletions(-)
----------------------------------------------------------------------