catalog.bom: improve names/descriptions Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/021400ce Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/021400ce Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/021400ce
Branch: refs/heads/master Commit: 021400ced7b1e94eb78bed074509fa67af0d37a1 Parents: d1cb5c6 Author: Aled Sage <[email protected]> Authored: Tue Sep 12 18:35:28 2017 +0100 Committer: Aled Sage <[email protected]> Committed: Tue Sep 12 18:35:28 2017 +0100 ---------------------------------------------------------------------- .../database/src/main/resources/catalog.bom | 5 +++++ .../messaging/src/main/resources/catalog.bom | 6 +++++ software/nosql/src/main/resources/catalog.bom | 12 ++++++++++ software/webapp/src/main/resources/catalog.bom | 23 ++++++++++++++------ 4 files changed, 39 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/021400ce/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 6af8b72..e033aa7 100644 --- a/software/database/src/main/resources/catalog.bom +++ b/software/database/src/main/resources/catalog.bom @@ -22,6 +22,8 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.database.crate.CrateNode item: type: org.apache.brooklyn.entity.database.crate.CrateNode + name: Crate Node + description: CrateDB offers Standard-SQL real-time queries and document support - id: org.apache.brooklyn.entity.database.mysql.MySqlNode item: type: org.apache.brooklyn.entity.database.mysql.MySqlNode @@ -40,6 +42,9 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.database.rubyrep.RubyRepNode item: type: org.apache.brooklyn.entity.database.rubyrep.RubyRepNode + name: RubyRep Node + description: RubyRep is a database replication system + iconUrl: classpath:///rubyrep-logo.jpeg - id: org.apache.brooklyn.entity.database.mariadb.MariaDbNode item: type: org.apache.brooklyn.entity.database.mariadb.MariaDbNode http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/021400ce/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 5d2cbfb..43cd9ca 100644 --- a/software/messaging/src/main/resources/catalog.bom +++ b/software/messaging/src/main/resources/catalog.bom @@ -42,6 +42,7 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.messaging.activemq.ActiveMQQueue item: type: org.apache.brooklyn.entity.messaging.activemq.ActiveMQQueue + name: ActiveMQ Queue - id: org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble item: type: org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble @@ -50,12 +51,15 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.messaging.kafka.KafkaZooKeeper item: type: org.apache.brooklyn.entity.messaging.kafka.KafkaZooKeeper + name: Kafka ZooKeeper - id: org.apache.brooklyn.entity.messaging.activemq.ActiveMQTopic item: type: org.apache.brooklyn.entity.messaging.activemq.ActiveMQTopic + name: ActiveMQ Topic - id: org.apache.brooklyn.entity.messaging.qpid.QpidQueue item: type: org.apache.brooklyn.entity.messaging.qpid.QpidQueue + name: Qpid Queue - id: org.apache.brooklyn.entity.zookeeper.ZooKeeperNode item: type: org.apache.brooklyn.entity.zookeeper.ZooKeeperNode @@ -69,9 +73,11 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.messaging.kafka.KafkaBroker item: type: org.apache.brooklyn.entity.messaging.kafka.KafkaBroker + name: Kafka Broker - id: org.apache.brooklyn.entity.messaging.qpid.QpidTopic item: type: org.apache.brooklyn.entity.messaging.qpid.QpidTopic + name: Qpid Topic - id: org.apache.brooklyn.entity.messaging.storm.StormDeployment item: type: org.apache.brooklyn.entity.messaging.storm.StormDeployment http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/021400ce/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 0779dc2..f9976f1 100644 --- a/software/nosql/src/main/resources/catalog.bom +++ b/software/nosql/src/main/resources/catalog.bom @@ -27,6 +27,7 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouterCluster item: type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBRouterCluster + name: MongoDB Router Cluster - id: org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter item: type: org.apache.brooklyn.entity.nosql.cassandra.CassandraDatacenter @@ -44,6 +45,7 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.nosql.redis.RedisShard item: type: org.apache.brooklyn.entity.nosql.redis.RedisShard + name: Redis Shard - id: org.apache.brooklyn.entity.nosql.redis.RedisCluster item: type: org.apache.brooklyn.entity.nosql.redis.RedisCluster @@ -57,6 +59,7 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.nosql.couchdb.CouchDBCluster item: type: org.apache.brooklyn.entity.nosql.couchdb.CouchDBCluster + name: CouchDB Cluster - id: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseNode item: type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseNode @@ -79,6 +82,7 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBConfigServerCluster item: type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBConfigServerCluster + name: MongoDB Config Server Cluster - id: org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer item: type: org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer @@ -90,12 +94,15 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet item: type: org.apache.brooklyn.entity.nosql.mongodb.MongoDBReplicaSet + name: MongoDB Replica Set - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardCluster item: type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBShardCluster + name: MongoDB Shard Cluster - id: org.apache.brooklyn.entity.nosql.mongodb.MongoDBClient item: type: org.apache.brooklyn.entity.nosql.mongodb.MongoDBClient + name: MongoDB Client - id: org.apache.brooklyn.entity.nosql.elasticsearch.ElasticSearchNode item: type: org.apache.brooklyn.entity.nosql.elasticsearch.ElasticSearchNode @@ -114,12 +121,15 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.nosql.cassandra.CassandraCluster item: type: org.apache.brooklyn.entity.nosql.cassandra.CassandraCluster + name: Cassandra Cluster - id: org.apache.brooklyn.entity.nosql.redis.RedisSlave item: type: org.apache.brooklyn.entity.nosql.redis.RedisSlave + name: Redis Slave - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBConfigServer item: type: org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBConfigServer + name: MongoDB Config Server - id: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster item: type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster @@ -128,6 +138,7 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseSyncGateway item: type: org.apache.brooklyn.entity.nosql.couchbase.CouchbaseSyncGateway + name: Couchbase Sync Gateway - id: org.apache.brooklyn.entity.nosql.hazelcast.HazelcastNode item: type: org.apache.brooklyn.entity.nosql.hazelcast.HazelcastNode @@ -141,6 +152,7 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.nosql.mongodb.sharding.CoLocatedMongoDBRouter item: type: org.apache.brooklyn.entity.nosql.mongodb.sharding.CoLocatedMongoDBRouter + name: Co-located MongoDB Router - id: bash-web-and-riak-template http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/021400ce/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 7e2fdd3..c694bdd 100644 --- a/software/webapp/src/main/resources/catalog.bom +++ b/software/webapp/src/main/resources/catalog.bom @@ -31,9 +31,11 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.proxy.nginx.UrlMapping item: type: org.apache.brooklyn.entity.proxy.nginx.UrlMapping + name: URL Mapping - id: org.apache.brooklyn.entity.webapp.DynamicWebAppFabric item: type: org.apache.brooklyn.entity.webapp.DynamicWebAppFabric + name: Dynamic Web App Fabric - id: org.apache.brooklyn.entity.proxy.nginx.NginxController item: type: org.apache.brooklyn.entity.proxy.nginx.NginxController @@ -47,10 +49,14 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server item: type: org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server - name: Tomcat Server + name: Tomcat 8 Server - id: org.apache.brooklyn.entity.proxy.LoadBalancerCluster item: type: org.apache.brooklyn.entity.proxy.LoadBalancerCluster + name: Load-balanced Cluster + description: | + A cluster of load balancers; configuring the cluster (through the LoadBalancer interface) + will configure all load balancers in the cluster. - id: org.apache.brooklyn.entity.webapp.jetty.Jetty6Server item: type: org.apache.brooklyn.entity.webapp.jetty.Jetty6Server @@ -64,10 +70,12 @@ brooklyn.catalog: - id: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer item: type: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer - name: Tomcat Server + name: Tomcat 7 Server - id: org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService item: type: org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService + name: Geoscaling DNS Service + description: A geo-DNS service using geoscaling.com - id: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster item: type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster @@ -75,14 +83,15 @@ brooklyn.catalog: description: A cluster of load-balanced web-apps, which can be dynamically re-sized - id: load-balancer - description: | - Create a load balancer which will point at members in the group entity - referred to by the config key "serverPool". - The sensor advertising the port can be configured with the "member.sensor.portNumber" config key, - defaulting to `http.port`; all member entities which have published "service.up" will then be picked up. item: type: org.apache.brooklyn.entity.proxy.nginx.NginxController name: Load Balancer (nginx) + description: | + Synonym for 'Nginx Server'. + Create a load balancer which will point at members in the group entity + referred to by the config key "serverPool". + The sensor advertising the port can be configured with the "member.sensor.portNumber" config key, + defaulting to `http.port`; all member entities which have published "service.up" will then be picked up. - id: resilient-bash-web-cluster-template itemType: template
