This closes #222 * github/pr/222: Catalog format more consistent
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ce1192f9 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ce1192f9 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ce1192f9 Branch: refs/heads/master Commit: ce1192f9f16d130a8b4ba8f9e66864b661db1f82 Parents: 5adbbca 057760e Author: Andrew Donald Kennedy <[email protected]> Authored: Mon Jul 4 10:36:15 2016 +0100 Committer: Andrew Donald Kennedy <[email protected]> Committed: Mon Jul 4 10:36:15 2016 +0100 ---------------------------------------------------------------------- .../camp/brooklyn/ApplicationsYamlTest.java | 40 ++-- .../brooklyn/ConfigInheritanceYamlTest.java | 2 +- .../ConfigLocationInheritanceYamlTest.java | 6 +- .../camp/brooklyn/EntitiesYamlTest.java | 10 +- .../camp/brooklyn/ExternalConfigYamlTest.java | 15 +- .../LocationExternalConfigYamlTest.java | 2 +- .../camp/brooklyn/ReferencedYamlTest.java | 24 ++- .../brooklyn/catalog/CatalogYamlAppTest.java | 41 ++-- .../brooklyn/catalog/CatalogYamlCombiTest.java | 27 ++- .../catalog/CatalogYamlEntityNameTest.java | 9 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 193 ++++++++++--------- .../catalog/CatalogYamlLocationTest.java | 24 +-- .../brooklyn/catalog/CatalogYamlPolicyTest.java | 21 +- .../brooklyn/catalog/CatalogYamlRebindTest.java | 3 +- .../catalog/CatalogYamlTemplateTest.java | 16 +- .../catalog/CatalogYamlVersioningTest.java | 14 +- .../catalog/SpecParameterParsingTest.java | 2 + .../catalog/SpecParameterUnwrappingTest.java | 88 +++++---- .../brooklyn/test/lite/CampYamlLiteTest.java | 23 +-- core/src/main/resources/catalog.bom | 3 +- .../internal/StaticTypePlanTransformer.java | 3 +- .../core/mgmt/rebind/RebindCatalogItemTest.java | 90 ++++++--- .../src/main/resources/etc/default.catalog.bom | 2 +- launcher/src/test/resources/7zip-catalog.yaml | 4 +- .../resources/rebind-test-catalog-additions.bom | 3 +- .../src/test/resources/rebind-test-catalog.bom | 3 +- policy/src/main/resources/catalog.bom | 3 +- .../rest/resources/LocationResource.java | 13 +- .../rest/resources/ApplicationResourceTest.java | 28 +-- .../rest/resources/CatalogResourceTest.java | 133 +++++++------ .../rest/resources/LocationResourceTest.java | 12 +- .../vanilla-software-process-with-resource.yaml | 8 +- .../main/resources/brooklyn/default.catalog.bom | 6 +- server-cli/src/main/resources/catalog.bom | 6 +- .../java/org/apache/brooklyn/cli/CliTest.java | 1 + software/base/src/main/resources/catalog.bom | 3 +- .../BrooklynNodeIntegrationTest.java | 4 +- test-framework/src/main/resources/catalog.bom | 6 +- .../entities/src/main/resources/catalog.bom | 3 +- .../main/resources/yaml-ref-back-catalog.bom | 1 + .../main/resources/yaml-ref-parent-catalog.bom | 1 + .../src/main/resources/catalog.bom | 3 +- .../src/main/resources/catalog.bom | 3 +- .../src/main/resources/catalog.bom | 6 +- 44 files changed, 521 insertions(+), 387 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ce1192f9/policy/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --cc policy/src/main/resources/catalog.bom index a86ea5b,bfa81dd..ee966c9 --- a/policy/src/main/resources/catalog.bom +++ b/policy/src/main/resources/catalog.bom @@@ -16,10 -16,10 +16,11 @@@ # under the License. brooklyn.catalog: - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION + itemType: policy items: - id: org.apache.brooklyn.policy.ha.ConnectionFailureDetector + itemType: policy item: type: org.apache.brooklyn.policy.ha.ConnectionFailureDetector name: Connection Failure Detector http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ce1192f9/test-framework/src/main/resources/catalog.bom ----------------------------------------------------------------------
