Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6F822FDE9 for ; Thu, 13 Nov 2014 22:23:57 +0000 (UTC) Received: (qmail 18071 invoked by uid 500); 13 Nov 2014 22:23:57 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 18036 invoked by uid 500); 13 Nov 2014 22:23:57 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 18017 invoked by uid 99); 13 Nov 2014 22:23:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Nov 2014 22:23:57 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 13 Nov 2014 22:23:55 +0000 Received: (qmail 17827 invoked by uid 99); 13 Nov 2014 22:23:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Nov 2014 22:23:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C77EF936C62; Thu, 13 Nov 2014 22:23:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Thu, 13 Nov 2014 22:23:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [18/18] incubator-brooklyn git commit: This closes #312 X-Virus-Checked: Checked by ClamAV on apache.org This closes #312 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6791d51d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6791d51d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6791d51d Branch: refs/heads/master Commit: 6791d51d4b8e35c7e5a306ed4fb0984746b1385e Parents: 50e3cbc cf3a9eb Author: Alex Heneveld Authored: Thu Nov 13 22:22:57 2014 +0000 Committer: Alex Heneveld Committed: Thu Nov 13 22:22:57 2014 +0000 ---------------------------------------------------------------------- .../java/brooklyn/catalog/BrooklynCatalog.java | 48 +- .../main/java/brooklyn/catalog/CatalogItem.java | 37 +- .../mementos/BrooklynMementoPersister.java | 4 + .../brooklyn/mementos/CatalogItemMemento.java | 8 +- .../main/java/brooklyn/basic/BrooklynTypes.java | 2 +- .../java/brooklyn/catalog/CatalogLoadMode.java | 1 - .../brooklyn/catalog/CatalogPredicates.java | 16 +- .../catalog/internal/BasicBrooklynCatalog.java | 247 +++++++--- .../internal/CatalogBundleConverter.java | 63 +++ .../catalog/internal/CatalogBundleDto.java | 74 +++ .../catalog/internal/CatalogClasspathDo.java | 17 +- .../internal/CatalogConfigurationDto.java | 44 -- .../brooklyn/catalog/internal/CatalogDo.java | 18 +- .../catalog/internal/CatalogItemBuilder.java | 56 ++- .../catalog/internal/CatalogItemComparator.java | 54 +++ .../catalog/internal/CatalogItemDo.java | 20 +- .../internal/CatalogItemDtoAbstract.java | 186 ++++++-- .../catalog/internal/CatalogLibrariesDo.java | 5 +- .../catalog/internal/CatalogLibrariesDto.java | 54 +-- .../brooklyn/catalog/internal/CatalogUtils.java | 95 +++- .../catalog/internal/CatalogXmlSerializer.java | 13 +- .../AbstractBrooklynObjectRebindSupport.java | 2 +- .../rebind/BasicCatalogItemRebindSupport.java | 3 +- .../rebind/RebindContextLookupContext.java | 31 ++ .../entity/rebind/RebindManagerImpl.java | 456 ++++++++++++------- .../rebind/dto/BasicCatalogItemMemento.java | 46 +- .../entity/rebind/dto/MementosGenerators.java | 19 +- .../BrooklynMementoPersisterInMemory.java | 20 + .../BrooklynMementoPersisterToMultiFile.java | 15 +- .../BrooklynMementoPersisterToObjectStore.java | 71 ++- .../CatalogItemLibrariesConverter.java | 68 +++ .../rebind/persister/XmlMementoSerializer.java | 8 +- .../internal/BrooklynFeatureEnablement.java | 12 + ...ssLoaderFromBrooklynClassLoadingContext.java | 64 +++ .../OsgiBrooklynClassLoadingContext.java | 8 +- .../brooklyn/management/ha/OsgiManager.java | 147 ++++-- .../src/main/java/brooklyn/util/osgi/Osgis.java | 66 ++- .../brooklyn/camp/lite/CampYamlLiteTest.java | 51 ++- .../catalog/internal/CatalogDtoTest.java | 41 +- .../brooklyn/catalog/internal/CatalogItems.java | 87 ---- .../catalog/internal/CatalogLoadTest.java | 25 +- .../catalog/internal/CatalogScanTest.java | 13 +- .../entity/rebind/RebindCatalogItemTest.java | 11 +- ...talogWhenCatalogPersistenceDisabledTest.java | 2 +- .../entity/rebind/RebindTestFixture.java | 18 +- .../persister/XmlMementoSerializerTest.java | 35 +- .../management/osgi/OsgiStandaloneTest.java | 2 + .../osgi/OsgiVersionMoreEntityTest.java | 130 ++++-- .../camp/lite/test-app-service-blueprint.yaml | 2 +- .../brooklyn/catalog/internal/osgi-catalog.xml | 4 +- .../BrooklynComponentTemplateResolver.java | 3 +- .../BrooklynEntityDecorationResolver.java | 12 +- .../spi/creation/BrooklynEntityMatcher.java | 5 - .../lookup/AbstractTemplateBrooklynLookup.java | 8 +- .../camp/brooklyn/AbstractYamlTest.java | 19 +- .../camp/brooklyn/ReferencedYamlTest.java | 7 +- .../CatalogOsgiVersionMoreEntityTest.java | 26 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 277 +++++++++-- .../brooklyn/catalog/CatalogYamlPolicyTest.java | 40 +- ...more-entity-v1-with-policy-osgi-catalog.yaml | 2 +- .../catalog/more-entity-v2-osgi-catalog.yaml | 2 +- usage/camp/src/test/resources/yaml-ref-app.yaml | 2 +- .../src/test/resources/yaml-ref-catalog.yaml | 2 +- .../src/test/resources/yaml-ref-entity.yaml | 2 +- usage/jsgui/src/main/webapp/assets/css/base.css | 9 +- .../src/main/webapp/assets/js/model/entity.js | 15 + .../src/main/webapp/assets/js/view/catalog.js | 61 ++- .../assets/tpl/catalog/details-entity.html | 8 +- .../webapp/assets/tpl/catalog/nav-entry.html | 2 +- .../main/java/brooklyn/rest/api/CatalogApi.java | 80 +++- .../rest/domain/CatalogEntitySummary.java | 7 +- .../rest/domain/CatalogItemSummary.java | 48 +- .../rest/domain/CatalogPolicySummary.java | 7 +- .../rest/resources/ApplicationResource.java | 3 +- .../rest/resources/CatalogResource.java | 125 +++-- .../rest/transform/CatalogTransformer.java | 24 +- .../rest/util/BrooklynRestResourceUtils.java | 3 +- .../rest/resources/ApiDocResourceTest.java | 2 +- .../rest/resources/CatalogResourceTest.java | 85 ++-- .../main/java/brooklyn/util/io/FileUtil.java | 2 + 80 files changed, 2392 insertions(+), 1015 deletions(-) ----------------------------------------------------------------------