brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [21/50] brooklyn-server git commit: Merge branch 'master' into service-loader-updates
Date Wed, 30 Mar 2016 13:59:58 GMT
Merge branch 'master' into service-loader-updates


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

Branch: refs/heads/master
Commit: 630eb6485f89f5d68f5d10107bbc56af3c570cc0
Parents: a93c170 d059088
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Fri Mar 18 16:36:40 2016 +0000
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Fri Mar 18 16:36:40 2016 +0000

----------------------------------------------------------------------
 LICENSE                                         |   6 +
 .../apache/brooklyn/api/entity/EntitySpec.java  |  59 +++++--
 .../internal/AbstractBrooklynObjectSpec.java    |   5 +
 .../api/location/LocationDefinition.java        |   2 +-
 .../brooklyn/api/location/LocationRegistry.java |  75 +++++++--
 .../brooklyn/api/location/LocationResolver.java |  23 +--
 .../brooklyn/api/mgmt/LocationManager.java      |   5 +
 .../BrooklynComponentTemplateResolver.java      |  14 +-
 .../creation/BrooklynYamlLocationResolver.java  |  29 ++--
 .../spi/creation/CampInternalUtils.java         |  15 +-
 .../camp/brooklyn/ByonLocationsYamlTest.java    |   2 +-
 .../brooklyn/EmptySoftwareProcessYamlTest.java  |   1 -
 .../ExternalConfigBrooklynPropertiesTest.java   |   2 +-
 .../camp/brooklyn/LocationsYamlTest.java        |   4 +-
 .../brooklyn/ReloadBrooklynPropertiesTest.java  |   6 +-
 .../TestSensorAndEffectorInitializer.java       |   3 +-
 .../brooklyn/VanillaBashNetcatYamlTest.java     |  15 +-
 .../camp/brooklyn/WindowsYamlLiveTest.java      |   6 +-
 .../catalog/CatalogYamlLocationTest.java        |  64 ++++++++
 .../apache/brooklyn/core/config/ConfigKeys.java |   2 +-
 .../entity/lifecycle/ServiceStateLogic.java     |   6 +
 .../brooklyn/core/entity/trait/Startable.java   |   2 +-
 .../core/location/AbstractLocationResolver.java |  18 ++-
 .../core/location/BasicLocationRegistry.java    | 162 ++++++++++++-------
 .../core/location/CatalogLocationResolver.java  |  34 +++-
 .../location/DefinedLocationByIdResolver.java   |  11 +-
 .../core/location/LocationConfigUtils.java      |  13 +-
 .../brooklyn/core/location/Locations.java       |  23 ++-
 .../core/location/NamedLocationResolver.java    |  14 +-
 .../location/access/PortForwardManagerImpl.java |   1 -
 .../PortForwardManagerLocationResolver.java     |  73 ++++++---
 .../location/internal/LocationInternal.java     |   3 -
 .../core/mgmt/EntityManagementUtils.java        |   6 +-
 .../mgmt/internal/LocalLocationManager.java     |  11 +-
 .../mgmt/internal/LocationManagerInternal.java  |   8 +
 .../mgmt/persist/BrooklynPersistenceUtils.java  |  19 ++-
 .../core/objs/proxy/InternalEntityFactory.java  |  30 ++--
 .../core/objs/proxy/InternalFactory.java        |  30 +++-
 .../objs/proxy/InternalLocationFactory.java     |   2 +-
 .../core/objs/proxy/InternalPolicyFactory.java  |   8 +-
 .../proxy/SpecialBrooklynObjectConstructor.java |  80 +++++++++
 .../stock/AbstractMultipleSensorAggregator.java |  18 +--
 .../entity/group/DynamicClusterImpl.java        |  12 +-
 .../entity/group/DynamicRegionsFabricImpl.java  |   2 +-
 .../location/byon/HostLocationResolver.java     |   9 +-
 .../byon/SingleMachineLocationResolver.java     |  10 +-
 .../byon/SingleMachineProvisioningLocation.java |   2 +-
 .../localhost/LocalhostLocationResolver.java    |  13 +-
 .../brooklyn/location/multi/MultiLocation.java  |  42 +++--
 .../location/multi/MultiLocationResolver.java   |  86 +++++-----
 .../location/ssh/SshMachineLocation.java        |  13 +-
 .../ssh/SshCommandEffectorIntegrationTest.java  |   5 +-
 .../core/entity/EntityFunctionsTest.java        |   2 +-
 .../core/entity/EntityPredicatesTest.java       |   2 +-
 .../core/entity/EntitySuppliersTest.java        |   2 +-
 .../core/location/LocationManagementTest.java   |  41 ++++-
 .../core/location/LocationPredicatesTest.java   |   2 +-
 .../core/location/LocationRegistryTest.java     |  92 ++++++++---
 .../brooklyn/core/location/MachinesTest.java    |  64 +++++---
 .../access/BrooklynAccessUtilsTest.java         |   2 +-
 .../PortForwardManagerLocationResolverTest.java |   2 +-
 .../access/PortForwardManagerRebindTest.java    |   2 +-
 .../location/access/PortForwardManagerTest.java |   4 +-
 .../internal/LocalManagementContextTest.java    |   8 +-
 .../BrooklynMementoPersisterTestFixture.java    |   7 +-
 .../core/mgmt/rebind/RebindEntityTest.java      |   4 +-
 .../core/mgmt/rebind/RebindPolicyTest.java      |   2 +-
 .../core/sensor/http/HttpRequestSensorTest.java |  17 +-
 .../password/CreatePasswordSensorTest.java      |   3 +-
 .../ssh/SshCommandSensorIntegrationTest.java    |   9 +-
 .../core/test/entity/TestApplication.java       |  10 +-
 .../core/test/entity/TestApplicationImpl.java   |   2 +-
 .../location/byon/ByonLocationResolverTest.java |  17 +-
 .../location/byon/HostLocationResolverTest.java |   2 +-
 .../byon/SingleMachineLocationResolverTest.java |   2 +-
 .../SingleMachineProvisioningLocationTest.java  |   2 +-
 .../LocalhostLocationResolverTest.java          |  20 +--
 ...ocalhostMachineProvisioningLocationTest.java |   2 +-
 .../LocalhostProvisioningAndAccessTest.java     |   2 +-
 .../multi/MultiLocationResolverTest.java        |  11 +-
 .../ssh/SshMachineLocationIntegrationTest.java  |  28 ++--
 .../ssh/SshMachineLocationSshToolTest.java      |   4 +-
 .../util/core/text/TemplateProcessorTest.java   |   4 +-
 .../brooklyn/launcher/common/BasicLauncher.java |   2 +-
 .../BrooklynPropertiesFactoryHelperTest.java    |   4 +-
 .../JcloudsBlobStoreBasedObjectStore.java       |   2 +-
 .../jclouds/JcloudsByonLocationResolver.java    |  17 +-
 .../jclouds/JcloudsLocationResolver.java        |  24 +--
 .../mgmt/persist/jclouds/BlobStoreCleaner.java  |   2 +-
 .../persist/jclouds/BlobStoreExpiryTest.java    |   2 +-
 .../mgmt/persist/jclouds/BlobStoreTest.java     |   2 +-
 .../jclouds/JcloudsExpect100ContinueTest.java   |   2 +-
 .../jclouds/AbstractJcloudsStubbedLiveTest.java |   2 +-
 .../jclouds/JcloudsAddressesLiveTest.java       |   4 +-
 .../JcloudsByonLocationResolverAwsLiveTest.java |   4 +-
 ...dsByonLocationResolverSoftlayerLiveTest.java |   4 +-
 .../JcloudsByonLocationResolverTest.java        |   2 +-
 .../jclouds/JcloudsByonRebindLiveTest.java      |   4 +-
 .../jclouds/JcloudsLocationMetadataTest.java    |   4 +-
 .../JcloudsLocationRegisterMachineLiveTest.java |   6 +-
 ...cloudsLocationReleasePortForwardingTest.java |   4 +-
 .../jclouds/JcloudsLocationResolverTest.java    |   4 +-
 ...udsLocationSuspendResumeMachineLiveTest.java |   2 +-
 ...ationTemplateOptionsCustomisersLiveTest.java |   2 +-
 .../location/jclouds/JcloudsLoginLiveTest.java  |  26 +--
 .../location/jclouds/JcloudsRebindLiveTest.java |   2 +-
 .../location/jclouds/JcloudsRebindStubTest.java |   2 +-
 .../location/jclouds/JcloudsSshingLiveTest.java |   2 +-
 .../location/jclouds/JcloudsSuseLiveTest.java   |   4 +-
 .../jclouds/RebindJcloudsLocationLiveTest.java  |   2 +-
 .../jclouds/RebindJcloudsLocationTest.java      |   2 +-
 ...loudsLocationUserLoginAndConfigLiveTest.java |   2 +-
 ...hineProvisioningLocationJcloudsLiveTest.java |   2 +-
 .../provider/AbstractJcloudsLocationTest.java   |   8 +-
 .../provider/AwsEc2LocationWindowsLiveTest.java |   2 +-
 .../provider/CarrenzaLocationLiveTest.java      |   2 +-
 .../provider/RackspaceLocationLiveTest.java     |   2 +-
 .../zone/AwsAvailabilityZoneExtensionTest.java  |   2 +-
 .../jclouds/os/CreateUserPolicyLiveTest.java    |  13 +-
 .../brooklyn/rest/domain/LocationSummary.java   |  15 +-
 .../rest/domain/LocationSummaryTest.java        |   2 +-
 .../ApplicationResourceIntegrationTest.java     |   2 +-
 .../rest/client/BrooklynApiRestClientTest.java  |   2 +-
 .../rest/resources/ApplicationResource.java     |   5 +-
 .../rest/transform/LocationTransformer.java     | 118 +++++++-------
 .../rest/util/BrooklynRestResourceUtils.java    |   8 +-
 .../rest/resources/LocationResourceTest.java    |   4 +-
 .../SensorResourceIntegrationTest.java          |   2 +-
 .../rest/testing/BrooklynRestApiTest.java       |   2 +-
 .../rest/util/EntityLocationUtilsTest.java      |   2 +-
 .../rest/domain/LocationSummaryTest.java        |   2 +-
 .../ActivityApiEntitlementsTest.java            |   5 +-
 .../rest/resources/LocationResourceTest.java    |   4 +-
 .../SensorResourceIntegrationTest.java          |   2 +-
 .../rest/testing/BrooklynRestApiTest.java       |   2 +-
 .../rest/util/EntityLocationUtilsTest.java      |   2 +-
 .../ActivityApiEntitlementsTest.java            |   5 +-
 .../org/apache/brooklyn/cli/CloudExplorer.java  |   4 +-
 .../entity/machine/pool/ServerPoolImpl.java     |   9 +-
 .../pool/ServerPoolLocationResolver.java        |  20 ++-
 .../MachineLifecycleEffectorTasks.java          |   4 +-
 .../brooklyn/entity/AbstractEc2LiveTest.java    |   2 +-
 .../entity/AbstractGoogleComputeLiveTest.java   |   2 +-
 .../entity/AbstractSoftlayerLiveTest.java       |   2 +-
 .../brooklynnode/SelectMasterEffectorTest.java  |   3 +-
 .../entity/chef/ChefLiveTestSupport.java        |  19 +--
 .../entity/machine/MachineEntityRebindTest.java |   2 +-
 .../machine/SetHostnameCustomizerLiveTest.java  |   2 +-
 .../entity/machine/pool/ServerPoolLiveTest.java |   2 +-
 .../pool/ServerPoolLocationResolverTest.java    |   2 +-
 .../software/base/AbstractDockerLiveTest.java   |   2 +-
 ...twareProcessOpenIptablesStreamsLiveTest.java |   2 +-
 .../base/SoftwareProcessSubclassTest.java       |   2 +-
 ...ftwareProcessAndChildrenIntegrationTest.java |   2 +-
 .../VanillaSoftwareProcessIntegrationTest.java  |   2 +-
 ...laSoftwareProcessStreamsIntegrationTest.java |   2 +-
 .../AutoScalerPolicyNoMoreMachinesTest.java     |   2 +-
 .../base/test/location/WindowsTestFixture.java  |   4 +-
 .../PortAttributeSensorAndConfigKeyTest.java    |   4 +-
 .../SystemServiceEnricherTest.java              |   2 +-
 .../location/winrm/WinRmMachineLocation.java    |   2 +-
 .../WindowsPerformanceCounterFeedLiveTest.java  |   2 +-
 .../winrm/ByonLocationResolverTest.java         |  18 +--
 .../SimpleShellCommandIntegrationTest.java      |  74 ++++-----
 .../brooklyn/util/collections/MutableMap.java   |   2 +-
 .../src/main/license/DISCLAIMER.shaded          |   8 -
 166 files changed, 1295 insertions(+), 739 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/630eb648/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
diff --cc camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index 3e0acf2,dd03f46..d19177b
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@@ -25,8 -31,7 +31,8 @@@ import javax.annotation.Nullable
  
  import org.apache.brooklyn.api.entity.Entity;
  import org.apache.brooklyn.api.entity.EntitySpec;
+ import org.apache.brooklyn.api.location.LocationSpec;
 +import org.apache.brooklyn.api.framework.FrameworkLookup;
- import org.apache.brooklyn.api.location.Location;
  import org.apache.brooklyn.api.mgmt.ManagementContext;
  import org.apache.brooklyn.api.mgmt.classloading.BrooklynClassLoadingContext;
  import org.apache.brooklyn.api.typereg.RegisteredType;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/630eb648/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
----------------------------------------------------------------------


Mime
View raw message