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:06 UTC
[24/45] git commit: Merge remote-tracking branch
'sjcorbett/auto-deploy-bundles' into osgi2
Merge remote-tracking branch 'sjcorbett/auto-deploy-bundles' 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/74ddd83b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/74ddd83b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/74ddd83b
Branch: refs/heads/master
Commit: 74ddd83b7a7563815618bb566643a3275da77481
Parents: 3e71512 7fec791
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jul 2 16:12:55 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jul 2 16:12:55 2014 +0100
----------------------------------------------------------------------
.../catalog/internal/BasicBrooklynCatalog.java | 32 +++++----
.../catalog/internal/CatalogClasspathDo.java | 49 +++++++-------
.../brooklyn/catalog/internal/CatalogDo.java | 30 ++++++---
.../brooklyn/catalog/internal/CatalogDto.java | 68 +++++++++++++++++---
.../catalog/internal/CatalogDtoUtils.java | 52 ---------------
.../catalog/internal/CatalogItemDo.java | 2 +-
.../internal/CatalogItemDtoAbstract.java | 4 ++
.../catalog/internal/CatalogLibrariesDo.java | 35 ++++++++++
.../catalog/internal/CatalogLibrariesDto.java | 7 +-
.../brooklyn/management/ha/OsgiManager.java | 10 +--
.../internal/AbstractManagementContext.java | 10 +--
.../internal/ManagementContextInternal.java | 6 +-
.../src/main/java/brooklyn/util/osgi/Osgis.java | 15 +++--
13 files changed, 190 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/74ddd83b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------