You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/05/03 10:01:16 UTC

[5/5] brooklyn-server git commit: This closes #661

This closes #661


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

Branch: refs/heads/master
Commit: e247841dd969d5cb150cd16f545d5f4a88d7de56
Parents: f07b6f0 40fdfaf
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Wed May 3 11:00:43 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Wed May 3 11:00:43 2017 +0100

----------------------------------------------------------------------
 .../org/apache/brooklyn/api/entity/Entity.java  |  5 +++
 .../internal/AbstractBrooklynObjectSpec.java    |  6 ++--
 .../BrooklynEntityDecorationResolver.java       | 31 ++++++++---------
 .../spi/creation/BrooklynEntityMatcher.java     |  4 +++
 .../brooklyn/spi/creation/CampResolver.java     |  3 --
 .../core/catalog/internal/CatalogItemDo.java    |  5 +++
 .../brooklyn/core/entity/AbstractEntity.java    | 15 ++++-----
 .../core/entity/BrooklynConfigKeys.java         |  2 ++
 .../apache/brooklyn/core/mgmt/BrooklynTags.java |  5 +++
 .../BrooklynClassLoadingContextSequential.java  |  8 ++---
 .../JavaBrooklynClassLoadingContext.java        |  4 +--
 .../core/mgmt/persist/OsgiClassPrefixer.java    |  3 --
 .../core/mgmt/persist/XmlMementoSerializer.java |  6 +---
 .../core/objs/AbstractBrooklynObject.java       |  1 +
 .../core/objs/BrooklynObjectInternal.java       |  3 ++
 .../brooklyn/core/typereg/RegisteredTypes.java  | 17 ++++++++++
 .../brooklyn/util/core/ClassLoaderUtils.java    |  4 +--
 .../util/core/ClassLoaderUtilsTest.java         | 35 ++++++++++++++++----
 .../rest/resources/ApplicationResource.java     |  2 +-
 .../brooklyn/rest/resources/EntityResource.java |  8 +++--
 .../rest/util/BrooklynRestResourceUtils.java    |  4 +--
 21 files changed, 112 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e247841d/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
----------------------------------------------------------------------