brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [16/28] brooklyn-server git commit: Merge branch 'master' into inherit-config-default-values
Date Wed, 15 Feb 2017 18:31:09 GMT
Merge branch 'master' into inherit-config-default-values

Fix conflict in imports in BrooklynDslCommon


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

Branch: refs/heads/master
Commit: a777b36e16688ccf9ef53ad6c1d392c8ef0f85bc
Parents: e464d2a b629f1b
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Fri Dec 23 16:40:45 2016 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Fri Dec 23 16:40:45 2016 +0000

----------------------------------------------------------------------
 .../spi/dsl/BrooklynDslDeferredSupplier.java    |    1 -
 .../spi/dsl/BrooklynDslInterpreter.java         |   36 +-
 .../camp/brooklyn/spi/dsl/DslAccessible.java    |   28 +
 .../spi/dsl/DslDeferredFunctionCall.java        |  215 ++++
 .../brooklyn/spi/dsl/DslFunctionSource.java     |   26 +
 .../spi/dsl/methods/BrooklynDslCommon.java      |  161 ++-
 .../brooklyn/spi/dsl/methods/DslComponent.java  |   24 +-
 .../CatalogOsgiVersionMoreEntityRebindTest.java |  131 ++
 .../brooklyn/camp/brooklyn/dsl/DslTest.java     |  535 --------
 .../brooklyn/camp/brooklyn/spi/dsl/DslTest.java |  533 ++++++++
 .../camp/brooklyn/spi/dsl/DslYamlTest.java      |  773 ++++++++++++
 .../spi/dsl/methods/DslTestObjects.java         |   86 ++
 .../methods/custom/UserSuppliedPackageType.java |   22 +
 core/pom.xml                                    |    2 +-
 .../brooklyn/core/config/BasicConfigKey.java    |    2 +-
 .../apache/brooklyn/core/entity/Attributes.java |   18 +-
 .../core/location/LocationConfigUtils.java      |    5 +-
 .../location/cloud/CloudLocationConfig.java     |    2 +-
 .../mgmt/internal/LocalManagementContext.java   |   10 +
 .../core/mgmt/rebind/RebindIteration.java       |    2 +-
 .../core/sensor/DependentConfiguration.java     |    2 +-
 .../brooklyn/entity/stock/LocationEntity.java   |   90 ++
 .../entity/stock/LocationEntityImpl.java        |  161 +++
 .../location/ssh/SshMachineLocation.java        |   11 -
 .../util/core/crypto/FluentKeySigner.java       |   11 +-
 .../brooklyn/util/core/crypto/SecureKeys.java   |   51 +-
 .../core/internal/ssh/ShellAbstractTool.java    |    3 +-
 .../util/core/internal/ssh/sshj/SshjTool.java   |  211 ++--
 .../brooklyn/util/core/task/ValueResolver.java  |   36 +-
 .../deserializingClassRenames.properties        |    3 +
 .../entity/stock/LocationEntityTest.java        |  182 +++
 .../ssh/sshj/SshjToolIntegrationTest.java       |    7 +-
 .../util/core/task/ValueResolverTest.java       |   83 +-
 karaf/features/pom.xml                          |    2 +-
 karaf/features/src/main/feature/feature.xml     |   11 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |   44 +-
 .../brooklyn/launcher/BrooklynLauncherTest.java |   38 +
 locations/jclouds/pom.xml                       |   10 +-
 .../jclouds/BasicJcloudsLocationCustomizer.java |    5 +-
 .../location/jclouds/CreateUserStatements.java  |  303 +++++
 .../location/jclouds/JcloudsLocation.java       | 1191 +++++-------------
 .../location/jclouds/JcloudsLocationConfig.java |   18 +-
 .../jclouds/JcloudsSshMachineLocation.java      |    7 +-
 .../jclouds/RebindToMachinePredicate.java       |   85 ++
 .../AbstractPortableTemplateBuilder.java        |    3 +
 .../templates/PortableTemplateBuilder.java      |   10 +-
 .../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 ++
 .../persist/jclouds/BlobStoreExpiryTest.java    |   44 +-
 .../jclouds/AbstractJcloudsLiveTest.java        |    9 +-
 .../jclouds/DelegatingComputeService.java       |   24 +-
 ...dsByonLocationResolverStubbedRebindTest.java |    3 +-
 .../JcloudsByonLocationResolverStubbedTest.java |    3 +-
 ...loudsGceHardwareProfilesStubbedLiveTest.java |  156 +++
 ...ationTemplateOptionsCustomisersLiveTest.java |    3 +-
 .../location/jclouds/JcloudsLocationTest.java   |    6 +-
 .../jclouds/JcloudsStubTemplateBuilder.java     |   26 +-
 .../jclouds/JcloudsWinrmingLiveTest.java        |   42 +-
 .../jclouds/StubbedComputeServiceRegistry.java  |   15 +-
 .../jclouds/UnsupportedComputeService.java      |   22 +-
 .../provider/AwsEc2LocationLiveTest.java        |   11 +-
 .../jclouds/provider/GceLocationLiveTest.java   |   74 ++
 .../provider/SoftlayerLocationLiveTest.java     |   65 +
 .../brooklyn/logback-logger-excludes.xml        |    4 +-
 parent/pom.xml                                  |    2 +-
 pom.xml                                         |   23 +-
 .../MachineLifecycleEffectorTasks.java          |    7 +-
 .../osgi/com-example-entities/pom.xml           |   87 ++
 .../test/osgi/entities/SimpleApplication.java   |   27 +
 .../osgi/entities/SimpleApplicationImpl.java    |   26 +
 .../entities/SimpleEffectorInitializer.java     |   48 +
 .../test/osgi/entities/SimpleEntity.java        |   38 +
 .../test/osgi/entities/SimpleEntityImpl.java    |   25 +
 .../test/osgi/entities/SimpleLocation.java      |   35 +
 .../test/osgi/entities/SimpleObject.java        |   56 +
 .../test/osgi/entities/SimplePolicy.java        |   40 +
 .../src/main/resources/catalog.bom              |   27 +
 .../brooklyn/test/osgi/entities/icon.gif        |  Bin 0 -> 43 bytes
 .../brooklyn/test/osgi/resources/message.txt    |   16 +
 .../main/resources/yaml-ref-back-catalog.bom    |   31 +
 .../main/resources/yaml-ref-osgi-entity.yaml    |   21 +
 .../main/resources/yaml-ref-parent-catalog.bom  |   34 +
 .../org/apache/brooklyn/util/http/HttpTool.java |    2 +-
 .../util/internal/BrooklynSystemProperties.java |    2 +
 .../brooklyn/util/javalang/Reflections.java     |   72 +-
 .../brooklyn/util/text/StringFunctions.java     |   18 +-
 .../org/apache/brooklyn/util/text/Strings.java  |   30 +-
 .../org/apache/brooklyn/util/time/Duration.java |   13 +-
 .../org/apache/brooklyn/util/yaml/Yamls.java    |   20 +-
 .../brooklyn/util/javalang/ReflectionsTest.java |   18 +
 .../brooklyn/util/osgi/OsgiTestResources.java   |   19 +
 .../apache/brooklyn/util/osgi/OsgisTest.java    |    2 -
 .../apache/brooklyn/util/yaml/YamlsTest.java    |   22 +-
 .../brooklyn-test-osgi-com-example-entities.jar |  Bin 0 -> 21436 bytes
 115 files changed, 5873 insertions(+), 1798 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a777b36e/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
----------------------------------------------------------------------


Mime
View raw message