changeset 1730:87aa5f83f8d9

Move some packaging related files in distribution. Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-April/013625.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Wed, 29 Apr 2015 16:42:09 +0200
parents 7a57639973ab
children ee6a994a4a12
files distribution/bash-completion/thermostat-completion distribution/desktop/thermostat.desktop distribution/docs/thermostat.1 distribution/icons/16px.png distribution/icons/256px.png distribution/icons/256px.svg distribution/icons/32px.png distribution/icons/64px.png distribution/packaging/shared/bash-completion/thermostat-completion distribution/packaging/shared/desktop/thermostat.desktop distribution/packaging/shared/icons/16px.png distribution/packaging/shared/icons/256px.png distribution/packaging/shared/icons/256px.svg distribution/packaging/shared/icons/32px.png distribution/packaging/shared/icons/64px.png distribution/packaging/shared/man/thermostat.1 distribution/packaging/shared/systemd/thermostat-agent.service distribution/packaging/shared/systemd/thermostat-storage.service distribution/packaging/shared/systemd/tmpfiles.d/thermostat.conf distribution/pom.xml distribution/systemd/thermostat-agent.service distribution/systemd/thermostat-storage.service distribution/systemd/tmpfiles.d/thermostat.conf
diffstat 23 files changed, 345 insertions(+), 347 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/bash-completion/thermostat-completion	Thu Apr 02 18:21:18 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#/bin/bash
-_thermostat() 
-{
-    local cur prev opts base
-    local thermostat_install_dir
-    thermostat_install_dir="${thermostat.home}"
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    # Thermostat Options
-    opts="$(${thermostat_install_dir}/bin/thermostat help | cut -d " " -f 2 | tr '\n' ' ' | cut -d " " -f 3-)"
-
-    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))  
-    return 0
-}
-complete -F _thermostat thermostat
--- a/distribution/desktop/thermostat.desktop	Thu Apr 02 18:21:18 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Thermostat
-Comment=A monitoring and serviceability tool for OpenJDK
-Exec=${thermostat.home}/bin/thermostat gui
-Icon=thermostat
--- a/distribution/docs/thermostat.1	Thu Apr 02 18:21:18 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-.\" man page for thermostat
-
-.TH THERMOSTAT 1
-
-.\"
-.\" File Name macro.
-.\"
-.de FN
-\fI\|\\$1\|\fP
-..
-
-.SH NAME
-thermostat \- A monitoring and serviceability tool for OpenJDK
-
-.SH SYNOPSIS
-.B "thermostat"
-[
-.I global_options
-]
-.I "command"
-[
-.I command_options
-]
-[
-.I command_arguments
-]
-.br
-.B "thermostat"
-.B "help"
-.br
-.B "thermostat"
-.B "help"
-.I "command"
-
-.SH DESCRIPTION
-Thermostat is an instrumentation tool for the Hotspot JVM, with support for
-monitoring multiple JVM instances on multiple hosts, optionally in a cloud
-environment. The name Thermostat is intended as a play on words: Thermostat is
-to Hotspot much as IcedTea is to Java.
-.br
-Some goals of Thermostat are:
-.IP \[bu] 2
-We want a tool that allows users of IcedTea/OpenJDK to monitor running JVMs, especially remote JVMs.
-.IP \[bu]
-Both high level (uptime, cpu and memory usage) and low level (including hotspot's perf data) information should be available through the tool.
-.IP \[bu]
-The tool should be usable in a production environment, with minimal overhead.
-
-.SH OPTIONS
-.SS "Global Options"
-  --print-osgi-info     Print debug information related to the OSGi framework's
-                        boot/shutdown process.
-  --ignore-bundle-versions
-                        Ignore exact bundle versions and use whatever version is
-                        available.
-  --boot-delegation     Boot delegation string passed on to the OSGi framework.
-                        Defaults to
-                        "com.redhat.thermostat.vm.profiler.agent.jvm,org.objectweb.asm,org.objectweb.asm.commons"
-
-.SS "Command Options and Command Arguments"
-Please see 
-.B "thermostat help"
-.I "command"
-for options and arguments for a
-.I command.
-
-.SH "COMMAND OVERVIEW"
-.SS "thermostat help"
-  show help for a given command or help overview
-.SS "thermostat storage <--start|--stop|--status> [--dryRun] [-q] [-l <level>]"
-  control Thermostat mongodb storage
-.SS "thermostat agent [-d <url>] [-s] [-l <level>]"
-  starts the Thermostat agent
-.SS "thermostat gui [-l <level>]"
-  starts the graphical user interface client
-.SS "thermostat shell"
-  starts the Thermostat interactive shell
-.SS "thermostat web-storage-service"
-  starts mongodb storage, an embedded servlet container and an agent
-
-.SH "COMMAND REFERENCE"
-Please see "\fBthermostat help\fP \fIcommand\fP" for detailed options and arguments of each command.
-"\fBthermostat help\fP", without a specific command argument, lists all available commands.
-
-.SH "FILES"
-.PD 0
-.TP
-.FN THERMOSTAT_HOME/etc/db.properties
-System configuration for mongodb storage
-.TP
-.FN USER_THERMOSTAT_HOME/etc/db.properties
-User specific configuration for mongodb storage. Overrides system configuration.
-.TP
-.FN THERMOSTAT_HOME/etc/agent.properties
-System configuration for agent
-.TP
-.FN USER_THERMOSTAT_HOME/etc/agent.properties
-User specific configuration for agent. Overrides system configuration.
-.TP
-.FN USER_THERMOSTAT_HOME/etc/agent.auth
-User specific storage connection credentials configuration for agent.
-.TP
-.FN THERMOSTAT_HOME/etc/ssl.properties
-System configuration for TLS
-.TP
-.FN USER_THERMOSTAT_HOME/etc/ssl.properties
-User specific configuration for TLS.
-
-.SH "BUGS REPORTS"
-If you think you've found a bug in thermostat please make sure that it really is a bug, and that it appears in the latest version of thermostat.
-The latest version is always  available from
-.UR "http://icedtea.classpath.org/hg/thermostat/"
-.BR "http://icedtea.classpath.org/hg/thermostat/".
-You can file thermostat bugs at:
-.UR "http://icedtea.classpath.org/bugzilla/"
-.BR "http://icedtea.classpath.org/bugzilla/"
-
-.SH "SEE ALSO"
-.UR "http://icedtea.classpath.org/thermostat/"
-.BR "http://icedtea.classpath.org/thermostat/"
-.br
-.UR "http://icedtea.classpath.org/wiki/Thermostat/UserGuide"
-.BR "http://icedtea.classpath.org/wiki/Thermostat/UserGuide"
Binary file distribution/icons/16px.png has changed
Binary file distribution/icons/256px.png has changed
--- a/distribution/icons/256px.svg	Thu Apr 02 18:21:18 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="256px" height="239px" viewBox="0 0 256 239" enable-background="new 0 0 256 239" xml:space="preserve">
-<g>
-	<path fill="#27426E" d="M171.216,63.249l-7.969-6.534c-3.45-6.771-4.804-17.586-4.993-19.245l0.077-0.199
-		c0,0-0.04,0.033-0.092,0.085c-0.009-0.066-0.013-0.126-0.013-0.126l-0.088,0.188c-1.3,1.044-9.882,7.76-17.104,10.132l-9.32-0.891
-		C90.089,39.456,47.238,60.764,28.883,100.99c-21.833,47.86-0.739,104.357,47.114,126.19c47.856,21.839,104.35,0.736,126.189-47.113
-		C221.383,137.994,207.393,89.256,171.216,63.249z"/>
-	<path fill="#3970AF" d="M180.998,145.492c-14.127,30.951-50.674,44.602-81.634,30.476c-30.956-14.124-44.599-50.671-30.477-81.634
-		c14.125-30.956,50.671-44.604,81.633-30.479C181.472,77.982,195.12,114.535,180.998,145.492z"/>
-	<path fill="#FFFFFF" d="M176.652,139.925c-12.713,27.858-45.605,40.143-73.467,27.428c-27.859-12.71-40.143-45.602-27.43-73.464
-		c12.714-27.862,45.603-40.14,73.463-27.43C177.084,79.175,189.364,112.067,176.652,139.925z"/>
-	<path fill="#3970AF" d="M155.37,69.061l7.877,2.61l-6.336-5.233c-2.597-5.138-3.613-13.294-3.762-14.556l0.058-0.148
-		c0,0-0.033,0.033-0.071,0.059c-0.009-0.059-0.013-0.092-0.013-0.092l-0.064,0.148c-0.987,0.788-7.512,5.884-12.993,7.692
-		l-8.125-0.782l7.445,3.597l-13.183,54.553L155.37,69.061z"/>
-</g>
-<g>
-	<path fill="#27426E" d="M24.663,69.352L9.28,58.285c-0.502-0.355-1.312-0.789-2.346-0.789c-1.238,0-2.347,0.608-3.136,1.709
-		c-0.819,1.144-1.027,2.432-0.575,3.633c0.345,0.919,0.98,1.518,1.448,1.855l15.39,11.079c0.7,0.492,1.498,0.754,2.301,0.754
-		c1.249,0,2.41-0.607,3.176-1.678C26.868,73.001,26.502,70.693,24.663,69.352z"/>
-	<path fill="#27426E" d="M41.319,51.957L28.596,37.903c-0.783-0.869-1.811-1.344-2.895-1.344c-0.666,0-1.672,0.189-2.664,1.083
-		c-1.702,1.537-1.824,3.881-0.301,5.555l12.733,14.059c0.773,0.856,1.793,1.326,2.878,1.326c0.967,0,1.919-0.378,2.678-1.071
-		c1.046-0.944,1.525-2.217,1.316-3.492C42.19,53.075,41.702,52.375,41.319,51.957z"/>
-	<path fill="#27426E" d="M51.843,21.981c-1.099-1.907-3.421-2.559-5.387-1.415c-1.97,1.133-2.582,3.393-1.456,5.366l9.501,16.413
-		c0.714,1.248,1.963,1.985,3.337,1.985c0.695,0,1.408-0.197,2.045-0.566c1.225-0.709,1.961-1.849,2.02-3.137
-		c0.051-0.957-0.279-1.745-0.561-2.23L51.843,21.981z"/>
-	<path fill="#27426E" d="M77.789,11.296c-0.682-2.104-2.798-3.222-4.977-2.504c-1.359,0.441-2.029,1.297-2.351,1.93
-		c-0.462,0.912-0.522,1.989-0.183,3.015l5.879,18.038c0.538,1.645,1.975,2.715,3.664,2.715c0.439,0,0.878-0.067,1.312-0.215
-		c2.167-0.707,3.235-2.789,2.535-4.948L77.789,11.296z"/>
-	<path fill="#27426E" d="M105.424,6.226c-0.22-2.062-1.799-3.5-3.836-3.5l-0.503,0.025c-2.272,0.244-3.746,2.053-3.511,4.312
-		l2,18.858c0.222,2.064,1.816,3.505,3.877,3.505l0.466-0.027c1.4-0.147,2.542-0.896,3.121-2.047
-		c0.435-0.853,0.451-1.708,0.392-2.267L105.424,6.226z"/>
-	<path fill="#27426E" d="M130.039,2.741l-0.495-0.022c-2.045,0-3.625,1.445-3.842,3.507L123.7,25.078
-		c-0.238,2.226,1.274,4.074,3.518,4.314l0.502,0.034c2.038,0,3.616-1.449,3.838-3.512l1.997-18.858
-		C133.791,4.805,132.316,2.989,130.039,2.741z"/>
-	<path fill="#27426E" d="M158.284,8.807c-2.157-0.707-4.278,0.394-4.971,2.49l-5.91,18.015c-0.693,2.118,0.391,4.256,2.536,4.963
-		c0.463,0.147,0.914,0.219,1.363,0.219c1.672,0,3.051-1.041,3.605-2.719l5.906-18.01c0.178-0.534,0.336-1.375,0.097-2.301
-		C160.581,10.218,159.628,9.252,158.284,8.807z"/>
-	<path fill="#27426E" d="M184.633,20.582c-1.964-1.143-4.29-0.486-5.378,1.414l-9.504,16.419c-1.113,1.937-0.483,4.241,1.463,5.375
-		c0.674,0.384,1.37,0.573,2.069,0.573c1.35,0,2.587-0.749,3.307-1.996l9.498-16.419c0.553-0.952,0.711-2.015,0.452-3
-		C186.351,22.259,185.874,21.289,184.633,20.582z"/>
-	<path fill="#27426E" d="M209.381,40.371c-0.034-0.715-0.3-1.766-1.362-2.729c-0.992-0.904-1.996-1.095-2.667-1.095
-		c-1.076,0-2.096,0.479-2.891,1.341L189.732,51.95c-0.724,0.795-1.097,1.799-1.044,2.817c0.049,1.037,0.525,2.007,1.338,2.744
-		c0.996,0.897,2.001,1.086,2.668,1.086c1.083,0,2.111-0.484,2.889-1.349l12.724-14.044
-		C209.048,42.393,209.425,41.388,209.381,40.371z"/>
-	<path fill="#27426E" d="M228.095,62.211c0.122-0.707,0.083-1.79-0.752-2.947c-0.791-1.104-1.91-1.704-3.141-1.704
-		c-1.035,0-1.838,0.419-2.347,0.782l-15.404,11.07c-0.875,0.622-1.447,1.519-1.614,2.529c-0.168,1.02,0.095,2.071,0.728,2.96
-		c0.798,1.101,1.911,1.708,3.149,1.708c1.026,0,1.838-0.426,2.343-0.789l15.404-11.061
-		C227.354,64.118,227.937,63.215,228.095,62.211z"/>
-	<path fill="#27426E" d="M241.386,88.03c0.707-1.074,0.797-2.429,0.23-3.722c-0.66-1.503-1.97-2.4-3.503-2.4
-		c-0.71,0-1.298,0.188-1.679,0.356l-17.361,7.625c-0.986,0.426-1.729,1.189-2.098,2.145c-0.376,0.962-0.339,2.044,0.1,3.041
-		c0.658,1.503,1.967,2.408,3.495,2.408c0.558,0,1.138-0.122,1.681-0.363l17.359-7.625C240.128,89.264,240.858,88.83,241.386,88.03z"
-		/>
-	<path fill="#27426E" d="M228.82,120.394l18.563-3.862c1.08-0.223,1.97-0.809,2.529-1.66c0.398-0.592,0.8-1.597,0.511-3.011
-		c-0.398-1.911-1.875-3.152-3.757-3.152c-0.301,0-0.604,0.029-0.881,0.089l-18.576,3.854c-2.18,0.46-3.483,2.463-3.026,4.668
-		c0.399,1.919,1.875,3.155,3.753,3.155C228.227,120.476,228.522,120.448,228.82,120.394z"/>
-	<path fill="#27426E" d="M252.19,137.763c-0.713-0.721-1.713-1.119-2.81-1.132l-18.98-0.113c-2.214,0-3.898,1.685-3.916,3.917
-		c-0.008,1.429,0.586,2.335,1.084,2.845c0.719,0.72,1.71,1.126,2.813,1.126l18.981,0.119c2.251,0,3.896-1.65,3.909-3.917
-		C253.286,139.175,252.692,138.275,252.19,137.763z"/>
-</g>
-</svg>
Binary file distribution/icons/32px.png has changed
Binary file distribution/icons/64px.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distribution/packaging/shared/bash-completion/thermostat-completion	Wed Apr 29 16:42:09 2015 +0200
@@ -0,0 +1,17 @@
+#/bin/bash
+_thermostat() 
+{
+    local cur prev opts base
+    local thermostat_install_dir
+    thermostat_install_dir="${thermostat.home}"
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    # Thermostat Options
+    opts="$(${thermostat_install_dir}/bin/thermostat help | cut -d " " -f 2 | tr '\n' ' ' | cut -d " " -f 3-)"
+
+    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))  
+    return 0
+}
+complete -F _thermostat thermostat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distribution/packaging/shared/desktop/thermostat.desktop	Wed Apr 29 16:42:09 2015 +0200
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Thermostat
+Comment=A monitoring and serviceability tool for OpenJDK
+Exec=${thermostat.home}/bin/thermostat gui
+Icon=thermostat
Binary file distribution/packaging/shared/icons/16px.png has changed
Binary file distribution/packaging/shared/icons/256px.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distribution/packaging/shared/icons/256px.svg	Wed Apr 29 16:42:09 2015 +0200
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="256px" height="239px" viewBox="0 0 256 239" enable-background="new 0 0 256 239" xml:space="preserve">
+<g>
+	<path fill="#27426E" d="M171.216,63.249l-7.969-6.534c-3.45-6.771-4.804-17.586-4.993-19.245l0.077-0.199
+		c0,0-0.04,0.033-0.092,0.085c-0.009-0.066-0.013-0.126-0.013-0.126l-0.088,0.188c-1.3,1.044-9.882,7.76-17.104,10.132l-9.32-0.891
+		C90.089,39.456,47.238,60.764,28.883,100.99c-21.833,47.86-0.739,104.357,47.114,126.19c47.856,21.839,104.35,0.736,126.189-47.113
+		C221.383,137.994,207.393,89.256,171.216,63.249z"/>
+	<path fill="#3970AF" d="M180.998,145.492c-14.127,30.951-50.674,44.602-81.634,30.476c-30.956-14.124-44.599-50.671-30.477-81.634
+		c14.125-30.956,50.671-44.604,81.633-30.479C181.472,77.982,195.12,114.535,180.998,145.492z"/>
+	<path fill="#FFFFFF" d="M176.652,139.925c-12.713,27.858-45.605,40.143-73.467,27.428c-27.859-12.71-40.143-45.602-27.43-73.464
+		c12.714-27.862,45.603-40.14,73.463-27.43C177.084,79.175,189.364,112.067,176.652,139.925z"/>
+	<path fill="#3970AF" d="M155.37,69.061l7.877,2.61l-6.336-5.233c-2.597-5.138-3.613-13.294-3.762-14.556l0.058-0.148
+		c0,0-0.033,0.033-0.071,0.059c-0.009-0.059-0.013-0.092-0.013-0.092l-0.064,0.148c-0.987,0.788-7.512,5.884-12.993,7.692
+		l-8.125-0.782l7.445,3.597l-13.183,54.553L155.37,69.061z"/>
+</g>
+<g>
+	<path fill="#27426E" d="M24.663,69.352L9.28,58.285c-0.502-0.355-1.312-0.789-2.346-0.789c-1.238,0-2.347,0.608-3.136,1.709
+		c-0.819,1.144-1.027,2.432-0.575,3.633c0.345,0.919,0.98,1.518,1.448,1.855l15.39,11.079c0.7,0.492,1.498,0.754,2.301,0.754
+		c1.249,0,2.41-0.607,3.176-1.678C26.868,73.001,26.502,70.693,24.663,69.352z"/>
+	<path fill="#27426E" d="M41.319,51.957L28.596,37.903c-0.783-0.869-1.811-1.344-2.895-1.344c-0.666,0-1.672,0.189-2.664,1.083
+		c-1.702,1.537-1.824,3.881-0.301,5.555l12.733,14.059c0.773,0.856,1.793,1.326,2.878,1.326c0.967,0,1.919-0.378,2.678-1.071
+		c1.046-0.944,1.525-2.217,1.316-3.492C42.19,53.075,41.702,52.375,41.319,51.957z"/>
+	<path fill="#27426E" d="M51.843,21.981c-1.099-1.907-3.421-2.559-5.387-1.415c-1.97,1.133-2.582,3.393-1.456,5.366l9.501,16.413
+		c0.714,1.248,1.963,1.985,3.337,1.985c0.695,0,1.408-0.197,2.045-0.566c1.225-0.709,1.961-1.849,2.02-3.137
+		c0.051-0.957-0.279-1.745-0.561-2.23L51.843,21.981z"/>
+	<path fill="#27426E" d="M77.789,11.296c-0.682-2.104-2.798-3.222-4.977-2.504c-1.359,0.441-2.029,1.297-2.351,1.93
+		c-0.462,0.912-0.522,1.989-0.183,3.015l5.879,18.038c0.538,1.645,1.975,2.715,3.664,2.715c0.439,0,0.878-0.067,1.312-0.215
+		c2.167-0.707,3.235-2.789,2.535-4.948L77.789,11.296z"/>
+	<path fill="#27426E" d="M105.424,6.226c-0.22-2.062-1.799-3.5-3.836-3.5l-0.503,0.025c-2.272,0.244-3.746,2.053-3.511,4.312
+		l2,18.858c0.222,2.064,1.816,3.505,3.877,3.505l0.466-0.027c1.4-0.147,2.542-0.896,3.121-2.047
+		c0.435-0.853,0.451-1.708,0.392-2.267L105.424,6.226z"/>
+	<path fill="#27426E" d="M130.039,2.741l-0.495-0.022c-2.045,0-3.625,1.445-3.842,3.507L123.7,25.078
+		c-0.238,2.226,1.274,4.074,3.518,4.314l0.502,0.034c2.038,0,3.616-1.449,3.838-3.512l1.997-18.858
+		C133.791,4.805,132.316,2.989,130.039,2.741z"/>
+	<path fill="#27426E" d="M158.284,8.807c-2.157-0.707-4.278,0.394-4.971,2.49l-5.91,18.015c-0.693,2.118,0.391,4.256,2.536,4.963
+		c0.463,0.147,0.914,0.219,1.363,0.219c1.672,0,3.051-1.041,3.605-2.719l5.906-18.01c0.178-0.534,0.336-1.375,0.097-2.301
+		C160.581,10.218,159.628,9.252,158.284,8.807z"/>
+	<path fill="#27426E" d="M184.633,20.582c-1.964-1.143-4.29-0.486-5.378,1.414l-9.504,16.419c-1.113,1.937-0.483,4.241,1.463,5.375
+		c0.674,0.384,1.37,0.573,2.069,0.573c1.35,0,2.587-0.749,3.307-1.996l9.498-16.419c0.553-0.952,0.711-2.015,0.452-3
+		C186.351,22.259,185.874,21.289,184.633,20.582z"/>
+	<path fill="#27426E" d="M209.381,40.371c-0.034-0.715-0.3-1.766-1.362-2.729c-0.992-0.904-1.996-1.095-2.667-1.095
+		c-1.076,0-2.096,0.479-2.891,1.341L189.732,51.95c-0.724,0.795-1.097,1.799-1.044,2.817c0.049,1.037,0.525,2.007,1.338,2.744
+		c0.996,0.897,2.001,1.086,2.668,1.086c1.083,0,2.111-0.484,2.889-1.349l12.724-14.044
+		C209.048,42.393,209.425,41.388,209.381,40.371z"/>
+	<path fill="#27426E" d="M228.095,62.211c0.122-0.707,0.083-1.79-0.752-2.947c-0.791-1.104-1.91-1.704-3.141-1.704
+		c-1.035,0-1.838,0.419-2.347,0.782l-15.404,11.07c-0.875,0.622-1.447,1.519-1.614,2.529c-0.168,1.02,0.095,2.071,0.728,2.96
+		c0.798,1.101,1.911,1.708,3.149,1.708c1.026,0,1.838-0.426,2.343-0.789l15.404-11.061
+		C227.354,64.118,227.937,63.215,228.095,62.211z"/>
+	<path fill="#27426E" d="M241.386,88.03c0.707-1.074,0.797-2.429,0.23-3.722c-0.66-1.503-1.97-2.4-3.503-2.4
+		c-0.71,0-1.298,0.188-1.679,0.356l-17.361,7.625c-0.986,0.426-1.729,1.189-2.098,2.145c-0.376,0.962-0.339,2.044,0.1,3.041
+		c0.658,1.503,1.967,2.408,3.495,2.408c0.558,0,1.138-0.122,1.681-0.363l17.359-7.625C240.128,89.264,240.858,88.83,241.386,88.03z"
+		/>
+	<path fill="#27426E" d="M228.82,120.394l18.563-3.862c1.08-0.223,1.97-0.809,2.529-1.66c0.398-0.592,0.8-1.597,0.511-3.011
+		c-0.398-1.911-1.875-3.152-3.757-3.152c-0.301,0-0.604,0.029-0.881,0.089l-18.576,3.854c-2.18,0.46-3.483,2.463-3.026,4.668
+		c0.399,1.919,1.875,3.155,3.753,3.155C228.227,120.476,228.522,120.448,228.82,120.394z"/>
+	<path fill="#27426E" d="M252.19,137.763c-0.713-0.721-1.713-1.119-2.81-1.132l-18.98-0.113c-2.214,0-3.898,1.685-3.916,3.917
+		c-0.008,1.429,0.586,2.335,1.084,2.845c0.719,0.72,1.71,1.126,2.813,1.126l18.981,0.119c2.251,0,3.896-1.65,3.909-3.917
+		C253.286,139.175,252.692,138.275,252.19,137.763z"/>
+</g>
+</svg>
Binary file distribution/packaging/shared/icons/32px.png has changed
Binary file distribution/packaging/shared/icons/64px.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distribution/packaging/shared/man/thermostat.1	Wed Apr 29 16:42:09 2015 +0200
@@ -0,0 +1,123 @@
+.\" man page for thermostat
+
+.TH THERMOSTAT 1
+
+.\"
+.\" File Name macro.
+.\"
+.de FN
+\fI\|\\$1\|\fP
+..
+
+.SH NAME
+thermostat \- A monitoring and serviceability tool for OpenJDK
+
+.SH SYNOPSIS
+.B "thermostat"
+[
+.I global_options
+]
+.I "command"
+[
+.I command_options
+]
+[
+.I command_arguments
+]
+.br
+.B "thermostat"
+.B "help"
+.br
+.B "thermostat"
+.B "help"
+.I "command"
+
+.SH DESCRIPTION
+Thermostat is an instrumentation tool for the Hotspot JVM, with support for
+monitoring multiple JVM instances on multiple hosts, optionally in a cloud
+environment. The name Thermostat is intended as a play on words: Thermostat is
+to Hotspot much as IcedTea is to Java.
+.br
+Some goals of Thermostat are:
+.IP \[bu] 2
+We want a tool that allows users of IcedTea/OpenJDK to monitor running JVMs, especially remote JVMs.
+.IP \[bu]
+Both high level (uptime, cpu and memory usage) and low level (including hotspot's perf data) information should be available through the tool.
+.IP \[bu]
+The tool should be usable in a production environment, with minimal overhead.
+
+.SH OPTIONS
+.SS "Global Options"
+  --print-osgi-info     Print debug information related to the OSGi framework's
+                        boot/shutdown process.
+  --ignore-bundle-versions
+                        Ignore exact bundle versions and use whatever version is
+                        available.
+  --boot-delegation     Boot delegation string passed on to the OSGi framework.
+                        Defaults to
+                        "com.redhat.thermostat.vm.profiler.agent.jvm,org.objectweb.asm,org.objectweb.asm.commons"
+
+.SS "Command Options and Command Arguments"
+Please see 
+.B "thermostat help"
+.I "command"
+for options and arguments for a
+.I command.
+
+.SH "COMMAND OVERVIEW"
+.SS "thermostat help"
+  show help for a given command or help overview
+.SS "thermostat storage <--start|--stop|--status> [--dryRun] [-q] [-l <level>]"
+  control Thermostat mongodb storage
+.SS "thermostat agent [-d <url>] [-s] [-l <level>]"
+  starts the Thermostat agent
+.SS "thermostat gui [-l <level>]"
+  starts the graphical user interface client
+.SS "thermostat shell"
+  starts the Thermostat interactive shell
+.SS "thermostat web-storage-service"
+  starts mongodb storage, an embedded servlet container and an agent
+
+.SH "COMMAND REFERENCE"
+Please see "\fBthermostat help\fP \fIcommand\fP" for detailed options and arguments of each command.
+"\fBthermostat help\fP", without a specific command argument, lists all available commands.
+
+.SH "FILES"
+.PD 0
+.TP
+.FN THERMOSTAT_HOME/etc/db.properties
+System configuration for mongodb storage
+.TP
+.FN USER_THERMOSTAT_HOME/etc/db.properties
+User specific configuration for mongodb storage. Overrides system configuration.
+.TP
+.FN THERMOSTAT_HOME/etc/agent.properties
+System configuration for agent
+.TP
+.FN USER_THERMOSTAT_HOME/etc/agent.properties
+User specific configuration for agent. Overrides system configuration.
+.TP
+.FN USER_THERMOSTAT_HOME/etc/agent.auth
+User specific storage connection credentials configuration for agent.
+.TP
+.FN THERMOSTAT_HOME/etc/ssl.properties
+System configuration for TLS
+.TP
+.FN USER_THERMOSTAT_HOME/etc/ssl.properties
+User specific configuration for TLS.
+
+.SH "BUGS REPORTS"
+If you think you've found a bug in thermostat please make sure that it really is a bug, and that it appears in the latest version of thermostat.
+The latest version is always  available from
+.UR "http://icedtea.classpath.org/hg/thermostat/"
+.BR "http://icedtea.classpath.org/hg/thermostat/".
+You can file thermostat bugs at:
+.UR "http://icedtea.classpath.org/bugzilla/"
+.BR "http://icedtea.classpath.org/bugzilla/"
+
+.SH "SEE ALSO"
+.UR "http://icedtea.classpath.org/thermostat/"
+.BR "http://icedtea.classpath.org/thermostat/"
+.br
+.UR "http://icedtea.classpath.org/wiki/Thermostat/UserGuide"
+.BR "http://icedtea.classpath.org/wiki/Thermostat/UserGuide"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distribution/packaging/shared/systemd/thermostat-agent.service	Wed Apr 29 16:42:09 2015 +0200
@@ -0,0 +1,57 @@
+#
+# Copyright 2012-2014 Red Hat, Inc.
+#
+# This file is part of Thermostat.
+#
+# Thermostat is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation; either version 2, or (at your
+# option) any later version.
+#
+# Thermostat is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Thermostat; see the file COPYING.  If not see
+# <http://www.gnu.org/licenses/>.
+#
+# Linking this code with other modules is making a combined work
+# based on this code.  Thus, the terms and conditions of the GNU
+# General Public License cover the whole combination.
+#
+# As a special exception, the copyright holders of this code give
+# you permission to link this code with independent modules to
+# produce an executable, regardless of the license terms of these
+# independent modules, and to copy and distribute the resulting
+# executable under terms of your choice, provided that you also
+# meet, for each linked independent module, the terms and conditions
+# of the license of that module.  An independent module is a module
+# which is not derived from or based on this code.  If you modify
+# this code, you may extend this exception to your version of the
+# library, but you are not obligated to do so.  If you do not wish
+# to do so, delete this exception statement from your version.
+#
+#####################################################################
+#
+# Unit file in order to be able to start
+# thermostat agent via systemd.
+#
+[Unit]
+Description=Thermostat agent service
+After=syslog.target network.target
+Documentation=http://icedtea.classpath.org/wiki/Thermostat/Packaging/SystemdServices
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/sysconfig/thermostat
+ExecStart=@thermostat.home@/bin/thermostat-agent-sysd start
+ExecStop=@thermostat.home@/bin/thermostat-agent-sysd stop
+PIDFile=@thermostat.home@/run/thermostat-agent.pid
+User=@thermostat.system.user@
+Group=@thermostat.system.group@
+
+[Install]
+WantedBy=multi-user.target
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distribution/packaging/shared/systemd/thermostat-storage.service	Wed Apr 29 16:42:09 2015 +0200
@@ -0,0 +1,58 @@
+#
+# Copyright 2012-2014 Red Hat, Inc.
+#
+# This file is part of Thermostat.
+#
+# Thermostat is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation; either version 2, or (at your
+# option) any later version.
+#
+# Thermostat is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Thermostat; see the file COPYING.  If not see
+# <http://www.gnu.org/licenses/>.
+#
+# Linking this code with other modules is making a combined work
+# based on this code.  Thus, the terms and conditions of the GNU
+# General Public License cover the whole combination.
+#
+# As a special exception, the copyright holders of this code give
+# you permission to link this code with independent modules to
+# produce an executable, regardless of the license terms of these
+# independent modules, and to copy and distribute the resulting
+# executable under terms of your choice, provided that you also
+# meet, for each linked independent module, the terms and conditions
+# of the license of that module.  An independent module is a module
+# which is not derived from or based on this code.  If you modify
+# this code, you may extend this exception to your version of the
+# library, but you are not obligated to do so.  If you do not wish
+# to do so, delete this exception statement from your version.
+#
+#####################################################################
+#
+# Unit file in order to be able to start
+# thermostat storage via systemd.
+#
+[Unit]
+Description=Thermostat storage service
+After=syslog.target network.target
+Documentation=http://icedtea.classpath.org/wiki/Thermostat/Packaging/SystemdServices
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/sysconfig/thermostat
+ExecStart=@thermostat.home@/bin/thermostat storage --start
+ExecStop=@thermostat.home@/bin/thermostat storage --stop
+PIDFile=@thermostat.home@/run/db.pid
+User=@thermostat.system.user@
+Group=@thermostat.system.group@
+
+
+[Install]
+WantedBy=multi-user.target
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distribution/packaging/shared/systemd/tmpfiles.d/thermostat.conf	Wed Apr 29 16:42:09 2015 +0200
@@ -0,0 +1,2 @@
+# Creates runtime data location for systems that use tmpfs for /var/run.
+D /var/run/thermostat 0775 @thermostat.system.user@ @thermostat.system.group@ -
--- a/distribution/pom.xml	Thu Apr 02 18:21:18 2015 +0200
+++ b/distribution/pom.xml	Wed Apr 29 16:42:09 2015 +0200
@@ -145,21 +145,10 @@
               <outputDirectory>${project.build.directory}</outputDirectory>
               <resources>
                 <resource>
-                  <directory>desktop</directory>
-                  <targetPath />
-                  <filtering>true</filtering>
-                </resource>
-                <resource>
                   <directory>scripts</directory>
                   <targetPath>image/bin</targetPath>
                   <filtering>true</filtering>
                 </resource>
-                <!-- systemd service unit files -->
-                <resource>
-                  <directory>systemd</directory>
-                  <targetPath/>
-                  <filtering>true</filtering>
-                </resource>
                 <resource>
                   <directory>config</directory>
                   <targetPath>image/etc</targetPath>
@@ -192,16 +181,25 @@
                   <targetPath>tools</targetPath>
                   <filtering>true</filtering>
                 </resource>
+                <!-- downstream packaging related files and directories below -->
                 <resource>
-                  <directory>docs</directory>
-                  <targetPath>docs</targetPath>
-                  <includes>
-                    <include>thermostat.1</include>
-                  </includes>
+                  <directory>packaging/shared/desktop</directory>
+                  <targetPath>packaging/desktop</targetPath>
+                  <filtering>true</filtering>
+                </resource>
+                <!-- systemd service unit files -->
+                <resource>
+                  <directory>packaging/shared/systemd</directory>
+                  <targetPath>packaging/systemd</targetPath>
+                  <filtering>true</filtering>
                 </resource>
                 <resource>
-                  <directory>bash-completion</directory>
-                  <targetPath>bash-completion</targetPath>
+                  <directory>packaging/shared/man</directory>
+                  <targetPath>packaging/man</targetPath>
+                </resource>
+                <resource>
+                  <directory>packaging/shared/bash-completion</directory>
+                  <targetPath>packaging/bash-completion</targetPath>
                   <filtering>true</filtering>
                 </resource>
               </resources>
@@ -217,8 +215,8 @@
               <outputDirectory>${project.build.directory}</outputDirectory>
               <resources>
                 <resource>
-                  <directory>icons</directory>
-                  <targetPath />
+                  <directory>packaging/shared/icons</directory>
+                  <targetPath>packaging/icons</targetPath>
                   <filtering>false</filtering>
                 </resource>
               </resources>
--- a/distribution/systemd/thermostat-agent.service	Thu Apr 02 18:21:18 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#
-# Copyright 2012-2014 Red Hat, Inc.
-#
-# This file is part of Thermostat.
-#
-# Thermostat is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your
-# option) any later version.
-#
-# Thermostat is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Thermostat; see the file COPYING.  If not see
-# <http://www.gnu.org/licenses/>.
-#
-# Linking this code with other modules is making a combined work
-# based on this code.  Thus, the terms and conditions of the GNU
-# General Public License cover the whole combination.
-#
-# As a special exception, the copyright holders of this code give
-# you permission to link this code with independent modules to
-# produce an executable, regardless of the license terms of these
-# independent modules, and to copy and distribute the resulting
-# executable under terms of your choice, provided that you also
-# meet, for each linked independent module, the terms and conditions
-# of the license of that module.  An independent module is a module
-# which is not derived from or based on this code.  If you modify
-# this code, you may extend this exception to your version of the
-# library, but you are not obligated to do so.  If you do not wish
-# to do so, delete this exception statement from your version.
-#
-#####################################################################
-#
-# Unit file in order to be able to start
-# thermostat agent via systemd.
-#
-[Unit]
-Description=Thermostat agent service
-After=syslog.target network.target
-Documentation=http://icedtea.classpath.org/wiki/Thermostat/Packaging/SystemdServices
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/thermostat
-ExecStart=@thermostat.home@/bin/thermostat-agent-sysd start
-ExecStop=@thermostat.home@/bin/thermostat-agent-sysd stop
-PIDFile=@thermostat.home@/run/thermostat-agent.pid
-User=@thermostat.system.user@
-Group=@thermostat.system.group@
-
-[Install]
-WantedBy=multi-user.target
-
--- a/distribution/systemd/thermostat-storage.service	Thu Apr 02 18:21:18 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#
-# Copyright 2012-2014 Red Hat, Inc.
-#
-# This file is part of Thermostat.
-#
-# Thermostat is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your
-# option) any later version.
-#
-# Thermostat is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Thermostat; see the file COPYING.  If not see
-# <http://www.gnu.org/licenses/>.
-#
-# Linking this code with other modules is making a combined work
-# based on this code.  Thus, the terms and conditions of the GNU
-# General Public License cover the whole combination.
-#
-# As a special exception, the copyright holders of this code give
-# you permission to link this code with independent modules to
-# produce an executable, regardless of the license terms of these
-# independent modules, and to copy and distribute the resulting
-# executable under terms of your choice, provided that you also
-# meet, for each linked independent module, the terms and conditions
-# of the license of that module.  An independent module is a module
-# which is not derived from or based on this code.  If you modify
-# this code, you may extend this exception to your version of the
-# library, but you are not obligated to do so.  If you do not wish
-# to do so, delete this exception statement from your version.
-#
-#####################################################################
-#
-# Unit file in order to be able to start
-# thermostat storage via systemd.
-#
-[Unit]
-Description=Thermostat storage service
-After=syslog.target network.target
-Documentation=http://icedtea.classpath.org/wiki/Thermostat/Packaging/SystemdServices
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/thermostat
-ExecStart=@thermostat.home@/bin/thermostat storage --start
-ExecStop=@thermostat.home@/bin/thermostat storage --stop
-PIDFile=@thermostat.home@/run/db.pid
-User=@thermostat.system.user@
-Group=@thermostat.system.group@
-
-
-[Install]
-WantedBy=multi-user.target
-
--- a/distribution/systemd/tmpfiles.d/thermostat.conf	Thu Apr 02 18:21:18 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-# Creates runtime data location for systems that use tmpfs for /var/run.
-D /var/run/thermostat 0775 @thermostat.system.user@ @thermostat.system.group@ -