brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [3/3] incubator-brooklyn git commit: This closes #555
Date Wed, 18 Mar 2015 11:52:08 GMT
This closes #555


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

Branch: refs/heads/master
Commit: 5fa14442dd837214c12046deb2cc4e233a809fc5
Parents: 52a6c70 09a6475
Author: Aled Sage <aled.sage@gmail.com>
Authored: Wed Mar 18 11:51:52 2015 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Wed Mar 18 11:51:52 2015 +0000

----------------------------------------------------------------------
 .../main/java/brooklyn/catalog/CatalogItem.java |   5 +-
 .../java/brooklyn/location/LocationSpec.java    |  27 ++++
 .../brooklyn/catalog/CatalogPredicates.java     |   4 +
 .../catalog/internal/BasicBrooklynCatalog.java  |  92 +++++++++--
 .../catalog/internal/CatalogClasspathDo.java    |   8 +
 .../catalog/internal/CatalogItemBuilder.java    |   6 +
 .../internal/CatalogLocationItemDto.java        |  43 ++++++
 .../catalog/internal/CatalogXmlSerializer.java  |   2 +
 .../location/basic/BasicLocationRegistry.java   |  87 ++++++++++-
 .../location/basic/CatalogLocationResolver.java |  79 ++++++++++
 .../services/brooklyn.location.LocationResolver |   1 +
 .../brooklyn/osgi/tests/SimpleLocation.java     |  35 +++++
 .../entity/rebind/RebindCatalogItemTest.java    |  36 ++++-
 .../entity/rebind/RebindTestFixture.java        |   9 +-
 .../osgi/brooklyn-test-osgi-entities.jar        | Bin 12419 -> 13060 bytes
 .../camp/brooklyn/AbstractYamlTest.java         |  20 +++
 .../brooklyn/EmptySoftwareProcessYamlTest.java  |  39 ++---
 .../catalog/CatalogYamlLocationTest.java        | 152 +++++++++++++++++++
 .../rest/resources/LocationResource.java        |  83 +++++-----
 .../rest/resources/LocationResourceTest.java    |  20 ++-
 .../src/main/java/brooklyn/util/yaml/Yamls.java |  48 ++++++
 .../test/java/brooklyn/util/yaml/YamlsTest.java |  47 ++++++
 22 files changed, 760 insertions(+), 83 deletions(-)
----------------------------------------------------------------------



Mime
View raw message