Repository: brooklyn-dist Updated Branches: refs/heads/master bf3a88249 -> f2c711263
Catalog format more consistent Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/a2e0a91a Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/a2e0a91a Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/a2e0a91a Branch: refs/heads/master Commit: a2e0a91acb72ef109606836e5b76ca4a77de7598 Parents: bf3a882 Author: Aled Sage <[email protected]> Authored: Thu Jun 23 09:07:09 2016 +0100 Committer: Aled Sage <[email protected]> Committed: Thu Jun 23 09:07:09 2016 +0100 ---------------------------------------------------------------------- .../src/main/resources/catalog.bom | 3 ++- .../brooklyn-sample/src/test/resources/sample.bom | 4 ++-- shared-packaging/src/test/yaml/package.bom | 2 +- .../src/main/vagrant/files/vagrant-catalog.bom | 18 +++++++++--------- vagrant/src/main/vagrant/servers.yaml | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a2e0a91a/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom b/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom index 889e732..daca838 100644 --- a/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom +++ b/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom @@ -16,7 +16,8 @@ # under the License. brooklyn.catalog: - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION + itemType: entity items: - id: com.acme.sample.brooklyn.MySample item: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a2e0a91a/archetypes/quickstart/src/brooklyn-sample/src/test/resources/sample.bom ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/brooklyn-sample/src/test/resources/sample.bom b/archetypes/quickstart/src/brooklyn-sample/src/test/resources/sample.bom index adda846..eba4266 100644 --- a/archetypes/quickstart/src/brooklyn-sample/src/test/resources/sample.bom +++ b/archetypes/quickstart/src/brooklyn-sample/src/test/resources/sample.bom @@ -1,10 +1,10 @@ brooklyn.catalog: id: com.acme.sample.brooklyn.MySampleInCatalog - version: 1.0 + version: "1.0" + itemType: template description: My Sample displayName: MySample iconUrl: classpath:///sample-icon.png - itemType: template libraries: - file:///Path/to/archetype/sample/target/brooklyn-sample-0.1.0-SNAPSHOT.jar item: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a2e0a91a/shared-packaging/src/test/yaml/package.bom ---------------------------------------------------------------------- diff --git a/shared-packaging/src/test/yaml/package.bom b/shared-packaging/src/test/yaml/package.bom index 7c951cf..e050ed6 100644 --- a/shared-packaging/src/test/yaml/package.bom +++ b/shared-packaging/src/test/yaml/package.bom @@ -17,7 +17,7 @@ # under the License. # brooklyn.catalog: - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION ### brooklyn install entities ### apt-config: &apt-config install.command: | http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a2e0a91a/vagrant/src/main/vagrant/files/vagrant-catalog.bom ---------------------------------------------------------------------- diff --git a/vagrant/src/main/vagrant/files/vagrant-catalog.bom b/vagrant/src/main/vagrant/files/vagrant-catalog.bom index ed0d6a1..2459bdb 100644 --- a/vagrant/src/main/vagrant/files/vagrant-catalog.bom +++ b/vagrant/src/main/vagrant/files/vagrant-catalog.bom @@ -19,9 +19,9 @@ brooklyn.catalog: items: - id: byon1 - name: Vagrant BYON VM 1 - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location + name: Vagrant BYON VM 1 item: type: byon brooklyn.config: @@ -32,7 +32,7 @@ brooklyn.catalog: - id: byon2 name: Vagrant BYON VM 2 - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location item: type: byon @@ -43,9 +43,9 @@ brooklyn.catalog: - 10.10.10.102 - id: byon3 - name: Vagrant BYON VM 3 - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location + name: Vagrant BYON VM 3 item: type: byon brooklyn.config: @@ -55,9 +55,9 @@ brooklyn.catalog: - 10.10.10.103 - id: byon4 - name: Vagrant BYON VM 4 - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location + name: Vagrant BYON VM 4 item: type: byon brooklyn.config: @@ -67,9 +67,9 @@ brooklyn.catalog: - 10.10.10.104 - id: byon-all - name: Vagrant BYON VM 1-4 - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location + name: Vagrant BYON VM 1-4 item: type: byon brooklyn.config: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a2e0a91a/vagrant/src/main/vagrant/servers.yaml ---------------------------------------------------------------------- diff --git a/vagrant/src/main/vagrant/servers.yaml b/vagrant/src/main/vagrant/servers.yaml index fd4dc80..ef95d12 100644 --- a/vagrant/src/main/vagrant/servers.yaml +++ b/vagrant/src/main/vagrant/servers.yaml @@ -47,7 +47,7 @@ servers: autocorrect: true shell: env: - BROOKLYN_VERSION: 0.10.0-SNAPSHOT + BROOKLYN_VERSION: "0.10.0-SNAPSHOT" INSTALL_FROM_LOCAL_DIST: false cmd: - chmod a+x /vagrant/files/install_brooklyn.sh
