brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [03/11] brooklyn-server git commit: Merge branch 'master' into config-immediate-more
Date Mon, 20 Mar 2017 15:57:28 GMT
Merge branch 'master' into config-immediate-more


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

Branch: refs/heads/master
Commit: b61b46ede0651605a282ff08a5eac91c9c81c13c
Parents: 3821e02 fa7c38b
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Mar 1 12:12:23 2017 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Mar 1 12:12:23 2017 +0000

----------------------------------------------------------------------
 LICENSE                                         |   8 +-
 .../brooklyn/api/catalog/CatalogItem.java       |   6 +
 .../brooklyn/api/mgmt/ManagementContext.java    |  15 +
 .../apache/brooklyn/api/mgmt/Scratchpad.java    |  27 +
 .../camp/brooklyn/BrooklynCampPlatform.java     |   6 +-
 .../brooklyn/spi/creation/CampResolver.java     |   3 +
 .../methods/FormatStringIntegrationTest.java    |  76 ++
 .../camp/brooklyn/ExternalConfigYamlTest.java   |   2 +-
 .../brooklyn/ReloadBrooklynPropertiesTest.java  |   6 +-
 .../catalog/CatalogMakeOsgiBundleTest.java      | 201 ++++
 .../catalog/GetFileContentsEffector.java        |  46 +
 .../lite/CampPlatformWithJustBrooklynMgmt.java  |   2 +
 .../osgi/catalog-bundle-1/META-INF/MANIFEST.MF  |   3 +
 .../catalog/osgi/catalog-bundle-1/catalog.bom   |  31 +
 core/pom.xml                                    |  10 +
 .../core/BrooklynFeatureEnablement.java         |   2 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |   2 +-
 .../catalog/internal/CatalogBomScanner.java     |  72 +-
 .../core/entity/AbstractApplication.java        |  51 +-
 .../location/cloud/CloudLocationConfig.java     |  23 +-
 .../brooklyn/core/mgmt/BrooklynTaskTags.java    |   2 +
 .../JavaBrooklynClassLoadingContext.java        |   6 +-
 .../internal/AbstractManagementContext.java     |   8 +
 .../core/mgmt/internal/BasicScratchpad.java     |  43 +
 .../internal/DeferredBrooklynProperties.java    |   2 +-
 .../mgmt/internal/LocalSubscriptionManager.java | 147 +--
 .../NonDeploymentManagementContext.java         |   7 +
 .../brooklyn/core/mgmt/usage/LocationUsage.java |   8 +-
 .../brooklyn/util/core/osgi/BundleMaker.java    | 353 +++++++
 .../brooklyn/util/core/task/BasicTask.java      |   4 +-
 .../entity/ApplicationLifecycleStateTest.java   |  16 +
 .../LocalManagementContextRebindTest.java       |  38 +
 .../internal/LocalManagementContextTest.java    |  20 +-
 .../util/core/osgi/BundleMakerTest.java         | 270 ++++++
 .../osgi/test/bundlemaker/nomanifest/myfile.txt |   1 +
 .../bundlemaker/nomanifest/subdir/myfile2.txt   |   1 +
 .../withmanifest/META-INF/MANIFEST.MF           |   2 +
 .../test/bundlemaker/withmanifest/myfile.txt    |   1 +
 .../bundlemaker/withmanifest/subdir/myfile2.txt |   1 +
 .../brooklyn/launcher/osgi/OsgiLauncher.java    |   4 +
 .../location/jclouds/ConnectivityResolver.java  |  55 ++
 .../jclouds/ConnectivityResolverOptions.java    | 245 +++++
 .../jclouds/DefaultConnectivityResolver.java    | 490 ++++++++++
 .../location/jclouds/JcloudsLocation.java       | 389 ++++----
 .../location/jclouds/JcloudsLocationConfig.java |   4 +
 .../jclouds/JcloudsSshMachineLocation.java      |   2 +-
 .../brooklyn/location/jclouds/JcloudsUtil.java  |   1 -
 .../jclouds/ManagementAddressResolveResult.java |  54 ++
 .../jclouds/AbstractJcloudsStubbedLiveTest.java |   3 +-
 ...BasicLocationNetworkInfoInitializerTest.java |  44 +
 .../DefaultConnectivityResolverTest.java        | 262 ++++++
 ...dsByonLocationResolverStubbedRebindTest.java |   2 +
 .../JcloudsReachableAddressStubbedTest.java     |  69 +-
 .../rest/domain/CatalogEntitySummary.java       |   3 +-
 .../rest/domain/CatalogItemSummary.java         |  12 +-
 .../rest/domain/CatalogLocationSummary.java     |   3 +-
 .../rest/domain/CatalogPolicySummary.java       |   3 +-
 .../rest/security/jaas/BrooklynLoginModule.java |   2 +
 .../provider/DelegatingSecurityProvider.java    |   6 +-
 .../rest/transform/CatalogTransformer.java      |   8 +-
 .../util/json/BrooklynJacksonJsonProvider.java  |   4 +-
 .../filter/EntitlementContextFilterTest.java    |   2 +-
 server-cli/src/main/license/files/LICENSE       |  13 +
 .../src/main/license/source-inclusions.yaml     |   3 +
 .../main/resources/brooklyn/default.catalog.bom |   4 +
 .../main/resources/brooklyn/icons/cluster.svg   |   1 +
 .../main/resources/brooklyn/icons/server.svg    | 933 +++++++++++++++++++
 .../MachineLifecycleEffectorTasks.java          |  16 +-
 .../brooklyn/entity/AbstractEc2LiveTest.java    |  17 -
 .../util/net/ReachableSocketFinder.java         | 107 +--
 .../util/net/ReachableSocketFinderTest.java     |  42 +-
 71 files changed, 3823 insertions(+), 502 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b61b46ed/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
----------------------------------------------------------------------


Mime
View raw message