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/11 02:52:54 UTC
[2/2] incubator-brooklyn git commit: This closes #307
This closes #307
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dc53cec5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dc53cec5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dc53cec5
Branch: refs/heads/master
Commit: dc53cec5db859c30a05e397b69f4c71230d5840b
Parents: 3cfda7e 72b29b9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 11 01:52:33 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 11 01:52:33 2014 +0000
----------------------------------------------------------------------
.../brooklyn/management/ha/OsgiManager.java | 78 +++--
.../main/java/brooklyn/util/ResourceUtils.java | 2 +-
.../src/main/java/brooklyn/util/osgi/Osgis.java | 300 +++++++++++++++----
.../osgi/more-entities-v2-evil-twin/pom.xml | 88 ++++++
.../brooklyn/osgi/tests/more/MoreEntity.java | 38 +++
.../osgi/tests/more/MoreEntityImpl.java | 47 +++
.../brooklyn/catalog/internal/CatalogItems.java | 8 +
.../management/osgi/OsgiTestResources.java | 16 +-
.../osgi/OsgiVersionMoreEntityTest.java | 116 +++++--
...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 0 -> 12757 bytes
...-test-osgi-more-entities_evil-twin_0.2.0.txt | 21 ++
.../util/exceptions/ReferenceWithError.java | 6 +-
12 files changed, 601 insertions(+), 119 deletions(-)
----------------------------------------------------------------------