This closes #675
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/cfa0aa3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/cfa0aa3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/cfa0aa3c Branch: refs/heads/master Commit: cfa0aa3cdaddf422599cb0d778a91f44c9b79569 Parents: 1c0bbec 283b6e3 Author: Alex Heneveld <[email protected]> Authored: Mon Jun 15 08:45:48 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Mon Jun 15 08:45:48 2015 +0100 ---------------------------------------------------------------------- .../BrooklynClassLoadingContext.java | 14 +- .../src/main/java/brooklyn/BrooklynVersion.java | 540 ++++++++++++------- .../BrooklynClassLoadingContextSequential.java | 15 +- .../JavaBrooklynClassLoadingContext.java | 15 +- .../OsgiBrooklynClassLoadingContext.java | 30 +- .../brooklyn/management/ha/OsgiManager.java | 25 + .../internal/AbstractManagementContext.java | 2 +- .../main/java/brooklyn/util/ResourceUtils.java | 7 + .../src/main/java/brooklyn/util/osgi/Osgis.java | 11 +- .../src/test/dependencies/osgi/entities/pom.xml | 2 + .../test/java/brooklyn/BrooklynVersionTest.java | 140 +++-- .../java/brooklyn/util/ResourceUtilsTest.java | 9 + .../osgi/brooklyn-test-osgi-entities.jar | Bin 13060 -> 13666 bytes usage/archetypes/quickstart/NOTES.txt | 2 +- usage/archetypes/quickstart/pom.xml | 8 +- .../quickstart/src/brooklyn-sample/pom.xml | 2 +- usage/downstream-parent/pom.xml | 2 + .../rest/domain/BrooklynFeatureSummary.java | 91 ++++ .../brooklyn/rest/domain/VersionSummary.java | 20 +- .../rest/domain/VersionSummaryTest.java | 62 +++ .../test/resources/fixtures/server-version.json | 14 + .../brooklyn/rest/resources/ServerResource.java | 38 +- .../transform/BrooklynFeatureTransformer.java | 45 ++ .../rest/transform/PolicyTransformer.java | 1 - .../rest/transform/SensorTransformer.java | 3 +- 25 files changed, 804 insertions(+), 294 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cfa0aa3c/usage/downstream-parent/pom.xml ----------------------------------------------------------------------
