You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/08/25 08:37:54 UTC

[10/10] git commit: This closes #113

This closes #113


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0be9f25a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0be9f25a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0be9f25a

Branch: refs/heads/master
Commit: 0be9f25a5445f03798df3996eef3e8f5232eac1b
Parents: 63e9f1e 35dad30
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Aug 25 07:36:50 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Aug 25 07:36:50 2014 +0100

----------------------------------------------------------------------
 .../catalog/internal/CatalogLibrariesDo.java    |  26 +--
 .../brooklyn/config/BrooklynProperties.java     |  47 ++++-
 .../entity/group/DynamicClusterImpl.java        |   8 +-
 .../ha/HighAvailabilityManagerImpl.java         |  26 ++-
 .../internal/LocalManagementContext.java        |   1 +
 .../src/main/java/brooklyn/util/osgi/Osgis.java |  41 +++--
 .../brooklyn/camp/lite/CampYamlLiteTest.java    |   4 +-
 .../entity/basic/AbstractEntityLegacyTest.java  |   8 +-
 .../entity/basic/DynamicEntityTest.java         |   3 +-
 .../brooklyn/entity/basic/DynamicGroupTest.java |   4 +-
 .../persister/XmlMementoSerializerTest.java     |  11 +-
 .../basic/ByonLocationResolverTest.java         |   3 +-
 .../location/basic/MachineDetailsTest.java      |   5 +-
 .../SshMachineLocationIntegrationTest.java      |   3 +-
 .../location/cloud/CloudMachineNamerTest.java   |  13 +-
 .../location/cloud/CustomMachineNamerTest.java  |   3 +-
 .../HighAvailabilityManagerSplitBrainTest.java  |  49 ++++--
 .../internal/EntityExecutionManagerTest.java    |  15 +-
 .../internal/LocalManagementContextTest.java    |  15 +-
 .../entity/LocalManagementContextForTests.java  |  93 +++++++++-
 .../location/jclouds/BrooklynImageChooser.java  |  44 +++--
 .../location/jclouds/JcloudsLocation.java       |  11 +-
 .../jclouds/AbstractJcloudsLiveTest.java        | 153 ++++++++++++++++
 .../location/jclouds/AbstractJcloudsTest.java   | 151 ----------------
 .../JcloudsByonLocationResolverLiveTest.java    | 175 +++++++++++++++++++
 .../JcloudsByonLocationResolverTest.java        | 166 ++----------------
 .../jclouds/JcloudsLocationMetadataTest.java    |   3 +-
 .../JcloudsLocationRebindMachineLiveTest.java   |   5 +-
 .../jclouds/JcloudsLocationResolverTest.java    |   3 +-
 .../location/jclouds/JcloudsLocationTest.java   |  14 +-
 .../location/jclouds/JcloudsLoginLiveTest.java  |   2 +-
 .../location/jclouds/JcloudsMinRamLiveTest.java |   2 +-
 .../location/jclouds/LiveTestEntity.java        |  15 +-
 .../jclouds/RebindJcloudsLocationLiveTest.java  |  36 ++--
 ...loudsLocationUserLoginAndConfigLiveTest.java |   3 +-
 ...hineProvisioningLocationJcloudsLiveTest.java |   2 +-
 .../jclouds/StandaloneJcloudsLiveTest.java      |   4 +-
 .../JcloudsPortForwardingLiveTest.java          |   4 +-
 .../pool/JcloudsMachinePoolLiveTest.java        |   4 +-
 .../zone/AwsAvailabilityZoneExtensionTest.java  |   8 +-
 .../entity/brooklyn/BrooklynMetricsTest.java    |   4 +-
 .../entity/basic/SameServerEntityTest.java      |   2 +-
 ...ftwareProcessAndChildrenIntegrationTest.java |   2 +-
 .../entity/software/SoftwareEffectorTest.java   |   3 +-
 .../entity/software/SshEffectorTasksTest.java   |   2 +-
 .../software/ssh/SshCommandIntegrationTest.java |   3 +-
 .../brooklyn/event/feed/jmx/JmxFeedTest.java    |   2 +-
 .../camp/brooklyn/AbstractYamlTest.java         |   8 +-
 .../java-web-app-and-db-with-function-2.yaml    |   2 +-
 .../brooklyn/rest/BrooklynRestApiLauncher.java  |  38 ++--
 .../util/exceptions/ReferenceWithError.java     |  22 ++-
 .../java/brooklyn/util/repeat/Repeater.java     |   2 +-
 52 files changed, 753 insertions(+), 520 deletions(-)
----------------------------------------------------------------------