You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/02/21 12:35:02 UTC
[1/3] brooklyn-server git commit: transfer icons from catalog items
to entities
Repository: brooklyn-server
Updated Branches:
refs/heads/master ebcea30f9 -> 5cbfd5fab
transfer icons from catalog items to entities
and set icons on the common `server` and `cluster` items
previously while we do a lot to support icons and send detail via the API,
we don't _set_ them on entities unless explicitly in the definition.
since we often have them on catalog items, transferring them seems a sensible idea.
this adds two sample icons:
* server.svg from https://commons.wikimedia.org/wiki/File:Network-server.svg
originally from the Tango project, released into the public domain
* cluster.svg from Font Awesome, SVG definition of the "server" icon, MIT license
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d66f7c63
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d66f7c63
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d66f7c63
Branch: refs/heads/master
Commit: d66f7c63654022b4d473df37c4f481e1d2ef9993
Parents: 6571bab
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Feb 13 09:40:34 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Feb 21 12:23:11 2017 +0000
----------------------------------------------------------------------
.../brooklyn/spi/creation/CampResolver.java | 3 +
.../src/main/license/source-inclusions.yaml | 3 +
.../main/resources/brooklyn/default.catalog.bom | 4 +
.../main/resources/brooklyn/icons/cluster.svg | 1 +
.../main/resources/brooklyn/icons/server.svg | 933 +++++++++++++++++++
5 files changed, 944 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d66f7c63/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
index 64c917a..d8c4194 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampResolver.java
@@ -116,6 +116,9 @@ class CampResolver {
}
spec.catalogItemIdIfNotNull(item.getId());
+ if (!spec.getFlags().containsKey("iconUrl") && item.getIconUrl()!=null) {
+ spec.configure("iconUrl", item.getIconUrl());
+ }
if (spec instanceof EntitySpec) {
String name = spec.getDisplayName();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d66f7c63/server-cli/src/main/license/source-inclusions.yaml
----------------------------------------------------------------------
diff --git a/server-cli/src/main/license/source-inclusions.yaml b/server-cli/src/main/license/source-inclusions.yaml
index aab3212..6bcb0fd 100644
--- a/server-cli/src/main/license/source-inclusions.yaml
+++ b/server-cli/src/main/license/source-inclusions.yaml
@@ -22,3 +22,6 @@
- id: underscore.js:1.7.0
- id: typeahead.js
+- id: font-awesome-fonts
+- id: tango-project-icons
+
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d66f7c63/server-cli/src/main/resources/brooklyn/default.catalog.bom
----------------------------------------------------------------------
diff --git a/server-cli/src/main/resources/brooklyn/default.catalog.bom b/server-cli/src/main/resources/brooklyn/default.catalog.bom
index b32f75a..150242e 100644
--- a/server-cli/src/main/resources/brooklyn/default.catalog.bom
+++ b/server-cli/src/main/resources/brooklyn/default.catalog.bom
@@ -11,12 +11,14 @@ brooklyn.catalog:
- id: server
itemType: entity
+ iconUrl: classpath://brooklyn/icons/server.svg
description: |
Provision a server, with customizable provisioning.properties and credentials installed,
but no other special software process or scripts executed.
item:
type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess
name: Server
+ iconUrl: classpath://brooklyn/icons/server.svg
- id: vanilla-bash-server
itemType: entity
@@ -42,11 +44,13 @@ brooklyn.catalog:
- id: cluster
itemType: entity
+ iconUrl: classpath://brooklyn/icons/cluster.svg
description: |
Create a cluster of entities, resizable, with starting size "initialSize",
and using a spec supplied in the "memberSpec" key.
item:
type: org.apache.brooklyn.entity.group.DynamicCluster
+ iconUrl: classpath://brooklyn/icons/cluster.svg
- id: 1-server-template
itemType: template
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d66f7c63/server-cli/src/main/resources/brooklyn/icons/cluster.svg
----------------------------------------------------------------------
diff --git a/server-cli/src/main/resources/brooklyn/icons/cluster.svg b/server-cli/src/main/resources/brooklyn/icons/cluster.svg
new file mode 100644
index 0000000..a1f4c11
--- /dev/null
+++ b/server-cli/src/main/resources/brooklyn/icons/cluster.svg
@@ -0,0 +1 @@
+<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M128 1408h1024v-128h-1024v128zm0-512h1024v-128h-1024v128zm1568 448q0-40-28-68t-68-28-68 28-28 68 28 68 68 28 68-28 28-68zm-1568-960h1024v-128h-1024v128zm1568 448q0-40-28-68t-68-28-68 28-28 68 28 68 68 28 68-28 28-68zm0-512q0-40-28-68t-68-28-68 28-28 68 28 68 68 28 68-28 28-68zm96 832v384h-1792v-384h1792zm0-512v384h-1792v-384h1792zm0-512v384h-1792v-384h1792z"/></svg>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d66f7c63/server-cli/src/main/resources/brooklyn/icons/server.svg
----------------------------------------------------------------------
diff --git a/server-cli/src/main/resources/brooklyn/icons/server.svg b/server-cli/src/main/resources/brooklyn/icons/server.svg
new file mode 100644
index 0000000..0cc91ab
--- /dev/null
+++ b/server-cli/src/main/resources/brooklyn/icons/server.svg
@@ -0,0 +1,933 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ sodipodi:docname="network-server.svg"
+ sodipodi:docbase="/home/garrett/Source/tango-icon-theme/scalable/places"
+ inkscape:version="0.43+devel"
+ sodipodi:version="0.32"
+ id="svg1288"
+ height="48px"
+ width="48px">
+ <defs
+ id="defs3">
+ <linearGradient
+ id="linearGradient158">
+ <stop
+ style="stop-color:#686868;stop-opacity:0.0000000;"
+ offset="0.0000000"
+ id="stop159" />
+ <stop
+ style="stop-color:#686868;stop-opacity:1.0000000;"
+ offset="0.23762377"
+ id="stop162" />
+ <stop
+ style="stop-color:#686868;stop-opacity:1.0000000;"
+ offset="0.78109992"
+ id="stop163" />
+ <stop
+ style="stop-color:#686868;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop160" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient158"
+ id="linearGradient175"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.740165,0.000000,0.000000,0.364942,31.37799,-10.35269)"
+ x1="1.6422368"
+ y1="117.82710"
+ x2="15.343062"
+ y2="117.82710" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient272"
+ id="linearGradient283"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(8.168597,0.000000,0.000000,0.221210,31.37799,-48.27410)"
+ x1="0.61210024"
+ y1="372.57819"
+ x2="5.0856376"
+ y2="372.57819" />
+ <linearGradient
+ id="linearGradient272">
+ <stop
+ style="stop-color:#474747;stop-opacity:0.0000000;"
+ offset="0.0000000"
+ id="stop273" />
+ <stop
+ style="stop-color:#474747;stop-opacity:1.0000000;"
+ offset="0.10000000"
+ id="stop275" />
+ <stop
+ style="stop-color:#474747;stop-opacity:1.0000000;"
+ offset="0.89999998"
+ id="stop276" />
+ <stop
+ style="stop-color:#474747;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop274" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient272"
+ id="linearGradient271"
+ gradientTransform="matrix(8.168597,0.000000,0.000000,0.228621,31.37799,-46.26690)"
+ x1="0.61210024"
+ y1="372.57819"
+ x2="5.0856376"
+ y2="372.57819"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient178">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.0000000;"
+ offset="0.0000000"
+ id="stop179" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.70658684;"
+ offset="0.10827128"
+ id="stop180" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.70658684;"
+ offset="0.92053902"
+ id="stop181" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop182" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient178"
+ id="linearGradient177"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.740165,0.000000,0.000000,0.147685,31.37799,14.83313)"
+ x1="1.6422368"
+ y1="117.82710"
+ x2="15.343062"
+ y2="117.82710" />
+ <linearGradient
+ id="linearGradient4543"
+ inkscape:collect="always">
+ <stop
+ id="stop4545"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop4547"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4509">
+ <stop
+ style="stop-color:#000000;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop4511" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop4513" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4449"
+ inkscape:collect="always">
+ <stop
+ id="stop4451"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4453"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4420"
+ inkscape:collect="always">
+ <stop
+ id="stop4422"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4424"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4412"
+ inkscape:collect="always">
+ <stop
+ id="stop4414"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4416"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4400">
+ <stop
+ id="stop4402"
+ offset="0"
+ style="stop-color:#979797;stop-opacity:1;" />
+ <stop
+ id="stop4404"
+ offset="1.0000000"
+ style="stop-color:#c8c8c8;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4386">
+ <stop
+ id="stop4388"
+ offset="0.0000000"
+ style="stop-color:#d2d2d2;stop-opacity:1.0000000;" />
+ <stop
+ id="stop4390"
+ offset="1.0000000"
+ style="stop-color:#dfdfdf;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="translate(-5.088571e-7,0.404062)"
+ gradientUnits="userSpaceOnUse"
+ y2="10.018264"
+ x2="23.233509"
+ y1="34.463955"
+ x1="24.349752"
+ id="linearGradient4392"
+ xlink:href="#linearGradient4386"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="matrix(0.955932,0,0,1,0.869911,-3.2624e-15)"
+ gradientUnits="userSpaceOnUse"
+ y2="26.786800"
+ x2="22.311644"
+ y1="26.887815"
+ x1="27.324621"
+ id="linearGradient4418"
+ xlink:href="#linearGradient4412"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="matrix(0.955932,0,0,1,0.869911,-3.2624e-15)"
+ gradientUnits="userSpaceOnUse"
+ y2="26.786800"
+ x2="22.311644"
+ y1="26.887815"
+ x1="27.324621"
+ id="linearGradient4426"
+ xlink:href="#linearGradient4420"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(2.707105,-9.675149e-17)"
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4459"
+ xlink:href="#linearGradient4449"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(4.707105,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4463"
+ xlink:href="#linearGradient4449"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(6.707105,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4467"
+ xlink:href="#linearGradient4449"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(8.707105,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4471"
+ xlink:href="#linearGradient4449"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(10.70714,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4475"
+ xlink:href="#linearGradient4449"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(12.70714,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4479"
+ xlink:href="#linearGradient4449"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(1.61624,-4.996817e-17)"
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4495"
+ xlink:href="#linearGradient4509"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(3.61624,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4497"
+ xlink:href="#linearGradient4509"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(5.61624,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4499"
+ xlink:href="#linearGradient4509"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(7.61624,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4501"
+ xlink:href="#linearGradient4509"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(9.616235,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4503"
+ xlink:href="#linearGradient4509"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="30.928421"
+ x2="16.364470"
+ y1="39.918777"
+ x1="16.364470"
+ gradientTransform="translate(11.61632,-9.675149e-17)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4505"
+ xlink:href="#linearGradient4509"
+ inkscape:collect="always" />
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.394366,0,23.44202)"
+ r="14.344166"
+ fy="38.706596"
+ fx="23.536554"
+ cy="38.706596"
+ cx="23.536554"
+ id="radialGradient4549"
+ xlink:href="#linearGradient4543"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="117.82710"
+ x2="15.343062"
+ y1="117.82710"
+ x1="1.6422368"
+ gradientTransform="matrix(2.740165,0,0,0.364942,31.37799,-10.35269)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient5397"
+ xlink:href="#linearGradient158"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="372.57819"
+ x2="5.0856376"
+ y1="372.57819"
+ x1="0.61210024"
+ gradientTransform="matrix(8.168597,0,0,0.22121,31.37799,-48.2741)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient5399"
+ xlink:href="#linearGradient272"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="372.57819"
+ x2="5.0856376"
+ y1="372.57819"
+ x1="0.61210024"
+ gradientTransform="matrix(8.168597,0,0,0.228621,31.37799,-46.2669)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient5401"
+ xlink:href="#linearGradient272"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="117.82710"
+ x2="15.343062"
+ y1="117.82710"
+ x1="1.6422368"
+ gradientTransform="matrix(2.740165,0,0,0.147685,31.37799,14.83313)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient5403"
+ xlink:href="#linearGradient178"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4386"
+ id="linearGradient4060"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-5.088571e-7,0.404062)"
+ x1="24.349752"
+ y1="34.463955"
+ x2="23.233509"
+ y2="10.018264" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4420"
+ id="linearGradient4062"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.955932,0,0,1,0.869911,-3.344366e-15)"
+ x1="27.324621"
+ y1="26.887815"
+ x2="22.311644"
+ y2="26.786800" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4412"
+ id="linearGradient4064"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.955932,0,0,1,0.869911,-3.344366e-15)"
+ x1="27.324621"
+ y1="26.887815"
+ x2="22.311644"
+ y2="26.786800" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4449"
+ id="linearGradient4066"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(2.707105,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4449"
+ id="linearGradient4068"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(4.707105,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4449"
+ id="linearGradient4070"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(6.707105,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4449"
+ id="linearGradient4072"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(8.707105,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4449"
+ id="linearGradient4074"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(10.70714,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4449"
+ id="linearGradient4076"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(12.70714,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4509"
+ id="linearGradient4078"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.61624,-9.675149e-17)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4509"
+ id="linearGradient4080"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(3.61624,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4509"
+ id="linearGradient4082"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(5.61624,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4509"
+ id="linearGradient4084"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(7.61624,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4509"
+ id="linearGradient4086"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(9.616235,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4509"
+ id="linearGradient4088"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(11.61632,-1.435348e-16)"
+ x1="16.364470"
+ y1="39.918777"
+ x2="16.364470"
+ y2="30.928421" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:showpageshadow="false"
+ showborder="true"
+ inkscape:window-y="152"
+ inkscape:window-x="399"
+ inkscape:window-height="796"
+ inkscape:window-width="893"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showgrid="true"
+ inkscape:current-layer="layer1"
+ inkscape:cy="24.461933"
+ inkscape:cx="31.288281"
+ inkscape:zoom="10.54135"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="0.6627451"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ gridempspacing="4" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Server</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by/2.0/" />
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>server</rdf:li>
+ <rdf:li>daemon</rdf:li>
+ <rdf:li>comupetr</rdf:li>
+ <rdf:li>lan</rdf:li>
+ <rdf:li>service</rdf:li>
+ <rdf:li>provider</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Garrett LeSage</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Attribution" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ inkscape:label="Layer 1"
+ id="layer1">
+ <path
+ d="M 37.88072 38.706596 A 14.344166 5.6568542 0 1 1 9.1923885,38.706596 A 14.344166 5.6568542 0 1 1 37.88072 38.706596 z"
+ sodipodi:ry="5.6568542"
+ sodipodi:rx="14.344166"
+ sodipodi:cy="38.706596"
+ sodipodi:cx="23.536554"
+ id="path4541"
+ style="opacity:0.41;color:#000000;fill:url(#radialGradient4549);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc"
+ transform="matrix(1,0,0,0.879487,0,6.982922)"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <g
+ transform="matrix(1.258807,0,0,0.690294,-44.79288,2.083157)"
+ style="opacity:0.63428566"
+ id="g5391"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true">
+ <rect
+ y="30.647318"
+ x="36.377991"
+ height="4"
+ width="36.542522"
+ id="rect69"
+ style="color:#000000;fill:url(#linearGradient5397);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <rect
+ y="33.649292"
+ x="36.377991"
+ height="0.98959237"
+ width="36.542522"
+ id="rect255"
+ style="color:#000000;fill:url(#linearGradient5399);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <rect
+ y="30.301344"
+ x="36.377991"
+ height="1.022747"
+ width="36.542522"
+ id="rect250"
+ style="color:#000000;fill:url(#linearGradient5401);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <rect
+ y="31.425039"
+ x="36.377991"
+ height="1.6187184"
+ width="36.542522"
+ id="rect176"
+ style="color:#000000;fill:url(#linearGradient5403);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ </g>
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;color:#000000;fill:#eaeaea;fill-opacity:1;fill-rule:evenodd;stroke:#8a8a8a;stroke-width:1.08591425;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path5405"
+ sodipodi:cx="66.013466"
+ sodipodi:cy="26.231213"
+ sodipodi:rx="2.171828"
+ sodipodi:ry="2.171828"
+ d="M 68.185294 26.231213 A 2.171828 2.171828 0 1 1 63.841638,26.231213 A 2.171828 2.171828 0 1 1 68.185294 26.231213 z"
+ transform="matrix(0.920883,0,0,0.920883,-26.29068,0.344117)"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <g
+ id="g4034"
+ transform="translate(0,0.999994)"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true">
+ <path
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(1.001723,0,0,1.000481,1.180323e-2,-5.49963e-2)"
+ style="fill:url(#linearGradient4060);fill-opacity:1;fill-rule:evenodd;stroke:#5e5e5e;stroke-width:0.99889958px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+ d="M 12.466718,7.9979592 L 12.466718,41.535025 L 34.42887,41.535025 L 34.42887,7.7959287 L 30.38826,3.553288 L 16.305298,3.553288 L 12.466718,7.9979592 z "
+ id="path3626"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(1.035211,0,0,1.029412,-0.457741,-0.117647)"
+ style="fill:#ffffff;fill-opacity:0.65536726;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 16.428571,4 L 13,8.8571429 L 33.285714,8.8571429 L 29.571429,4.1428571 L 16.428571,4 z "
+ id="path5791" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(1.025575,0,0,0.942809,-0.872163,0.354403)"
+ y="11.291361"
+ x="16.451418"
+ height="4.242641"
+ width="15.601009"
+ id="rect4553"
+ style="opacity:0.34857142;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.01696146;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(1.008958,0,0,1.005055,-8.577756e-2,-0.107362)"
+ id="path4394"
+ d="M 13.465157,8.6221002 L 13.465157,40.403124 L 33.287596,40.403124 L 33.287596,8.4385591 L 29.616774,4.5841958 L 16.952438,4.5841958 L 13.465157,8.6221002 z "
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99304473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:nodetypes="ccccccc" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(1.009445,0,0,0.793359,-0.745308,5.309442)"
+ y="23.558765"
+ x="21.541845"
+ height="5.0418525"
+ width="10.897081"
+ id="rect4408"
+ style="opacity:0.52571429;color:#000000;fill:url(#linearGradient4062);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4064);stroke-width:1.11743951;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(1.052742,0,0,0.942809,-1.366425,1.388024)"
+ style="opacity:1;color:#000000;fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#acacac;stroke-width:1.00375366;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4398"
+ width="10.4489"
+ height="4.242641"
+ x="20.770918"
+ y="23.453293" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(1.025575,0,0,0.942809,-0.872158,0.697549)"
+ style="opacity:0.34857142;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.01696134;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4551"
+ width="15.601009"
+ height="4.242641"
+ x="16.451418"
+ y="17.291361" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(1.013244,0,0,0.942809,-0.15194,1.054691)"
+ y="16.382225"
+ x="15.447355"
+ height="4.242641"
+ width="15.790874"
+ id="rect4430"
+ style="opacity:1;color:#000000;fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#acacac;stroke-width:1.02313101;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(1.013244,0,0,0.942809,-0.151932,0.711545)"
+ style="opacity:1;color:#000000;fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#acacac;stroke-width:1.02313089;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4436"
+ width="15.790874"
+ height="4.242641"
+ x="15.447355"
+ y="10.382225" />
+ <g
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.885784,0,0,0.892968,2.129727,2.884785)"
+ id="g3980">
+ <path
+ transform="matrix(0.779806,0,0,0.773527,-34.68981,5.595099)"
+ d="M 68.185294 26.231213 A 2.171828 2.171828 0 1 1 63.841638,26.231213 A 2.171828 2.171828 0 1 1 68.185294 26.231213 z"
+ sodipodi:ry="2.171828"
+ sodipodi:rx="2.171828"
+ sodipodi:cy="26.231213"
+ sodipodi:cx="66.013466"
+ id="path4396"
+ style="opacity:1;color:#000000;fill:#c8c8c8;fill-opacity:1;fill-rule:evenodd;stroke:#979797;stroke-width:1.44772947;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <path
+ d="M 16.667518 25.574614 A 0.50507629 0.50507629 0 1 1 15.657365,25.574614 A 0.50507629 0.50507629 0 1 1 16.667518 25.574614 z"
+ sodipodi:ry="0.50507629"
+ sodipodi:rx="0.50507629"
+ sodipodi:cy="25.574614"
+ sodipodi:cx="16.162441"
+ id="path4445"
+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc"
+ transform="matrix(1.008603,0,0,1.000481,-7.396387e-2,-5.49963e-2)"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ </g>
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.120113,0.482425)"
+ y="29.817253"
+ x="19.071575"
+ height="10.101525"
+ width="1.0101526"
+ id="rect4457"
+ style="opacity:1;color:#000000;fill:url(#linearGradient4066);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.140205,0.482425)"
+ style="opacity:1;color:#000000;fill:url(#linearGradient4068);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4461"
+ width="1.0101526"
+ height="10.101525"
+ x="21.071575"
+ y="29.817253" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.160306,0.482425)"
+ y="29.817253"
+ x="23.071575"
+ height="10.101525"
+ width="1.0101526"
+ id="rect4465"
+ style="opacity:1;color:#000000;fill:url(#linearGradient4070);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.180407,0.482425)"
+ style="opacity:1;color:#000000;fill:url(#linearGradient4072);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4469"
+ width="1.0101526"
+ height="10.101525"
+ x="25.071575"
+ y="29.817253" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.200521,0.482425)"
+ y="29.817253"
+ x="27.071575"
+ height="10.101525"
+ width="1.0101526"
+ id="rect4473"
+ style="opacity:1;color:#000000;fill:url(#linearGradient4074);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.220623,0.482425)"
+ style="opacity:0.54285709;color:#000000;fill:url(#linearGradient4076);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4477"
+ width="1.0101526"
+ height="10.101525"
+ x="29.071575"
+ y="29.817253" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.200001,0.482425)"
+ y="29.817253"
+ x="17.980711"
+ height="10.101525"
+ width="1.0101526"
+ id="rect4481"
+ style="opacity:0.16000001;color:#000000;fill:url(#linearGradient4078);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.220115,0.482425)"
+ style="opacity:0.29142851;color:#000000;fill:url(#linearGradient4080);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4483"
+ width="1.0101526"
+ height="10.101525"
+ x="19.980711"
+ y="29.817253" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.240217,0.482425)"
+ y="29.817253"
+ x="21.980711"
+ height="10.101525"
+ width="1.0101526"
+ id="rect4485"
+ style="opacity:0.29142851;color:#000000;fill:url(#linearGradient4082);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.260319,0.482425)"
+ style="opacity:0.29142851;color:#000000;fill:url(#linearGradient4084);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4487"
+ width="1.0101526"
+ height="10.101525"
+ x="23.980711"
+ y="29.817253" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.280409,0.482425)"
+ y="29.817253"
+ x="25.980711"
+ height="10.101525"
+ width="1.0101526"
+ id="rect4489"
+ style="opacity:0.29142851;color:#000000;fill:url(#linearGradient4086);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ inkscape:r_cy="true"
+ inkscape:r_cx="true"
+ transform="matrix(0.989949,0,0,0.98995,0.30051,0.482425)"
+ style="opacity:0.22857145;color:#000000;fill:url(#linearGradient4088);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4491"
+ width="1.0101526"
+ height="10.101525"
+ x="27.980711"
+ y="29.817253" />
+ </g>
+ </g>
+</svg>
[2/3] brooklyn-server git commit: This closes #557
Posted by he...@apache.org.
This closes #557
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d6760d3d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d6760d3d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d6760d3d
Branch: refs/heads/master
Commit: d6760d3d5916eb93f1f905b11631c0ad319d083d
Parents: ebcea30 d66f7c6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Feb 21 12:33:21 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Feb 21 12:33:21 2017 +0000
----------------------------------------------------------------------
.../brooklyn/spi/creation/CampResolver.java | 3 +
.../src/main/license/source-inclusions.yaml | 3 +
.../main/resources/brooklyn/default.catalog.bom | 4 +
.../main/resources/brooklyn/icons/cluster.svg | 1 +
.../main/resources/brooklyn/icons/server.svg | 933 +++++++++++++++++++
5 files changed, 944 insertions(+)
----------------------------------------------------------------------
[3/3] brooklyn-server git commit: update LICENSE files with latest
changes
Posted by he...@apache.org.
update LICENSE files with latest changes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5cbfd5fa
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5cbfd5fa
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5cbfd5fa
Branch: refs/heads/master
Commit: 5cbfd5fab5799caa2b9515e37fafff93e164547a
Parents: d6760d3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Feb 21 12:33:27 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Feb 21 12:33:27 2017 +0000
----------------------------------------------------------------------
LICENSE | 8 +++++++-
server-cli/src/main/license/files/LICENSE | 13 +++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5cbfd5fa/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ba06157..22142e1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -230,7 +230,7 @@ This project includes the software: Font Awesome (code)
This project includes the software: Font Awesome (fonts)
Available at: http://fontawesome.io/
- Inclusive of: font-awesome/fonts/*
+ Inclusive of: font-awesome/fonts/* cluster.svg
Version used: 4.5.0
Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
Copyright (c) Dave Gandy (2016)
@@ -387,6 +387,12 @@ This project includes the software: Swagger UI
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) SmartBear Software (2011-2015)
+This project includes the software: Tango Project Icons
+ Available at: https://commons.wikimedia.org/wiki/File:Network-server.svg
+ Inclusive of: server.svg
+ Used under the following license: Public Domain (https://en.wikipedia.org/wiki/en:public_domain)
+ Released into the public domain by the people from the Tango! project (The Tango! Desktop Project), via Wikimedia Commons
+
This project includes the software: typeahead.js
Available at: https://github.com/twitter/typeahead.js
Developed by: Twitter, Inc (http://twitter.com)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5cbfd5fa/server-cli/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/server-cli/src/main/license/files/LICENSE b/server-cli/src/main/license/files/LICENSE
index 2a36072..9e1284e 100644
--- a/server-cli/src/main/license/files/LICENSE
+++ b/server-cli/src/main/license/files/LICENSE
@@ -194,6 +194,19 @@ Contents:
(2) Notices for bundled software
+This project includes the software: Font Awesome (fonts)
+ Available at: http://fontawesome.io/
+ Inclusive of: font-awesome/fonts/* cluster.svg
+ Version used: 4.5.0
+ Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+ Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Tango Project Icons
+ Available at: https://commons.wikimedia.org/wiki/File:Network-server.svg
+ Inclusive of: server.svg
+ Used under the following license: Public Domain (https://en.wikipedia.org/wiki/en:public_domain)
+ Released into the public domain by the people from the Tango! project (The Tango! Desktop Project), via Wikimedia Commons
+
This project includes the software: typeahead.js
Available at: https://github.com/twitter/typeahead.js
Developed by: Twitter, Inc (http://twitter.com)