This closes #484 Small JcloudsLocation refactor
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/77070947 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/77070947 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/77070947 Branch: refs/heads/master Commit: 77070947595090183dfcc40bc9cc9e7254f4b4d3 Parents: 58b1de7 f89ba45 Author: Sam Corbett <sam.corb...@cloudsoftcorp.com> Authored: Tue Dec 20 16:11:16 2016 +0000 Committer: Sam Corbett <sam.corb...@cloudsoftcorp.com> Committed: Tue Dec 20 16:11:16 2016 +0000 ---------------------------------------------------------------------- .../brooklyn/core/config/BasicConfigKey.java | 2 +- .../apache/brooklyn/core/entity/Attributes.java | 18 +- .../location/cloud/CloudLocationConfig.java | 2 +- .../core/sensor/DependentConfiguration.java | 2 +- .../location/ssh/SshMachineLocation.java | 11 - .../jclouds/BasicJcloudsLocationCustomizer.java | 5 +- .../location/jclouds/CreateUserStatements.java | 303 +++++ .../location/jclouds/JcloudsLocation.java | 1129 +++++------------- .../location/jclouds/JcloudsLocationConfig.java | 16 +- .../jclouds/JcloudsSshMachineLocation.java | 7 +- .../jclouds/RebindToMachinePredicate.java | 85 ++ .../customize/AutoAssignFloatingIpOption.java | 41 + .../customize/AutoCreateFloatingIpsOption.java | 41 + .../customize/AutoGenerateKeypairsOption.java | 41 + .../templates/customize/DomainNameOption.java | 39 + .../ExtraPublicKeyDataToAuthOption.java | 52 + .../templates/customize/InboundPortsOption.java | 49 + .../templates/customize/KeyPairOption.java | 44 + .../templates/customize/LoginUserOption.java | 31 + .../customize/LoginUserPasswordOption.java | 31 + .../LoginUserPrivateKeyDataOption.java | 31 + .../LoginUserPrivateKeyFileOption.java | 51 + .../templates/customize/NetworkNameOption.java | 65 + .../templates/customize/RunAsRootOption.java | 29 + .../customize/SecurityGroupOption.java | 63 + .../templates/customize/StringTagsOption.java | 40 + .../customize/TemplateBuilderCustomizer.java | 29 + .../customize/TemplateBuilderCustomizers.java | 164 +++ .../customize/TemplateOptionCustomizer.java | 29 + .../customize/TemplateOptionCustomizers.java | 103 ++ .../customize/TemplateOptionsOption.java | 55 + .../customize/UserDataUuencodedOption.java | 53 + .../customize/UserMetadataMapOption.java | 52 + .../customize/UserMetadataStringOption.java | 80 ++ ...ationTemplateOptionsCustomisersLiveTest.java | 3 +- .../location/jclouds/JcloudsLocationTest.java | 6 +- .../MachineLifecycleEffectorTasks.java | 7 +- .../org/apache/brooklyn/util/text/Strings.java | 30 +- .../org/apache/brooklyn/util/time/Duration.java | 13 +- 39 files changed, 1952 insertions(+), 900 deletions(-) ----------------------------------------------------------------------
