You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/11/19 18:48:07 UTC
[12/13] incubator-brooklyn git commit: This closes #341

This closes #341


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

Branch: refs/heads/master
Commit: 4dadf06d080b506477c6da331f00cc7ed72e2697
Parents: 1241ee1 06a4412
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Nov 19 17:45:38 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Nov 19 17:45:38 2014 +0000

----------------------------------------------------------------------
 .../java/brooklyn/catalog/BrooklynCatalog.java  |  3 +-
 .../brooklyn/entity/rebind/RebindManager.java   |  4 +-
 .../catalog/internal/BasicBrooklynCatalog.java  | 23 ++++--
 .../brooklyn/catalog/internal/CatalogDo.java    |  9 +-
 .../brooklyn/catalog/internal/CatalogUtils.java | 39 ++++++++-
 .../brooklyn/config/BrooklynServerConfig.java   |  1 -
 .../entity/basic/ServiceStateLogic.java         |  8 +-
 .../entity/rebind/RebindManagerImpl.java        |  6 +-
 .../JavaBrooklynClassLoadingContext.java        | 20 +++--
 .../OsgiBrooklynClassLoadingContext.java        | 36 +++++---
 .../management/entitlement/Entitlements.java    | 31 ++++---
 .../ha/HighAvailabilityManagerImpl.java         | 87 ++++++++++++--------
 ...ntPlaneSyncRecordPersisterToObjectStore.java |  2 +-
 .../internal/AbstractManagementContext.java     |  4 +-
 .../internal/BrooklynGarbageCollector.java      |  1 +
 .../internal/EntityManagementUtils.java         |  5 +-
 .../management/internal/LocalEntityManager.java | 12 +--
 .../main/java/brooklyn/util/ResourceUtils.java  | 34 ++++----
 .../HighAvailabilityManagerSplitBrainTest.java  | 15 +++-
 .../brooklyn/management/ha/HotStandbyTest.java  |  6 +-
 .../brooklyn/management/ha/WarmStandbyTest.java |  2 +-
 .../entity/webapp/jboss/JBoss7ServerImpl.java   |  2 -
 .../BrooklynComponentTemplateResolver.java      | 32 +++++--
 .../spi/creation/BrooklynEntityMatcher.java     |  4 +-
 .../BrooklynYamlTypeInstantiatorTest.java       |  2 +-
 .../src/test/resources/test-tomcat-https.yaml   |  1 -
 26 files changed, 256 insertions(+), 133 deletions(-)
----------------------------------------------------------------------