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:28 UTC
[08/17] brooklyn-server git commit: Merge branch 'master' into
bundle-uninstall-and-snapshot
Merge branch 'master' into bundle-uninstall-and-snapshot
conflicts - imports (resolved), and osgi test jars (rebuilt)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f562ce72
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f562ce72
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f562ce72
Branch: refs/heads/master
Commit: f562ce72e2697155dc3cf6897b9bdb90d0768f3f
Parents: 71ede73 15447e1
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu May 11 13:25:46 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu May 11 13:25:46 2017 +0100
----------------------------------------------------------------------
.../brooklyn/api/catalog/CatalogItem.java | 5 +
.../spi/creation/CampInternalUtils.java | 52 +++++
.../brooklyn/spi/creation/CampResolver.java | 3 +
.../spi/creation/CampTypePlanTransformer.java | 1 +
.../core/catalog/CatalogPredicates.java | 4 +
.../catalog/internal/BasicBrooklynCatalog.java | 5 +
.../catalog/internal/CatalogClasspathDo.java | 8 +
.../internal/CatalogEnricherItemDto.java | 43 ++++
.../catalog/internal/CatalogItemBuilder.java | 7 +
.../internal/JavaCatalogToSpecTransformer.java | 6 +
.../brooklyn/core/entity/AbstractEntity.java | 65 +++---
.../core/network/OnPublicNetworkEnricher.java | 2 +
.../core/network/OnSubnetNetworkEnricher.java | 2 +
.../brooklyn/core/sensor/AttributeMap.java | 10 +
.../core/typereg/RegisteredTypePredicates.java | 2 +
.../brooklyn/enricher/stock/Aggregator.java | 3 +-
.../brooklyn/enricher/stock/Combiner.java | 3 +-
.../apache/brooklyn/enricher/stock/Joiner.java | 3 +-
.../brooklyn/enricher/stock/MapAggregator.java | 2 +
.../enricher/stock/PercentageEnricher.java | 2 +
.../brooklyn/enricher/stock/Propagator.java | 3 +-
.../brooklyn/enricher/stock/Transformer.java | 7 +-
.../brooklyn/enricher/stock/UpdatingMap.java | 2 +
.../YamlRollingTimeWindowMeanEnricher.java | 3 +
.../stock/YamlTimeWeightedDeltaEnricher.java | 2 +
.../enricher/stock/reducer/Reducer.java | 4 +-
.../entity/group/AbstractGroupImpl.java | 212 ++++++++++---------
.../brooklyn/entity/group/DynamicCluster.java | 2 +-
core/src/main/resources/catalog.bom | 60 +++++-
.../internal/CatalogItemBuilderTest.java | 7 +
.../typereg/RegisteredTypePredicatesTest.java | 3 +
.../init/src/main/resources/catalog-classes.bom | 84 ++++++++
.../brooklyn/policy/enricher/DeltaEnricher.java | 5 +-
.../policy/enricher/HttpLatencyDetector.java | 3 +-
.../policy/enricher/RollingMeanEnricher.java | 5 +-
.../enricher/RollingTimeWindowMeanEnricher.java | 5 +-
.../enricher/TimeFractionDeltaEnricher.java | 5 +-
.../enricher/TimeWeightedDeltaEnricher.java | 7 +-
.../policy/ha/ServiceFailureDetector.java | 3 +-
policy/src/main/resources/catalog.bom | 30 +++
.../apache/brooklyn/rest/api/CatalogApi.java | 40 ++++
.../rest/domain/CatalogEnricherSummary.java | 80 +++++++
.../rest/domain/EnricherConfigSummary.java | 79 +++++++
.../rest/resources/CatalogResource.java | 55 ++++-
.../rest/transform/CatalogTransformer.java | 27 ++-
.../rest/transform/EntityTransformer.java | 10 +
.../CatalogResourcePerformanceTest.java | 15 +-
.../rest/resources/CatalogResourceTest.java | 99 +++++++++
.../entity/AbstractMultiDistroLiveTest.java | 8 +-
.../entity/AbstractOpenstackLiveTest.java | 33 +--
.../test/osgi/entities/SimpleEnricher.java | 42 ++++
.../brooklyn/util/osgi/OsgiTestResources.java | 1 +
.../brooklyn-test-osgi-com-example-entities.jar | Bin 22138 -> 22139 bytes
.../osgi/brooklyn-test-osgi-entities.jar | Bin 22072 -> 22902 bytes
.../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 16003 -> 16003 bytes
.../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 16924 -> 16922 bytes
...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14099 -> 14098 bytes
57 files changed, 998 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f562ce72/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f562ce72/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f562ce72/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --cc rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
index 76ebb63,7a7f7f7..730482a
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
@@@ -26,8 -29,11 +26,9 @@@ import java.util.Iterator
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
import javax.annotation.Nullable;
+ import javax.ws.rs.DefaultValue;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
@@@ -39,21 -45,22 +40,24 @@@ import org.apache.brooklyn.api.entity.E
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.LocationSpec;
+import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
+ import org.apache.brooklyn.api.sensor.Enricher;
+ import org.apache.brooklyn.api.sensor.EnricherSpec;
+import org.apache.brooklyn.api.typereg.ManagedBundle;
import org.apache.brooklyn.api.typereg.RegisteredType;
import org.apache.brooklyn.core.catalog.CatalogPredicates;
-import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog;
import org.apache.brooklyn.core.catalog.internal.CatalogItemComparator;
import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.mgmt.entitlement.Entitlements;
import org.apache.brooklyn.core.mgmt.entitlement.Entitlements.StringAndArgument;
+import org.apache.brooklyn.core.mgmt.ha.OsgiBundleInstallationResult;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
-import org.apache.brooklyn.core.typereg.BasicManagedBundle;
import org.apache.brooklyn.core.typereg.RegisteredTypePredicates;
import org.apache.brooklyn.rest.api.CatalogApi;
+import org.apache.brooklyn.rest.domain.ApiError;
+ import org.apache.brooklyn.rest.domain.CatalogEnricherSummary;
import org.apache.brooklyn.rest.domain.CatalogEntitySummary;
import org.apache.brooklyn.rest.domain.CatalogItemSummary;
import org.apache.brooklyn.rest.domain.CatalogLocationSummary;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f562ce72/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f562ce72/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar
----------------------------------------------------------------------
diff --cc utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-com-example-entities.jar
index 7180c4d,86dfd8b..51cf119
Binary files differ
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f562ce72/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar
----------------------------------------------------------------------
diff --cc utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-entities.jar
index 681071c,4f00f80..6d0cf2d
Binary files differ
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f562ce72/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar
----------------------------------------------------------------------
diff --cc utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar
index d0504f0,9994cfb..84fc378
Binary files differ
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f562ce72/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
----------------------------------------------------------------------
diff --cc utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
index 872b412,3d1ce7b..24113f6
Binary files differ
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f562ce72/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar
----------------------------------------------------------------------
diff --cc utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar
index c777bfb,f00a115..21a114a
Binary files differ