Repository: brooklyn-library Updated Branches: refs/heads/master 7ceb3c254 -> e1db211fb
Catalog format more consistent Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/a9889408 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/a9889408 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/a9889408 Branch: refs/heads/master Commit: a98894085e7bcfc589d2740cbdcf30b17febb9b0 Parents: 7ceb3c2 Author: Aled Sage <[email protected]> Authored: Thu Jun 23 09:09:29 2016 +0100 Committer: Aled Sage <[email protected]> Committed: Tue Jun 28 20:35:07 2016 +0100 ---------------------------------------------------------------------- .../src/main/resources/catalog.bom | 8 +++-- .../src/main/resources/catalog.bom | 37 ++++++++++++-------- .../src/main/resources/catalog.bom | 13 ++++--- .../src/main/resources/catalog.bom | 3 +- .../java-web-app-and-db-with-policy.bom | 4 +-- .../monitoring/src/main/resources/catalog.bom | 2 +- .../cm/ansible/src/main/resources/catalog.bom | 3 +- software/cm/salt/src/main/resources/catalog.bom | 3 +- .../database/src/main/resources/catalog.bom | 3 +- .../messaging/src/main/resources/catalog.bom | 3 +- .../monitoring/src/main/resources/catalog.bom | 3 +- software/network/src/main/resources/catalog.bom | 5 +-- software/nosql/src/main/resources/catalog.bom | 3 +- software/osgi/src/main/resources/catalog.bom | 3 +- software/webapp/src/main/resources/catalog.bom | 3 +- 15 files changed, 59 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/examples/global-web-fabric/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/examples/global-web-fabric/src/main/resources/catalog.bom b/examples/global-web-fabric/src/main/resources/catalog.bom index f3fc43d..4197271 100644 --- a/examples/global-web-fabric/src/main/resources/catalog.bom +++ b/examples/global-web-fabric/src/main/resources/catalog.bom @@ -16,9 +16,11 @@ # under the License. brooklyn.catalog: - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION + itemType: template items: - id: org.apache.brooklyn.demo.GlobalWebFabricExample item: - type: org.apache.brooklyn.demo.GlobalWebFabricExample - name: Global Web Fabric + services: + - type: org.apache.brooklyn.demo.GlobalWebFabricExample + name: Global Web Fabric http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/examples/simple-nosql-cluster/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/resources/catalog.bom b/examples/simple-nosql-cluster/src/main/resources/catalog.bom index caabcf8..f61f9cf 100644 --- a/examples/simple-nosql-cluster/src/main/resources/catalog.bom +++ b/examples/simple-nosql-cluster/src/main/resources/catalog.bom @@ -16,31 +16,38 @@ # under the License. brooklyn.catalog: - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION + itemType: template items: - id: org.apache.brooklyn.demo.RiakClusterExample item: - type: org.apache.brooklyn.demo.RiakClusterExample + services: + - type: org.apache.brooklyn.demo.RiakClusterExample - id: org.apache.brooklyn.demo.CumulusRDFApplication + description: CumulusRDF Application on a Tomcat server using a multi-region Cassandra fabric item: - type: org.apache.brooklyn.demo.CumulusRDFApplication - name: Cumulus RDF Application - description: CumulusRDF Application on a Tomcat server using a multi-region Cassandra fabric + services: + - type: org.apache.brooklyn.demo.CumulusRDFApplication + name: Cumulus RDF Application - id: org.apache.brooklyn.demo.ResilientMongoDbApp item: - type: org.apache.brooklyn.demo.ResilientMongoDbApp - name: Resilient MongoDB + services: + - type: org.apache.brooklyn.demo.ResilientMongoDbApp + name: Resilient MongoDB - id: org.apache.brooklyn.demo.StormSampleApp item: - type: org.apache.brooklyn.demo.StormSampleApp - name: Storm Sample App + services: + - type: org.apache.brooklyn.demo.StormSampleApp + name: Storm Sample App - id: org.apache.brooklyn.demo.WideAreaCassandraCluster + description: Deploy a Cassandra cluster across multiple geographies. item: - type: org.apache.brooklyn.demo.WideAreaCassandraCluster - name: Wide Area Cassandra Cluster Application - description: Deploy a Cassandra cluster across multiple geographies. + services: + - type: org.apache.brooklyn.demo.WideAreaCassandraCluster + name: Wide Area Cassandra Cluster Application - id: org.apache.brooklyn.demo.HighAvailabilityCassandraCluster + description: Deploy a Cassandra cluster with a High Availability architecture. item: - type: org.apache.brooklyn.demo.HighAvailabilityCassandraCluster - name: HA Cassandra Cluster Application - description: Deploy a Cassandra cluster with a High Availability architecture. + services: + - type: org.apache.brooklyn.demo.HighAvailabilityCassandraCluster + name: HA Cassandra Cluster Application http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/examples/simple-web-cluster/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/resources/catalog.bom b/examples/simple-web-cluster/src/main/resources/catalog.bom index df07971..901c185 100644 --- a/examples/simple-web-cluster/src/main/resources/catalog.bom +++ b/examples/simple-web-cluster/src/main/resources/catalog.bom @@ -16,13 +16,16 @@ # under the License. brooklyn.catalog: - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION + itemType: template items: - id: org.apache.brooklyn.demo.NodeJsTodoApplication item: - type: org.apache.brooklyn.demo.NodeJsTodoApplication - name: NodeJS Todo + services: + - type: org.apache.brooklyn.demo.NodeJsTodoApplication + name: NodeJS Todo - id: org.apache.brooklyn.demo.WebClusterDatabaseExampleApp item: - type: org.apache.brooklyn.demo.WebClusterDatabaseExampleApp - name: Elastic Java Web + DB + services: + - type: org.apache.brooklyn.demo.WebClusterDatabaseExampleApp + name: Elastic Java Web + DB http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom b/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom index a92874a..49510be 100644 --- a/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom +++ b/qa/src/test/projects/downstream-parent-test/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.example.HelloEntity item: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/qa/src/test/resources/java-web-app-and-db-with-policy.bom ---------------------------------------------------------------------- diff --git a/qa/src/test/resources/java-web-app-and-db-with-policy.bom b/qa/src/test/resources/java-web-app-and-db-with-policy.bom index 0bc5de9..8568f8b 100644 --- a/qa/src/test/resources/java-web-app-and-db-with-policy.bom +++ b/qa/src/test/resources/java-web-app-and-db-with-policy.bom @@ -20,13 +20,13 @@ # standalone catalog file brooklyn.catalog: - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: java-cluster-db-policy-example + itemType: template name: Elastic Web + DB description: Sample elastic Java cluster fronted by nginx with a MySQL backend, including a scaling policy iconUrl: http://www.apache.org/foundation/press/kit/poweredBy/Apache_PoweredBy.png - itemType: template item: name: Elastic Web + DB services: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/sandbox/monitoring/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/sandbox/monitoring/src/main/resources/catalog.bom b/sandbox/monitoring/src/main/resources/catalog.bom index 69e04e0..97704d3 100644 --- a/sandbox/monitoring/src/main/resources/catalog.bom +++ b/sandbox/monitoring/src/main/resources/catalog.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: org.apache.brooklyn.entity.monitoring.zabbix.ZabbixServer item: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/software/cm/ansible/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/cm/ansible/src/main/resources/catalog.bom b/software/cm/ansible/src/main/resources/catalog.bom index 4e7d7d9..68f453d 100644 --- a/software/cm/ansible/src/main/resources/catalog.bom +++ b/software/cm/ansible/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: org.apache.brooklyn.entity.cm.ansible.AnsibleEntity item: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/software/cm/salt/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/cm/salt/src/main/resources/catalog.bom b/software/cm/salt/src/main/resources/catalog.bom index 7f20567..afe09ab 100644 --- a/software/cm/salt/src/main/resources/catalog.bom +++ b/software/cm/salt/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: org.apache.brooklyn.entity.cm.salt.SaltEntity item: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/software/database/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/database/src/main/resources/catalog.bom b/software/database/src/main/resources/catalog.bom index fdc2e00..7d65e6b 100644 --- a/software/database/src/main/resources/catalog.bom +++ b/software/database/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: org.apache.brooklyn.entity.database.crate.CrateNode item: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/software/messaging/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/resources/catalog.bom b/software/messaging/src/main/resources/catalog.bom index 188f8a2..ec884ca 100644 --- a/software/messaging/src/main/resources/catalog.bom +++ b/software/messaging/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: org.apache.brooklyn.entity.messaging.activemq.ActiveMQBroker item: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/software/monitoring/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/monitoring/src/main/resources/catalog.bom b/software/monitoring/src/main/resources/catalog.bom index 65b749d..5388ae0 100644 --- a/software/monitoring/src/main/resources/catalog.bom +++ b/software/monitoring/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: org.apache.brooklyn.entity.monitoring.monit.MonitNode item: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/software/network/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/network/src/main/resources/catalog.bom b/software/network/src/main/resources/catalog.bom index bfd9724..ceead03 100644 --- a/software/network/src/main/resources/catalog.bom +++ b/software/network/src/main/resources/catalog.bom @@ -16,10 +16,11 @@ # under the License. brooklyn.catalog: - version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION + version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION + itemType: entity items: - id: org.apache.brooklyn.entity.network.bind.BindDnsServer + description: BIND is an Internet Domain Name Server. item: type: org.apache.brooklyn.entity.network.bind.BindDnsServer name: BIND - description: BIND is an Internet Domain Name Server. http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/software/nosql/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/resources/catalog.bom b/software/nosql/src/main/resources/catalog.bom index 9d048d0..bbcb063 100644 --- a/software/nosql/src/main/resources/catalog.bom +++ b/software/nosql/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: org.apache.brooklyn.entity.nosql.redis.RedisStore item: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/software/osgi/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/osgi/src/main/resources/catalog.bom b/software/osgi/src/main/resources/catalog.bom index 720bbc0..9cd81f1 100644 --- a/software/osgi/src/main/resources/catalog.bom +++ b/software/osgi/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: org.apache.brooklyn.entity.osgi.karaf.KarafContainer item: http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a9889408/software/webapp/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/resources/catalog.bom b/software/webapp/src/main/resources/catalog.bom index 5f790b8..cd42ead 100644 --- a/software/webapp/src/main/resources/catalog.bom +++ b/software/webapp/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: org.apache.brooklyn.entity.webapp.nodejs.NodeJsWebAppService item:
