You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/07/13 16:00:50 UTC
[1/2] brooklyn-library git commit: Adds missing logos for library
entities
Repository: brooklyn-library
Updated Branches:
refs/heads/master 10fbecdc0 -> 512f720dc
Adds missing logos for library entities
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/5e2179a1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/5e2179a1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/5e2179a1
Branch: refs/heads/master
Commit: 5e2179a1debd2d27ea76e9dfe00cfcd16e42db7a
Parents: 10fbecd
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 13 14:55:49 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 13 16:58:23 2016 +0100
----------------------------------------------------------------------
.../cm/ansible/src/main/resources/ansible-logo.png | Bin 0 -> 2040 bytes
.../cm/salt/src/main/resources/saltstack-logo.png | Bin 0 -> 14847 bytes
.../database/src/main/resources/crate-logo.png | Bin 0 -> 90348 bytes
.../entity/messaging/kafka/KafkaBroker.java | 2 ++
.../brooklyn/entity/messaging/storm/Storm.java | 3 ++-
.../src/main/resources/apache-storm-logo.png | Bin 0 -> 26889 bytes
.../messaging/src/main/resources/kafka-logo.png | Bin 0 -> 10648 bytes
.../src/main/resources/zookeeper-logo.gif | Bin 0 -> 4847 bytes
.../entity/monitoring/monit/MonitNode.java | 4 +++-
.../monitoring/src/main/resources/monit-logo.png | Bin 0 -> 19919 bytes
.../entity/nosql/couchbase/CouchbaseNode.java | 3 ++-
.../brooklyn/entity/nosql/riak/RiakCluster.java | 3 ++-
.../nosql/src/main/resources/hazelcast-logo.png | Bin 0 -> 2761 bytes
.../entity/webapp/tomcat/Tomcat8Server.java | 2 +-
.../entity/webapp/tomcat/TomcatServer.java | 2 +-
.../webapp/src/main/resources/geoscaling-logo.gif | Bin 0 -> 3088 bytes
16 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/cm/ansible/src/main/resources/ansible-logo.png
----------------------------------------------------------------------
diff --git a/software/cm/ansible/src/main/resources/ansible-logo.png b/software/cm/ansible/src/main/resources/ansible-logo.png
new file mode 100644
index 0000000..ed04853
Binary files /dev/null and b/software/cm/ansible/src/main/resources/ansible-logo.png differ
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/cm/salt/src/main/resources/saltstack-logo.png
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/main/resources/saltstack-logo.png b/software/cm/salt/src/main/resources/saltstack-logo.png
new file mode 100644
index 0000000..5238a56
Binary files /dev/null and b/software/cm/salt/src/main/resources/saltstack-logo.png differ
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/database/src/main/resources/crate-logo.png
----------------------------------------------------------------------
diff --git a/software/database/src/main/resources/crate-logo.png b/software/database/src/main/resources/crate-logo.png
new file mode 100644
index 0000000..2f11c44
Binary files /dev/null and b/software/database/src/main/resources/crate-logo.png differ
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java
index 1b54cdf..b77a411 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBroker.java
@@ -18,6 +18,7 @@
*/
package org.apache.brooklyn.entity.messaging.kafka;
+import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.entity.ImplementedBy;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
@@ -36,6 +37,7 @@ import org.apache.brooklyn.util.time.Duration;
/**
* An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Kafka broker instance.
*/
+@Catalog(name="Apache Kafka", iconUrl="classpath:///kafka-logo.png")
@ImplementedBy(KafkaBrokerImpl.class)
public interface KafkaBroker extends SoftwareProcess, MessageBroker, UsesJmx, Kafka {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java
index 14c1419..f2ade61 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/Storm.java
@@ -38,7 +38,8 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag;
*/
@Catalog(name="Storm Node", description="Apache Storm is a distributed realtime computation system. "
+ "Storm makes it easy to reliably process unbounded streams of data, doing for realtime processing "
- + "what Hadoop did for batch processing")
+ + "what Hadoop did for batch processing",
+ iconUrl="classpath:///apache-storm-logo.png")
@ImplementedBy(StormImpl.class)
public interface Storm extends SoftwareProcess, UsesJmx {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/messaging/src/main/resources/apache-storm-logo.png
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/apache-storm-logo.png b/software/messaging/src/main/resources/apache-storm-logo.png
new file mode 100644
index 0000000..570276e
Binary files /dev/null and b/software/messaging/src/main/resources/apache-storm-logo.png differ
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/messaging/src/main/resources/kafka-logo.png
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/kafka-logo.png b/software/messaging/src/main/resources/kafka-logo.png
new file mode 100644
index 0000000..507f71c
Binary files /dev/null and b/software/messaging/src/main/resources/kafka-logo.png differ
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/messaging/src/main/resources/zookeeper-logo.gif
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/zookeeper-logo.gif b/software/messaging/src/main/resources/zookeeper-logo.gif
new file mode 100644
index 0000000..4e8014f
Binary files /dev/null and b/software/messaging/src/main/resources/zookeeper-logo.gif differ
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java
----------------------------------------------------------------------
diff --git a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java
index b74c338..15646a7 100644
--- a/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java
+++ b/software/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/monit/MonitNode.java
@@ -34,7 +34,9 @@ import org.apache.brooklyn.core.sensor.Sensors;
import org.apache.brooklyn.entity.software.base.SoftwareProcess;
import org.apache.brooklyn.util.core.flags.SetFromFlag;
-@Catalog(name="Monit Node", description="Monit is a free open source utility for managing and monitoring, processes, programs, files, directories and filesystems on a UNIX system")
+@Catalog(name="Monit Node",
+ description="Monit is a free open source utility for managing and monitoring, processes, programs, files, directories and filesystems on a UNIX system",
+ iconUrl="classpath://monit-logo.png")
@ImplementedBy(MonitNodeImpl.class)
public interface MonitNode extends SoftwareProcess, HasShortName {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/monitoring/src/main/resources/monit-logo.png
----------------------------------------------------------------------
diff --git a/software/monitoring/src/main/resources/monit-logo.png b/software/monitoring/src/main/resources/monit-logo.png
new file mode 100644
index 0000000..7d9bce2
Binary files /dev/null and b/software/monitoring/src/main/resources/monit-logo.png differ
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java
index 8bde2f3..d1cdad1 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNode.java
@@ -39,7 +39,8 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag;
import org.apache.brooklyn.util.text.ByteSizeStrings;
@Catalog(name="CouchBase Node", description="Couchbase Server is an open source, distributed (shared-nothing architecture) "
- + "NoSQL document-oriented database that is optimized for interactive applications.")
+ + "NoSQL document-oriented database that is optimized for interactive applications.",
+ iconUrl="classpath://couchbase-logo.png")
@ImplementedBy(CouchbaseNodeImpl.class)
public interface CouchbaseNode extends SoftwareProcess {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakCluster.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakCluster.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakCluster.java
index e6de705..e7df1c0 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakCluster.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakCluster.java
@@ -36,7 +36,8 @@ import org.apache.brooklyn.util.time.Duration;
import com.google.common.reflect.TypeToken;
@Catalog(name="Riak Cluster", description="Riak is a distributed NoSQL key-value data store that offers "
- + "extremely high availability, fault tolerance, operational simplicity and scalability.")
+ + "extremely high availability, fault tolerance, operational simplicity and scalability.",
+ iconUrl="classpath://org/apache/brooklyn/entity/nosql/riak/riak.png")
@ImplementedBy(RiakClusterImpl.class)
public interface RiakCluster extends DynamicCluster {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/nosql/src/main/resources/hazelcast-logo.png
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/hazelcast-logo.png b/software/nosql/src/main/resources/hazelcast-logo.png
new file mode 100644
index 0000000..46624e7
Binary files /dev/null and b/software/nosql/src/main/resources/hazelcast-logo.png differ
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java
index 99f935b..f638483 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java
@@ -30,7 +30,7 @@ import org.apache.brooklyn.util.javalang.JavaClassNames;
/**
* An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Tomcat instance.
*/
-@Catalog(name="Tomcat Server",
+@Catalog(name="Tomcat 8 Server",
description="Apache Tomcat is an open source software implementation of the Java Servlet and JavaServer Pages technologies",
iconUrl="classpath:///tomcat-logo.png")
@ImplementedBy(Tomcat8ServerImpl.class)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java
index 93b7eb0..f71bd41 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java
@@ -39,7 +39,7 @@ import org.apache.brooklyn.util.time.Duration;
/**
* An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Tomcat instance.
*/
-@Catalog(name="Tomcat Server",
+@Catalog(name="Tomcat 7 Server",
description="Apache Tomcat is an open source software implementation of the Java Servlet and JavaServer Pages technologies",
iconUrl="classpath:///tomcat-logo.png")
@ImplementedBy(TomcatServerImpl.class)
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/5e2179a1/software/webapp/src/main/resources/geoscaling-logo.gif
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/resources/geoscaling-logo.gif b/software/webapp/src/main/resources/geoscaling-logo.gif
new file mode 100644
index 0000000..dd0ef9c
Binary files /dev/null and b/software/webapp/src/main/resources/geoscaling-logo.gif differ
[2/2] brooklyn-library git commit: This closes #50
Posted by al...@apache.org.
This closes #50
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/512f720d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/512f720d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/512f720d
Branch: refs/heads/master
Commit: 512f720dc0f849bb035f1a60fc1ab2f1f4d1bfea
Parents: 10fbecd 5e2179a
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 13 17:00:29 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 13 17:00:29 2016 +0100
----------------------------------------------------------------------
.../cm/ansible/src/main/resources/ansible-logo.png | Bin 0 -> 2040 bytes
.../cm/salt/src/main/resources/saltstack-logo.png | Bin 0 -> 14847 bytes
.../database/src/main/resources/crate-logo.png | Bin 0 -> 90348 bytes
.../entity/messaging/kafka/KafkaBroker.java | 2 ++
.../brooklyn/entity/messaging/storm/Storm.java | 3 ++-
.../src/main/resources/apache-storm-logo.png | Bin 0 -> 26889 bytes
.../messaging/src/main/resources/kafka-logo.png | Bin 0 -> 10648 bytes
.../src/main/resources/zookeeper-logo.gif | Bin 0 -> 4847 bytes
.../entity/monitoring/monit/MonitNode.java | 4 +++-
.../monitoring/src/main/resources/monit-logo.png | Bin 0 -> 19919 bytes
.../entity/nosql/couchbase/CouchbaseNode.java | 3 ++-
.../brooklyn/entity/nosql/riak/RiakCluster.java | 3 ++-
.../nosql/src/main/resources/hazelcast-logo.png | Bin 0 -> 2761 bytes
.../entity/webapp/tomcat/Tomcat8Server.java | 2 +-
.../entity/webapp/tomcat/TomcatServer.java | 2 +-
.../webapp/src/main/resources/geoscaling-logo.gif | Bin 0 -> 3088 bytes
16 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------