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/07/04 11:51:05 UTC
[23/45] git commit: Merge remote-tracking branch
'sjcorbett/yaml-context' into osgi2
Merge remote-tracking branch 'sjcorbett/yaml-context' into osgi2
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3e71512b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3e71512b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3e71512b
Branch: refs/heads/master
Commit: 3e71512b3dd21bb0113316c4e49df48bed92beb3
Parents: 1c04ec9 acd41f7
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jul 2 16:12:47 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jul 2 16:12:47 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/catalog/BrooklynCatalog.java | 48 +++---
.../main/java/brooklyn/catalog/CatalogItem.java | 15 +-
core/pom.xml | 6 +
.../catalog/internal/BasicBrooklynCatalog.java | 36 +++--
.../catalog/internal/CatalogItemDo.java | 15 +-
.../internal/CatalogItemDtoAbstract.java | 43 ++++--
.../catalog/internal/CatalogLibrariesDo.java | 22 +++
.../catalog/internal/CatalogLibrariesDto.java | 20 +++
.../catalog/internal/CatalogXmlSerializer.java | 14 +-
.../brooklyn/config/BrooklynServerConfig.java | 3 +
.../java/brooklyn/event/feed/ssh/SshFeed.java | 2 +-
.../brooklyn/management/ha/OsgiManager.java | 72 +++++++++
.../internal/LocalManagementContext.java | 18 +++
.../internal/ManagementContextInternal.java | 6 +
.../NonDeploymentManagementContext.java | 6 +
.../src/main/java/brooklyn/util/osgi/Osgis.java | 152 +++++++++++++++++++
.../catalog/internal/CatalogDtoTest.java | 11 +-
.../catalog/internal/CatalogLoadTest.java | 46 ++++++
.../management/osgi/OsgiStandaloneTest.java | 120 +++++++++++++++
.../entity/LocalManagementContextForTests.java | 9 +-
.../brooklyn/catalog/internal/osgi-catalog.xml | 11 ++
.../osgi/brooklyn-osgi-test-a_0.1.0.jar | Bin 0 -> 2055 bytes
pom.xml | 1 +
.../BrooklynAssemblyTemplateInstantiator.java | 10 +-
.../creation/BrooklynEntityClassResolver.java | 56 ++++++-
.../spi/creation/BrooklynYamlTypeLoader.java | 11 +-
.../main/java/brooklyn/rest/api/CatalogApi.java | 14 +-
.../rest/resources/CatalogResource.java | 26 +++-
.../rest/util/BrooklynRestResourceUtils.java | 2 +
.../rest/util/DefaultExceptionMapper.java | 2 +-
.../rest/resources/CatalogResourceTest.java | 43 +++---
31 files changed, 735 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e71512b/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e71512b/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java
----------------------------------------------------------------------