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 850D418B39 for ; Thu, 11 Feb 2016 11:58:16 +0000 (UTC) Received: (qmail 67099 invoked by uid 500); 11 Feb 2016 11:58:16 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 67066 invoked by uid 500); 11 Feb 2016 11:58:16 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 67018 invoked by uid 99); 11 Feb 2016 11:58:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Feb 2016 11:58:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 14598E0248; Thu, 11 Feb 2016 11:58:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sjcorbett@apache.org To: commits@brooklyn.apache.org Date: Thu, 11 Feb 2016 11:58:16 -0000 Message-Id: <5f0edb2a80c647f48e324c0bb708b1ce@git.apache.org> In-Reply-To: <31d89829ef574f8a93ab92df9ad33dfc@git.apache.org> References: <31d89829ef574f8a93ab92df9ad33dfc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] brooklyn-server git commit: Merge commit '6693cd0cd7a1f26dd97a52095674ed3a0ff97f74' into fix/port-inference Merge commit '6693cd0cd7a1f26dd97a52095674ed3a0ff97f74' into fix/port-inference Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0a416f32 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0a416f32 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0a416f32 Branch: refs/heads/master Commit: 0a416f32d11dca97cd8b881ddb8c0dfd51adbf4e Parents: e98b158 6693cd0 Author: Robert Moss Authored: Wed Feb 10 18:02:19 2016 +0000 Committer: Robert Moss Committed: Wed Feb 10 18:02:19 2016 +0000 ---------------------------------------------------------------------- LICENSE | 9 +- NOTICE | 2 +- .../EmptySoftwareProcessWithPassword.yaml | 2 +- .../test/resources/example-with-function.yaml | 2 +- .../test/resources/test-app-with-enricher.yaml | 2 +- .../test/resources/test-app-with-policy.yaml | 2 +- .../test-cluster-with-member-spec.yaml | 2 +- .../resources/test-entity-basic-template.yaml | 2 +- .../test-entity-reference-map-template.yaml | 2 +- .../resources/test-entity-with-enricher.yaml | 2 +- .../resources/test-entity-with-init-config.yaml | 2 +- .../test/resources/test-entity-with-policy.yaml | 2 +- ...-java-web-app-spec-and-db-with-function.yaml | 2 +- .../resources/test-propagating-enricher.yaml | 2 +- .../resources/test-referencing-enrichers.yaml | 2 +- .../resources/test-referencing-entities.yaml | 2 +- .../resources/test-referencing-policies.yaml | 2 +- .../src/test/resources/test-tomcat-https.yaml | 2 +- camp/camp-server/pom.xml | 5 - core/pom.xml | 8 - .../apache/brooklyn/core/BrooklynVersion.java | 5 +- .../catalog/internal/BasicBrooklynCatalog.java | 2 +- ...ocationPropertiesFromBrooklynProperties.java | 10 ++ .../apache/brooklyn/core/mgmt/BrooklynTags.java | 7 +- .../brooklyn/core/mgmt/BrooklynTaskTags.java | 2 +- .../core/mgmt/entitlement/Entitlements.java | 42 ++++- .../ha/dto/BasicManagementNodeSyncRecord.java | 5 +- .../rebind/dto/BasicCatalogItemMemento.java | 2 +- .../mgmt/rebind/dto/BasicEntityMemento.java | 5 +- .../mgmt/rebind/dto/MutableBrooklynMemento.java | 5 +- .../entity/group/AbstractGroupImpl.java | 22 ++- .../util/core/crypto/FluentKeySigner.java | 2 +- .../apache/brooklyn/util/core/osgi/Osgis.java | 4 - .../mgmt/entitlement/EntityEntitlementTest.java | 4 + karaf/features/src/main/feature/feature.xml | 88 +++++++++-- karaf/pom.xml | 1 - .../brooklyn/launcher/BrooklynLauncher.java | 17 +- .../brooklyn/launcher/BrooklynWebServer.java | 90 +++++------ .../launcher/WebAppContextProvider.java | 115 ++++++++++++++ .../jsgui/BrooklynJavascriptGuiLauncher.java | 15 +- launcher/src/test/resources/mongo-scripts.yaml | 2 +- ...JcloudsPropertiesFromBrooklynProperties.java | 34 +++- .../jclouds/JcloudsLocationResolverTest.java | 42 ++++- parent/pom.xml | 27 +--- pom.xml | 9 +- rest/rest-api/pom.xml | 15 +- .../apache/brooklyn/rest/api/ActivityApi.java | 1 - .../brooklyn/rest/api/ApplicationApi.java | 14 +- .../brooklyn/rest/domain/AccessSummary.java | 19 +-- .../apache/brooklyn/rest/domain/ApiError.java | 83 +++++----- .../brooklyn/rest/domain/ApplicationSpec.java | 63 +++----- .../rest/domain/ApplicationSummary.java | 29 ++-- .../rest/domain/BrooklynFeatureSummary.java | 37 ++++- .../rest/domain/CatalogEntitySummary.java | 50 ++++-- .../rest/domain/CatalogItemSummary.java | 69 ++++++--- .../rest/domain/CatalogLocationSummary.java | 27 +++- .../rest/domain/CatalogPolicySummary.java | 32 ++-- .../brooklyn/rest/domain/ConfigSummary.java | 50 +++--- .../brooklyn/rest/domain/EffectorSummary.java | 60 +++----- .../rest/domain/EntityConfigSummary.java | 31 ++-- .../brooklyn/rest/domain/EntityDetail.java | 80 ++++++++++ .../apache/brooklyn/rest/domain/EntitySpec.java | 38 ++--- .../brooklyn/rest/domain/EntitySummary.java | 38 +++-- .../rest/domain/HighAvailabilitySummary.java | 51 ++++-- .../brooklyn/rest/domain/LinkWithMetadata.java | 55 +++---- .../rest/domain/LocationConfigSummary.java | 32 ++-- .../brooklyn/rest/domain/LocationSpec.java | 35 ++--- .../brooklyn/rest/domain/LocationSummary.java | 34 ++-- .../rest/domain/PolicyConfigSummary.java | 34 ++-- .../brooklyn/rest/domain/PolicySummary.java | 43 +++--- .../rest/domain/ScriptExecutionSummary.java | 48 ++++-- .../brooklyn/rest/domain/SensorSummary.java | 49 +++--- .../brooklyn/rest/domain/TaskSummary.java | 123 ++++++++++----- .../brooklyn/rest/domain/UsageStatistic.java | 38 ++--- .../brooklyn/rest/domain/UsageStatistics.java | 26 ++-- .../brooklyn/rest/domain/VersionSummary.java | 30 +++- rest/rest-api/src/main/webapp/WEB-INF/web.xml | 4 +- .../rest/domain/AbstractDomainTest.java | 44 ++++++ .../brooklyn/rest/domain/ApiErrorTest.java | 18 ++- .../rest/domain/ApplicationSpecTest.java | 37 ++--- .../rest/domain/EffectorSummaryTest.java | 37 ++--- .../brooklyn/rest/domain/EntitySpecTest.java | 20 ++- .../brooklyn/rest/domain/EntitySummaryTest.java | 35 ++--- .../rest/domain/LocationSummaryTest.java | 41 +++++ .../rest/domain/VersionSummaryTest.java | 51 +++--- .../brooklyn/rest/util/RestApiTestUtils.java | 5 +- rest/rest-client/pom.xml | 7 +- .../brooklyn/rest/client/BrooklynApiUtil.java | 154 +++++++++++++++++++ .../rest/client/BrooklynApiUtilTest.java | 129 ++++++++++++++++ .../rest-client/src/test/webapp/WEB-INF/web.xml | 2 +- rest/rest-server/pom.xml | 41 ++--- .../resources/AbstractBrooklynRestResource.java | 3 +- .../rest/resources/ActivityResource.java | 42 ++++- .../rest/resources/ApplicationResource.java | 139 ++++++----------- .../rest/resources/CatalogResource.java | 32 ++-- .../rest/resources/EffectorResource.java | 2 +- .../rest/resources/EntityConfigResource.java | 77 +++++++--- .../brooklyn/rest/resources/EntityResource.java | 4 +- .../rest/resources/PolicyConfigResource.java | 2 +- .../brooklyn/rest/resources/SensorResource.java | 59 +++++-- .../brooklyn/rest/resources/ServerResource.java | 16 +- .../rest/util/BrooklynRestResourceUtils.java | 6 +- .../brooklyn/rest/util/WebResourceUtils.java | 2 +- .../rest/util/json/BidiSerialization.java | 41 +++-- .../util/json/BrooklynJacksonJsonProvider.java | 31 ++-- .../json/ConfigurableSerializerProvider.java | 52 +++---- .../ErrorAndToStringUnknownTypeSerializer.java | 41 +++-- .../rest/util/json/MultimapSerializer.java | 62 -------- ...StrictPreferringFieldsVisibilityChecker.java | 19 +-- .../rest-server/src/main/webapp/WEB-INF/web.xml | 2 +- .../brooklyn/rest/BrooklynRestApiLauncher.java | 11 +- .../brooklyn/rest/domain/ApplicationTest.java | 17 +- .../rest/domain/LocationSummaryTest.java | 55 ------- .../AbstractRestApiEntitlementsTest.java | 111 +++++++++++++ .../ActivityApiEntitlementsTest.java | 123 +++++++++++++++ .../AuthenticateAnyoneSecurityProvider.java | 41 +++++ .../EntityConfigApiEntitlementsTest.java | 103 +++++++++++++ .../entitlement/SensorApiEntitlementsTest.java | 108 +++++++++++++ .../entitlement/ServerApiEntitlementsTest.java | 34 ++++ .../StaticDelegatingEntitlementManager.java | 37 +++++ .../rest/resources/DescendantsTest.java | 4 +- .../rest/resources/EntityResourceTest.java | 4 +- .../rest/testing/BrooklynRestApiTest.java | 2 +- .../rest/testing/BrooklynRestResourceTest.java | 2 +- .../json/BrooklynJacksonSerializerTest.java | 6 +- .../org/apache/brooklyn/cli/AbstractMain.java | 6 +- server-cli/src/main/license/files/NOTICE | 2 +- server-cli/src/test/license/files/NOTICE | 2 +- .../AbstractSoftwareProcessStreamsTest.java | 10 +- utils/common/pom.xml | 34 +++- .../java/org/apache/brooklyn/util/os/Os.java | 10 +- .../brooklyn/util/osgi/OsgiActivator.java | 33 ++++ .../org/apache/brooklyn/util/osgi/OsgiUtil.java | 44 ++++++ .../src/main/license/NOTICE.shaded | 2 +- 134 files changed, 2733 insertions(+), 1272 deletions(-) ----------------------------------------------------------------------