You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/06/06 12:25:37 UTC

[17/17] brooklyn-server git commit: Closes #672

Closes #672

Bundle uninstall and snapshot

Supports bundle install and auto-reinstall for snapshot POSTs.

Doesn't do anything for auto-upgrade but if you POST a new snapshot ZIP then redeploy, the newer version gets used.  Also cleanly uninstalls catalog items.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f3aa339f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f3aa339f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f3aa339f

Branch: refs/heads/master
Commit: f3aa339fdb9caa17b0c527cf889376ea8bbaa453
Parents: 27feabc 55def2e
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Tue Jun 6 13:24:31 2017 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Tue Jun 6 13:24:31 2017 +0100

----------------------------------------------------------------------
 .../brooklyn/api/catalog/BrooklynCatalog.java   |  15 +-
 .../brooklyn/api/catalog/CatalogItem.java       |   2 +
 .../brooklyn/api/typereg/ManagedBundle.java     |   3 +
 .../brooklyn/api/typereg/RegisteredType.java    |   5 +
 .../BrooklynComponentTemplateResolver.java      |   2 +
 .../catalog/CatalogMakeOsgiBundleTest.java      |  16 +-
 .../catalog/CatalogOsgiLibraryTest.java         |   9 +-
 .../CatalogOsgiVersionMoreEntityRebindTest.java | 119 +++++-
 .../CatalogOsgiVersionMoreEntityTest.java       |  17 +-
 .../catalog/CatalogOsgiYamlEntityTest.java      |  15 +-
 .../brooklyn/catalog/CatalogYamlRebindTest.java |   4 +
 .../brooklyn/test/lite/CampYamlLiteTest.java    |  19 +-
 .../apache/brooklyn/core/BrooklynVersion.java   |   3 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |  27 +-
 .../catalog/internal/CatalogBundleLoader.java   |   7 +-
 .../core/catalog/internal/CatalogItemDo.java    |   5 +
 .../internal/CatalogItemDtoAbstract.java        |  17 +-
 .../core/catalog/internal/CatalogUtils.java     |  18 +-
 .../core/mgmt/ha/OsgiArchiveInstaller.java      | 427 +++++++++++++++++++
 .../mgmt/ha/OsgiBundleInstallationResult.java   |  80 ++++
 .../brooklyn/core/mgmt/ha/OsgiManager.java      | 259 +++++++----
 .../core/mgmt/rebind/RebindContextImpl.java     |  15 +-
 .../core/mgmt/rebind/RebindIteration.java       |  15 +-
 .../rebind/transformer/CompoundTransformer.java |  17 +-
 .../core/typereg/BasicManagedBundle.java        |  15 +-
 .../core/typereg/BasicRegisteredType.java       |   6 +
 .../brooklyn/core/typereg/RegisteredTypes.java  |  10 +
 .../brooklyn/core/BrooklynVersionTest.java      |   4 +-
 .../mgmt/osgi/OsgiVersionMoreEntityTest.java    |   4 +-
 ...nceStoreObjectAccessorWriterTestFixture.java |   2 +-
 .../mgmt/persist/XmlMementoSerializerTest.java  |  13 +-
 .../transformer/CompoundTransformerTest.java    |   1 -
 .../brooklyn/util/core/osgi/OsgiTestBase.java   |  18 +
 .../apache/brooklyn/rest/api/CatalogApi.java    |  16 +-
 .../apache/brooklyn/rest/domain/ApiError.java   |  21 +-
 .../rest/resources/CatalogResource.java         | 152 +++----
 .../rest/resources/CatalogResourceTest.java     |  28 +-
 .../src/main/resources/catalog.bom              |   7 +-
 .../brooklyn/util/maven/MavenArtifact.java      |   3 +-
 .../java/org/apache/brooklyn/util/os/Os.java    |   5 +-
 .../brooklyn/util/osgi/VersionedName.java       |   7 +
 .../brooklyn/util/text/VersionComparator.java   |   9 +-
 .../brooklyn/util/osgi/VersionedNameTest.java   |  43 ++
 .../util/text/VersionComparatorTest.java        |   7 +
 .../brooklyn-test-osgi-com-example-entities.jar | Bin 22130 -> 22139 bytes
 .../osgi/brooklyn-test-osgi-entities.jar        | Bin 22900 -> 22902 bytes
 .../brooklyn-test-osgi-more-entities_0.1.0.jar  | Bin 15997 -> 16003 bytes
 .../brooklyn-test-osgi-more-entities_0.2.0.jar  | Bin 16903 -> 16922 bytes
 ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14091 -> 14098 bytes
 49 files changed, 1220 insertions(+), 267 deletions(-)
----------------------------------------------------------------------