This closes #992
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ace8c406 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ace8c406 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ace8c406 Branch: refs/heads/master Commit: ace8c4067e77c551ee58c861a3e3ba2862b22189 Parents: aef4da8 2aaf125 Author: Alex Heneveld <[email protected]> Authored: Wed Oct 28 00:53:16 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Wed Oct 28 00:53:16 2015 +0000 ---------------------------------------------------------------------- .../core/mgmt/persist/XmlMementoSerializer.java | 4 +- .../apache/brooklyn/util/core/osgi/Osgis.java | 66 +++++++++++++++++++- karaf/commands/pom.xml | 5 ++ .../apache/brooklyn/karaf/commands/Catalog.java | 2 + karaf/itest/pom.xml | 3 +- .../java/org/apache/brooklyn/AssemblyTest.java | 31 +++++---- karaf/pom.xml | 6 +- 7 files changed, 96 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
