You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/08/05 22:56:24 UTC
[20/20] incubator-brooklyn git commit: This closes #797
This closes #797
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7bc08a05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7bc08a05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7bc08a05
Branch: refs/heads/master
Commit: 7bc08a05ff9ca539a5674405c8d626284003d68a
Parents: 846143c e406d1a
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Wed Aug 5 16:37:51 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Wed Aug 5 16:37:51 2015 -0400
----------------------------------------------------------------------
.../com/acme/sample/brooklyn/SampleMain.java | 2 +-
.../camp/brooklyn/BrooklynCampConstants.java | 50 -
.../camp/brooklyn/BrooklynCampPlatform.java | 76 --
.../BrooklynCampPlatformLauncherAbstract.java | 73 --
.../BrooklynCampPlatformLauncherNoServer.java | 36 -
.../camp/brooklyn/BrooklynCampReservedKeys.java | 29 -
.../camp/brooklyn/YamlLauncherAbstract.java | 133 ---
.../camp/brooklyn/YamlLauncherNoServer.java | 39 -
.../BrooklynAssemblyTemplateInstantiator.java | 282 ------
.../BrooklynComponentTemplateResolver.java | 491 ---------
.../BrooklynEntityDecorationResolver.java | 181 ----
.../spi/creation/BrooklynEntityMatcher.java | 193 ----
.../creation/BrooklynYamlLocationResolver.java | 142 ---
.../creation/BrooklynYamlTypeInstantiator.java | 208 ----
.../spi/creation/EntitySpecConfiguration.java | 58 --
.../service/BrooklynServiceTypeResolver.java | 72 --
.../service/CatalogServiceTypeResolver.java | 78 --
.../service/ChefServiceTypeResolver.java | 62 --
.../service/JavaServiceTypeResolver.java | 39 -
.../creation/service/ServiceTypeResolver.java | 73 --
.../spi/dsl/BrooklynDslDeferredSupplier.java | 99 --
.../spi/dsl/BrooklynDslInterpreter.java | 188 ----
.../camp/brooklyn/spi/dsl/DslUtils.java | 44 -
.../spi/dsl/methods/BrooklynDslCommon.java | 302 ------
.../brooklyn/spi/dsl/methods/DslComponent.java | 320 ------
.../camp/brooklyn/spi/dsl/parse/DslParser.java | 144 ---
.../spi/dsl/parse/FunctionWithArgs.java | 57 --
.../brooklyn/spi/dsl/parse/QuotedString.java | 49 -
.../lookup/AbstractBrooklynResourceLookup.java | 36 -
.../lookup/AbstractTemplateBrooklynLookup.java | 62 --
.../spi/lookup/AssemblyBrooklynLookup.java | 69 --
.../lookup/AssemblyTemplateBrooklynLookup.java | 70 --
.../brooklyn/spi/lookup/BrooklynUrlLookup.java | 38 -
.../lookup/PlatformComponentBrooklynLookup.java | 61 --
...PlatformComponentTemplateBrooklynLookup.java | 59 --
.../platform/BrooklynImmutableCampPlatform.java | 107 --
.../camp/brooklyn/BrooklynCampConstants.java | 50 +
.../camp/brooklyn/BrooklynCampPlatform.java | 78 ++
.../BrooklynCampPlatformLauncherAbstract.java | 73 ++
.../BrooklynCampPlatformLauncherNoServer.java | 36 +
.../camp/brooklyn/BrooklynCampReservedKeys.java | 29 +
.../camp/brooklyn/YamlLauncherAbstract.java | 133 +++
.../camp/brooklyn/YamlLauncherNoServer.java | 39 +
.../BrooklynAssemblyTemplateInstantiator.java | 283 ++++++
.../BrooklynComponentTemplateResolver.java | 490 +++++++++
.../BrooklynEntityDecorationResolver.java | 180 ++++
.../spi/creation/BrooklynEntityMatcher.java | 193 ++++
.../creation/BrooklynYamlLocationResolver.java | 142 +++
.../creation/BrooklynYamlTypeInstantiator.java | 208 ++++
.../spi/creation/EntitySpecConfiguration.java | 58 ++
.../service/BrooklynServiceTypeResolver.java | 71 ++
.../service/CatalogServiceTypeResolver.java | 78 ++
.../service/ChefServiceTypeResolver.java | 61 ++
.../service/JavaServiceTypeResolver.java | 39 +
.../creation/service/ServiceTypeResolver.java | 73 ++
.../spi/dsl/BrooklynDslDeferredSupplier.java | 99 ++
.../spi/dsl/BrooklynDslInterpreter.java | 188 ++++
.../camp/brooklyn/spi/dsl/DslUtils.java | 44 +
.../spi/dsl/methods/BrooklynDslCommon.java | 301 ++++++
.../brooklyn/spi/dsl/methods/DslComponent.java | 320 ++++++
.../camp/brooklyn/spi/dsl/parse/DslParser.java | 144 +++
.../spi/dsl/parse/FunctionWithArgs.java | 57 ++
.../brooklyn/spi/dsl/parse/QuotedString.java | 49 +
.../lookup/AbstractBrooklynResourceLookup.java | 36 +
.../lookup/AbstractTemplateBrooklynLookup.java | 62 ++
.../spi/lookup/AssemblyBrooklynLookup.java | 69 ++
.../lookup/AssemblyTemplateBrooklynLookup.java | 70 ++
.../brooklyn/spi/lookup/BrooklynUrlLookup.java | 38 +
.../lookup/PlatformComponentBrooklynLookup.java | 61 ++
...PlatformComponentTemplateBrooklynLookup.java | 59 ++
.../platform/BrooklynImmutableCampPlatform.java | 109 ++
...lyn.spi.creation.service.ServiceTypeResolver | 22 -
...lyn.spi.creation.service.ServiceTypeResolver | 22 +
.../camp/brooklyn/AbstractYamlRebindTest.java | 206 ----
.../camp/brooklyn/AbstractYamlTest.java | 182 ----
.../io/brooklyn/camp/brooklyn/AppYamlTest.java | 119 ---
.../BrooklynYamlTypeInstantiatorTest.java | 76 --
.../camp/brooklyn/ByonLocationsYamlTest.java | 281 ------
.../camp/brooklyn/DslAndRebindYamlTest.java | 245 -----
.../brooklyn/EmptySoftwareProcessYamlTest.java | 103 --
.../EnrichersSlightlySimplerYamlTest.java | 134 ---
.../camp/brooklyn/EnrichersYamlTest.java | 257 -----
.../brooklyn/EntitiesYamlIntegrationTest.java | 71 --
.../camp/brooklyn/EntitiesYamlTest.java | 919 -----------------
...aWebAppWithDslYamlRebindIntegrationTest.java | 125 ---
.../brooklyn/JavaWebAppsIntegrationTest.java | 272 -----
.../camp/brooklyn/JavaWebAppsMatchingTest.java | 144 ---
.../camp/brooklyn/LocationsYamlTest.java | 285 ------
.../camp/brooklyn/MapReferenceYamlTest.java | 130 ---
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 280 ------
.../camp/brooklyn/PoliciesYamlTest.java | 215 ----
.../camp/brooklyn/ReferencedYamlTest.java | 180 ----
.../brooklyn/ReferencingYamlTestEntity.java | 66 --
.../brooklyn/ReferencingYamlTestEntityImpl.java | 25 -
.../brooklyn/ReloadBrooklynPropertiesTest.java | 87 --
.../camp/brooklyn/TestEntityWithInitConfig.java | 35 -
.../brooklyn/TestEntityWithInitConfigImpl.java | 59 --
.../camp/brooklyn/TestReferencingEnricher.java | 34 -
.../camp/brooklyn/TestReferencingPolicy.java | 34 -
.../TestSensorAndEffectorInitializer.java | 86 --
.../brooklyn/VanillaBashNetcatYamlTest.java | 113 ---
.../io/brooklyn/camp/brooklyn/WrapAppTest.java | 93 --
.../catalog/AbstractCatalogXmlTest.java | 109 --
.../CatalogOsgiVersionMoreEntityTest.java | 261 -----
.../brooklyn/catalog/CatalogXmlOsgiTest.java | 37 -
.../brooklyn/catalog/CatalogXmlVersionTest.java | 58 --
.../brooklyn/catalog/CatalogYamlCombiTest.java | 145 ---
.../brooklyn/catalog/CatalogYamlEntityTest.java | 781 ---------------
.../catalog/CatalogYamlLocationTest.java | 248 -----
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 196 ----
.../brooklyn/catalog/CatalogYamlRebindTest.java | 132 ---
.../catalog/CatalogYamlTemplateTest.java | 96 --
.../catalog/CatalogYamlVersioningTest.java | 258 -----
.../camp/brooklyn/catalog/TestBasicApp.java | 27 -
.../camp/brooklyn/catalog/TestBasicAppImpl.java | 24 -
.../camp/brooklyn/spi/dsl/DslParseTest.java | 79 --
.../camp/brooklyn/AbstractYamlRebindTest.java | 208 ++++
.../camp/brooklyn/AbstractYamlTest.java | 184 ++++
.../brooklyn/camp/brooklyn/AppYamlTest.java | 119 +++
.../BrooklynYamlTypeInstantiatorTest.java | 75 ++
.../camp/brooklyn/ByonLocationsYamlTest.java | 281 ++++++
.../camp/brooklyn/DslAndRebindYamlTest.java | 245 +++++
.../brooklyn/EmptySoftwareProcessYamlTest.java | 103 ++
.../EnrichersSlightlySimplerYamlTest.java | 134 +++
.../camp/brooklyn/EnrichersYamlTest.java | 257 +++++
.../brooklyn/EntitiesYamlIntegrationTest.java | 71 ++
.../camp/brooklyn/EntitiesYamlTest.java | 919 +++++++++++++++++
...aWebAppWithDslYamlRebindIntegrationTest.java | 125 +++
.../brooklyn/JavaWebAppsIntegrationTest.java | 275 ++++++
.../camp/brooklyn/JavaWebAppsMatchingTest.java | 146 +++
.../camp/brooklyn/LocationsYamlTest.java | 285 ++++++
.../camp/brooklyn/MapReferenceYamlTest.java | 130 +++
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 280 ++++++
.../camp/brooklyn/PoliciesYamlTest.java | 215 ++++
.../camp/brooklyn/ReferencedYamlTest.java | 180 ++++
.../brooklyn/ReferencingYamlTestEntity.java | 66 ++
.../brooklyn/ReferencingYamlTestEntityImpl.java | 25 +
.../brooklyn/ReloadBrooklynPropertiesTest.java | 89 ++
.../camp/brooklyn/TestEntityWithInitConfig.java | 35 +
.../brooklyn/TestEntityWithInitConfigImpl.java | 59 ++
.../camp/brooklyn/TestReferencingEnricher.java | 34 +
.../camp/brooklyn/TestReferencingPolicy.java | 34 +
.../TestSensorAndEffectorInitializer.java | 86 ++
.../brooklyn/VanillaBashNetcatYamlTest.java | 114 +++
.../brooklyn/camp/brooklyn/WrapAppTest.java | 93 ++
.../catalog/AbstractCatalogXmlTest.java | 109 ++
.../CatalogOsgiVersionMoreEntityTest.java | 262 +++++
.../brooklyn/catalog/CatalogXmlOsgiTest.java | 37 +
.../brooklyn/catalog/CatalogXmlVersionTest.java | 58 ++
.../brooklyn/catalog/CatalogYamlCombiTest.java | 143 +++
.../brooklyn/catalog/CatalogYamlEntityTest.java | 780 +++++++++++++++
.../catalog/CatalogYamlLocationTest.java | 247 +++++
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 195 ++++
.../brooklyn/catalog/CatalogYamlRebindTest.java | 132 +++
.../catalog/CatalogYamlTemplateTest.java | 95 ++
.../catalog/CatalogYamlVersioningTest.java | 257 +++++
.../camp/brooklyn/catalog/TestBasicApp.java | 27 +
.../camp/brooklyn/catalog/TestBasicAppImpl.java | 24 +
.../camp/brooklyn/spi/dsl/DslParseTest.java | 79 ++
.../more-entities-osgi-catalog-scan.yaml | 32 -
.../more-entity-v1-called-v1-osgi-catalog.yaml | 27 -
.../catalog/more-entity-v1-osgi-catalog.yaml | 27 -
...more-entity-v1-with-policy-osgi-catalog.yaml | 29 -
.../catalog/more-entity-v2-osgi-catalog.yaml | 28 -
.../more-policies-osgi-catalog-scan.yaml | 32 -
.../catalog/simple-policy-osgi-catalog.yaml | 27 -
.../more-entities-osgi-catalog-scan.yaml | 32 +
.../more-entity-v1-called-v1-osgi-catalog.yaml | 27 +
.../catalog/more-entity-v1-osgi-catalog.yaml | 27 +
...more-entity-v1-with-policy-osgi-catalog.yaml | 29 +
.../catalog/more-entity-v2-osgi-catalog.yaml | 28 +
.../more-policies-osgi-catalog-scan.yaml | 32 +
.../catalog/simple-policy-osgi-catalog.yaml | 27 +
.../camp/src/test/resources/simple-catalog.xml | 2 +-
.../resources/test-entity-with-init-config.yaml | 2 +-
.../resources/test-referencing-enrichers.yaml | 26 +-
.../resources/test-referencing-entities.yaml | 12 +-
.../resources/test-referencing-policies.yaml | 26 +-
.../main/java/brooklyn/cli/AbstractMain.java | 253 -----
.../main/java/brooklyn/cli/CloudExplorer.java | 381 -------
.../src/main/java/brooklyn/cli/ItemLister.java | 272 -----
usage/cli/src/main/java/brooklyn/cli/Main.java | 986 ------------------
.../java/brooklyn/cli/lister/ClassFinder.java | 153 ---
.../brooklyn/cli/lister/ItemDescriptors.java | 173 ----
.../org/apache/brooklyn/cli/AbstractMain.java | 254 +++++
.../org/apache/brooklyn/cli/CloudExplorer.java | 381 +++++++
.../org/apache/brooklyn/cli/ItemLister.java | 273 +++++
.../main/java/org/apache/brooklyn/cli/Main.java | 987 +++++++++++++++++++
.../apache/brooklyn/cli/lister/ClassFinder.java | 153 +++
.../brooklyn/cli/lister/ItemDescriptors.java | 173 ++++
.../cli/src/test/java/brooklyn/cli/CliTest.java | 604 ------------
.../brooklyn/cli/CloudExplorerLiveTest.java | 209 ----
.../java/org/apache/brooklyn/cli/CliTest.java | 605 ++++++++++++
.../brooklyn/cli/CloudExplorerLiveTest.java | 209 ++++
.../resources/example-app-app-location.yaml | 2 +-
.../resources/example-app-entity-location.yaml | 2 +-
.../test/resources/example-app-no-location.yaml | 2 +-
.../brooklyn/launcher/BrooklynLauncher.java | 4 +-
.../camp/BrooklynCampPlatformLauncher.java | 5 +-
.../launcher/camp/SimpleYamlLauncher.java | 4 +-
.../blueprints/AbstractBlueprintTest.java | 2 +-
.../brooklyn/rest/BrooklynRestApiLauncher.java | 4 +-
.../brooklyn/rest/HaMasterCheckFilterTest.java | 2 +-
.../rest/testing/BrooklynRestApiTest.java | 2 +-
204 files changed, 14641 insertions(+), 14631 deletions(-)
----------------------------------------------------------------------