You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/18 08:29:09 UTC

[7/7] brooklyn-server git commit: This closes #859

This closes #859


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

Branch: refs/heads/master
Commit: 38de52240839a50195cde6812764e007d6084d8f
Parents: efa4af6 4f86cfd
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Wed Oct 18 09:28:42 2017 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Wed Oct 18 09:28:42 2017 +0100

----------------------------------------------------------------------
 .../brooklyn/api/catalog/BrooklynCatalog.java   |  23 --
 .../brooklyn/api/catalog/CatalogItem.java       |  11 -
 .../org/apache/brooklyn/api/entity/Entity.java  | 100 ------
 .../apache/brooklyn/api/entity/EntityLocal.java | 131 -------
 .../apache/brooklyn/api/entity/EntitySpec.java  |  48 ---
 .../apache/brooklyn/api/location/Location.java  |  17 -
 .../apache/brooklyn/api/objs/Configurable.java  |   9 +-
 .../org/apache/brooklyn/api/policy/Policy.java  |   8 -
 .../brooklyn/camp/spi/pdp/DeploymentPlan.java   |   4 -
 .../spi/dsl/methods/BrooklynDslCommon.java      |   6 +-
 .../brooklyn/camp/brooklyn/ObjectsYamlTest.java |   5 -
 .../apache/brooklyn/core/BrooklynVersion.java   |  25 --
 .../core/catalog/CatalogPredicates.java         |  11 -
 .../catalog/internal/BasicBrooklynCatalog.java  |  10 -
 .../core/catalog/internal/CatalogBundleDto.java |   3 -
 .../catalog/internal/CatalogItemBuilder.java    |   6 -
 .../core/catalog/internal/CatalogItemDo.java    |  33 --
 .../internal/CatalogItemDtoAbstract.java        |  17 -
 .../core/catalog/internal/CatalogUtils.java     |  36 +-
 .../brooklyn/core/config/ConfigPredicates.java  |  24 --
 .../core/config/render/RendererHints.java       |  21 --
 .../core/effector/AbstractEffector.java         |   4 -
 .../brooklyn/core/effector/EffectorTasks.java   |   4 -
 .../core/enricher/AbstractEnricher.java         |   1 -
 .../brooklyn/core/entity/AbstractEntity.java    | 340 -------------------
 .../core/entity/BrooklynConfigKeys.java         |   7 -
 .../apache/brooklyn/core/entity/Entities.java   |  32 --
 .../core/entity/EntityAndAttribute.java         |   8 -
 .../brooklyn/core/entity/EntityDynamicType.java |   8 -
 .../brooklyn/core/entity/EntityFunctions.java   |   2 +-
 .../brooklyn/core/entity/EntityInternal.java    |  27 --
 .../brooklyn/core/entity/EntityPredicates.java  |  11 -
 .../internal/EntityTransientCopyInternal.java   |  10 -
 .../core/feed/AttributePollHandler.java         |   2 +-
 .../apache/brooklyn/core/feed/FeedConfig.java   |   4 -
 .../core/internal/BrooklynInitialization.java   |   9 -
 .../core/internal/BrooklynPropertiesImpl.java   |   6 -
 .../core/location/AbstractLocation.java         |  62 +---
 .../core/location/LocationPredicates.java       |   2 +-
 .../apache/brooklyn/core/location/Machines.java |   9 -
 .../location/access/PortForwardManager.java     |  72 ----
 .../access/PortForwardManagerClient.java        | 106 +-----
 .../location/access/PortForwardManagerImpl.java |  96 +-----
 .../core/location/geo/UtraceHostGeoLookup.java  |  16 -
 .../location/internal/LocationInternal.java     |  17 -
 .../core/mgmt/EntityManagementUtils.java        |  27 --
 .../JavaBrooklynClassLoadingContext.java        |   5 -
 .../core/mgmt/entitlement/Entitlements.java     |   9 -
 .../mgmt/ha/HighAvailabilityManagerImpl.java    |  14 -
 .../core/mgmt/ha/OsgiArchiveInstaller.java      |   7 +-
 .../core/objs/AbstractEntityAdjunct.java        | 118 +------
 .../core/objs/BasicConfigurableObject.java      |   6 -
 .../core/objs/proxy/InternalEntityFactory.java  |  10 -
 .../objs/proxy/InternalLocationFactory.java     |  30 --
 .../core/objs/proxy/InternalPolicyFactory.java  |  42 ---
 .../brooklyn/core/sensor/AttributeMap.java      |   2 +-
 .../core/sensor/DependentConfiguration.java     |  13 -
 .../core/server/BrooklynServerConfig.java       |  39 ---
 .../core/server/BrooklynServiceAttributes.java  |  12 -
 .../core/typereg/BasicManagedBundle.java        |   5 -
 .../core/typereg/BasicOsgiBundleWithUrl.java    |   6 -
 .../brooklyn/core/typereg/RegisteredTypes.java  |   3 -
 .../enricher/stock/reducer/Reducer.java         |   2 +-
 .../group/AbstractMembershipTrackingPolicy.java |  28 +-
 .../brooklyn/entity/group/DynamicGroup.java     |   4 -
 .../brooklyn/entity/group/DynamicGroupImpl.java |   9 -
 .../apache/brooklyn/feed/CommandPollConfig.java |  12 -
 .../brooklyn/feed/function/FunctionFeed.java    |   4 +-
 .../org/apache/brooklyn/feed/http/HttpFeed.java |   3 +-
 .../brooklyn/feed/http/HttpPollValue.java       |  40 ---
 .../apache/brooklyn/feed/http/HttpPolls.java    |  39 ---
 .../apache/brooklyn/feed/shell/ShellFeed.java   |   2 +-
 .../brooklyn/feed/ssh/SshValueFunctions.java    |  18 +-
 .../LocalhostMachineProvisioningLocation.java   |   8 +-
 .../location/ssh/SshMachineLocation.java        |  15 +-
 .../util/core/BrooklynLanguageExtensions.java   |  46 ---
 .../brooklyn/util/core/ResourceUtils.java       |  89 +----
 .../brooklyn/util/core/config/ConfigBag.java    |   2 +-
 .../brooklyn/util/core/crypto/SecureKeys.java   |  23 +-
 .../brooklyn/util/core/file/ArchiveBuilder.java |  92 -----
 .../brooklyn/util/core/flags/FlagUtils.java     |  14 -
 .../brooklyn/util/core/http/HttpTool.java       |  28 --
 .../util/core/http/HttpToolResponse.java        |  31 --
 .../util/core/internal/ssh/SshTool.java         |   9 -
 .../util/core/internal/ssh/cli/SshCliTool.java  |   5 -
 .../core/internal/ssh/process/ProcessTool.java  |  25 --
 .../util/core/internal/ssh/sshj/SshjTool.java   |   6 -
 .../brooklyn/util/core/osgi/BundleMaker.java    |  40 +--
 .../apache/brooklyn/util/core/osgi/Osgis.java   |  55 ---
 .../brooklyn/util/core/task/TaskBuilder.java    |   8 -
 .../brooklyn/util/core/task/TaskPredicates.java |   6 -
 .../util/core/text/TemplateProcessor.java       |  10 -
 .../brooklyn/core/BrooklynVersionTest.java      |   7 -
 .../internal/CatalogItemBuilderTest.java        |  10 -
 .../core/config/BrooklynPropertiesTest.java     |   8 +-
 .../core/config/ConfigPredicatesTest.java       |  18 +-
 .../brooklyn/core/entity/AttributeTest.java     |  11 -
 .../brooklyn/core/entity/EntitiesTest.java      |   6 -
 .../core/entity/EntityConfigGroovyTest.groovy   |   2 +-
 .../brooklyn/core/entity/EntitySpecTest.java    |  21 --
 .../brooklyn/core/entity/EntityTypeTest.java    |   2 +-
 .../core/entity/PolicyRegistrationTest.java     |   7 -
 .../core/location/LocationConfigTest.java       |  16 -
 .../brooklyn/core/location/MachinesTest.java    |   9 -
 .../access/PortForwardManagerRebindTest.java    |  26 --
 .../location/access/PortForwardManagerTest.java |  27 +-
 ...agementPlaneSyncRecordPersisterInMemory.java |  99 ------
 .../core/mgmt/rebind/RebindEnricherTest.java    |   5 +-
 .../core/mgmt/rebind/RebindFeedWithHaTest.java  |   2 +-
 .../core/mgmt/rebind/RebindTestFixture.java     |  46 ---
 .../core/mgmt/rebind/RebindTestUtils.java       | 125 -------
 .../core/test/entity/TestApplicationImpl.java   |  13 +-
 .../qa/performance/AbstractPerformanceTest.java |  93 -----
 .../apache/brooklyn/feed/http/HttpFeedTest.java |  12 +-
 .../util/core/internal/FlagUtilsTest.java       |   5 -
 .../core/internal/ssh/RecordingSshTool.java     |   3 -
 .../BrooklynEntityMirrorIntegrationTest.java    |   4 +-
 .../jclouds/BlobStoreContextFactoryImpl.java    |   4 +-
 .../location/jclouds/BrooklynImageChooser.java  |  15 +-
 .../location/jclouds/JcloudsLocation.java       |   2 -
 .../jclouds/JcloudsMachineLocation.java         |   9 -
 .../location/jclouds/JcloudsPredicates.java     |   7 +-
 .../jclouds/JcloudsSshMachineLocation.java      |  78 -----
 .../jclouds/JcloudsWinRmMachineLocation.java    |  17 -
 .../api/JcloudsLocationConfigPublic.java        |  15 -
 .../customize/AutoCreateFloatingIpsOption.java  |  42 ---
 .../customize/TemplateOptionCustomizers.java    |   8 -
 .../customize/UserDataUuencodedOption.java      |  54 ---
 .../jclouds/JcloudsByonRebindLiveTest.java      |   2 -
 .../JcloudsImageChoiceStubbedLiveTest.java      |   2 -
 .../jclouds/JcloudsLocationResolverTest.java    |   2 +-
 .../location/jclouds/JcloudsRebindLiveTest.java |   3 -
 .../location/jclouds/JcloudsRebindStubTest.java |   1 -
 .../jclouds/JcloudsRebindStubUnitTest.java      |   1 -
 .../policy/enricher/HttpLatencyDetector.java    |   6 +-
 .../enricher/RollingTimeWindowMeanEnricher.java |  10 -
 .../RollingTimeWindowMeanEnricherTest.java      |  24 +-
 .../loadbalancing/MockContainerEntityImpl.java  |   8 -
 .../loadbalancing/MockItemEntityImpl.java       |   7 -
 .../apache/brooklyn/rest/domain/ApiError.java   |  12 -
 .../brooklyn/rest/domain/TaskSummary.java       |  14 -
 .../rest/filter/HaHotCheckResourceFilter.java   |   6 -
 .../resources/AbstractBrooklynRestResource.java |   5 -
 .../rest/resources/LocationResource.java        |   6 -
 .../rest/transform/LocationTransformer.java     |  12 -
 .../brooklyn/rest/util/ShutdownHandler.java     |  26 --
 .../brooklyn/rest/util/URLParamEncoder.java     |  28 --
 .../brooklyn/rest/util/WebResourceUtils.java    |   7 -
 .../util/json/BrooklynJacksonJsonProvider.java  |  23 --
 .../BrooklynPropertiesSecurityFilter.java       |  11 +-
 .../BrooklynRestApiLauncherTestFixture.java     |   6 -
 .../entity/brooklynnode/BrooklynNodeImpl.java   |   2 +-
 .../brooklyn/entity/java/JavaAppUtils.java      |   6 -
 .../java/JavaSoftwareProcessSshDriver.java      |   8 -
 .../software/base/SameServerEntityImpl.java     |   6 -
 .../org/apache/brooklyn/feed/jmx/JmxFeed.java   |  20 +-
 .../feed/jmx/JmxNotificationFilters.java        |  10 +-
 .../entity/java/VanillaJavaAppRebindTest.java   |   2 +-
 ...twareProcessOpenIptablesStreamsLiveTest.java |   2 +-
 .../test/osgi/entities/more/MoreEntityImpl.java |   2 +-
 .../test/osgi/entities/more/MoreEntityImpl.java |   4 +-
 .../java/org/apache/brooklyn/test/Asserts.java  |  24 +-
 .../brooklyn/util/collections/MutableList.java  |   4 -
 .../brooklyn/util/collections/MutableMap.java   |   4 -
 .../brooklyn/util/collections/MutableSet.java   |   5 -
 .../util/collections/TimeWindowedList.java      |  10 -
 .../brooklyn/util/exceptions/Exceptions.java    |   7 -
 .../util/javalang/AggregateClassLoader.java     |   7 -
 .../apache/brooklyn/util/javalang/Enums.java    |   5 +-
 .../util/javalang/StackTraceSimplifier.java     |  15 -
 .../brooklyn/util/math/MathFunctions.java       |   8 -
 .../java/org/apache/brooklyn/util/os/Os.java    |   6 -
 .../apache/brooklyn/util/repeat/Repeater.java   |  12 -
 .../brooklyn/util/ssh/IptablesCommands.java     |  34 +-
 .../util/stream/InputStreamSupplier.java        |   4 +-
 .../apache/brooklyn/util/stream/Streams.java    |   5 -
 .../org/apache/brooklyn/util/text/Strings.java  |   7 -
 .../brooklyn/util/time/CountdownTimer.java      |   3 -
 .../org/apache/brooklyn/util/time/Duration.java |  11 -
 .../org/apache/brooklyn/util/time/Time.java     |  38 +--
 .../brooklyn-test-osgi-more-entities_0.2.0.jar  | Bin 16893 -> 16958 bytes
 ...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14077 -> 14146 bytes
 182 files changed, 181 insertions(+), 3564 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/38de5224/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/38de5224/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/38de5224/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
----------------------------------------------------------------------