Closes #237 Misc osgi classloading
For review only at this point. Please first merge https://github.com/apache/brooklyn-server/pull/236, then I'll rebase this. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/12c645ec Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/12c645ec Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/12c645ec Branch: refs/heads/master Commit: 12c645ecfa30a5a37e7bacdd87e5be0ce62f2e30 Parents: c3dc6e8 3bb4788 Author: Svetoslav Neykov <[email protected]> Authored: Mon Jul 11 15:45:37 2016 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Mon Jul 11 15:45:37 2016 +0300 ---------------------------------------------------------------------- .../spi/dsl/methods/BrooklynDslCommon.java | 63 ++- .../brooklyn/camp/brooklyn/RebindOsgiTest.java | 477 +++++++++++++++++++ ...ssLoaderFromBrooklynClassLoadingContext.java | 11 +- .../brooklyn/core/mgmt/ha/OsgiManager.java | 1 - .../core/mgmt/persist/XmlMementoSerializer.java | 204 +++++--- .../core/mgmt/rebind/RebindIteration.java | 30 +- .../brooklyn/util/core/ClassLoaderUtils.java | 136 ++++-- .../apache/brooklyn/util/core/osgi/Osgis.java | 6 + ...aderFromBrooklynClassLoadingContextTest.java | 65 +++ ...entoSerializerDelegatingClassLoaderTest.java | 140 ++++++ .../mgmt/persist/XmlMementoSerializerTest.java | 123 ++++- .../util/core/ClassLoaderUtilsTest.java | 39 ++ .../src/main/resources/etc/default.catalog.bom | 2 +- .../test/osgi/entities/SimpleApplication.java | 1 - .../osgi/entities/SimpleApplicationImpl.java | 1 - .../test/osgi/entities/SimpleEntity.java | 9 +- .../test/osgi/entities/SimpleEntityImpl.java | 1 - .../test/osgi/entities/SimpleObject.java | 56 +++ .../test/osgi/entities/SimplePolicy.java | 6 +- .../test/osgi/entities/more/MoreObject.java | 56 +++ .../test/osgi/entities/more/MoreObject.java | 56 +++ .../brooklyn/util/osgi/VersionedName.java | 11 +- .../brooklyn/util/osgi/OsgiTestResources.java | 3 + .../osgi/brooklyn-test-osgi-entities.jar | Bin 17775 -> 19168 bytes .../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 14964 -> 16004 bytes .../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 15646 -> 16906 bytes 26 files changed, 1356 insertions(+), 141 deletions(-) ----------------------------------------------------------------------
