# HG changeset patch
# User Giovanni Astarita <gastarit@redhat.com>
# Date 1368715140 -7200
# Node ID cc4b35354a3925a9b3527f6e5ec21835af71019f
# Parent  9372e208895411211014fb66ab4d337cef17562a
Renaming plugin.xml files
Reviewed-by: neugens, jerboaa, omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-May/006514.html

diff -r 9372e2088954 -r cc4b35354a39 assembly/src/main/resources/assemblies/plugin-assembly.xml
--- a/assembly/src/main/resources/assemblies/plugin-assembly.xml	Thu May 16 14:22:47 2013 +0200
+++ b/assembly/src/main/resources/assemblies/plugin-assembly.xml	Thu May 16 16:39:00 2013 +0200
@@ -56,7 +56,7 @@
   <fileSets>
     <fileSet>
       <includes>
-        <include>plugin.xml</include>
+        <include>thermostat-plugin.xml</include>
       </includes>
       <filtered>true</filtered>
     </fileSet>
diff -r 9372e2088954 -r cc4b35354a39 distribution/docs/plugin.xsd
--- a/distribution/docs/plugin.xsd	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-           elementFormDefault="qualified">
-
-
-<!-- definition of simple elements -->
-<xs:element name="name" type="xs:string"/>
-<xs:element name="bundle" type="xs:string"/>
-<xs:element name="dependency" type="xs:string"/>
-<xs:element name="usage" type="xs:string"/>
-<xs:element name="description" type="xs:string"/>
-<xs:element name="short" type="xs:string"/>
-<xs:element name="long" type="xs:string"/>
-<xs:element name="argument" type="xs:string"/>
-<xs:element name="required" type="xs:boolean"/>
-
-
-<!-- definition of complex elements -->
-<xs:element name="plugin">
-  <xs:complexType>
-    <xs:choice>
-      <xs:sequence>
-        <xs:element ref="commands"/>
-        <xs:element ref="extensions" minOccurs="0" maxOccurs="1"/>
-      </xs:sequence>
-      <xs:element ref="extensions"/>
-    </xs:choice>
-  </xs:complexType>
-</xs:element>
-
-
-<xs:element name="commands">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element ref="command" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="extensions">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element ref="extension" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:element>
-
-
-<xs:element name="extension">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element ref="name"/>
-      <xs:element ref="bundles"/>
-      <xs:element ref="dependencies" minOccurs="0" maxOccurs="1"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:element>
-
-
-<xs:element name="command">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element ref="name"/>
-      <xs:element ref="usage" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="description"/>
-      <xs:element ref="arguments" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="options"/>
-      <xs:element ref="bundles"/>
-      <xs:element ref="dependencies"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:element> 
-
-
-<xs:element name="arguments">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element ref="argument" minOccurs="0" maxOccurs="1"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="options">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element ref="group" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="option" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:element>
-
-
-<xs:element name="group">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element ref="required" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="option" minOccurs="2" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:element>
-
-
-<xs:element name="option">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:choice>
-        <xs:sequence>
-          <xs:element ref="long"/>
-          <xs:element ref="short" minOccurs="0" maxOccurs="1"/>
-        </xs:sequence>
-        <xs:element ref="short"/>
-      </xs:choice>
-      <xs:element ref="argument" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="required" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="description" minOccurs="0" maxOccurs="1"/>
-    </xs:sequence>
-    <xs:attribute name="common" type="xs:boolean" use="optional"/>
-  </xs:complexType>
-</xs:element>
-
-
-<xs:element name="bundles">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element ref="bundle" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:element>
-
-
-<xs:element name="dependencies">
-  <xs:complexType>
-    <xs:sequence>
-      <xs:element ref="dependency" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:element>
-
-
-</xs:schema>
diff -r 9372e2088954 -r cc4b35354a39 distribution/docs/thermostat-plugin.xsd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distribution/docs/thermostat-plugin.xsd	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+           elementFormDefault="qualified">
+
+
+<!-- definition of simple elements -->
+<xs:element name="name" type="xs:string"/>
+<xs:element name="bundle" type="xs:string"/>
+<xs:element name="dependency" type="xs:string"/>
+<xs:element name="usage" type="xs:string"/>
+<xs:element name="description" type="xs:string"/>
+<xs:element name="short" type="xs:string"/>
+<xs:element name="long" type="xs:string"/>
+<xs:element name="argument" type="xs:string"/>
+<xs:element name="required" type="xs:boolean"/>
+
+
+<!-- definition of complex elements -->
+<xs:element name="plugin">
+  <xs:complexType>
+    <xs:choice>
+      <xs:sequence>
+        <xs:element ref="commands"/>
+        <xs:element ref="extensions" minOccurs="0" maxOccurs="1"/>
+      </xs:sequence>
+      <xs:element ref="extensions"/>
+    </xs:choice>
+  </xs:complexType>
+</xs:element>
+
+
+<xs:element name="commands">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="command" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element>
+
+<xs:element name="extensions">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="extension" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element>
+
+
+<xs:element name="extension">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="name"/>
+      <xs:element ref="bundles"/>
+      <xs:element ref="dependencies" minOccurs="0" maxOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element>
+
+
+<xs:element name="command">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="name"/>
+      <xs:element ref="usage" minOccurs="0" maxOccurs="1"/>
+      <xs:element ref="description"/>
+      <xs:element ref="arguments" minOccurs="0" maxOccurs="1"/>
+      <xs:element ref="options"/>
+      <xs:element ref="bundles"/>
+      <xs:element ref="dependencies"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element> 
+
+
+<xs:element name="arguments">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="argument" minOccurs="0" maxOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element>
+
+<xs:element name="options">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="group" minOccurs="0" maxOccurs="1"/>
+      <xs:element ref="option" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element>
+
+
+<xs:element name="group">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="required" minOccurs="0" maxOccurs="1"/>
+      <xs:element ref="option" minOccurs="2" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element>
+
+
+<xs:element name="option">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:choice>
+        <xs:sequence>
+          <xs:element ref="long"/>
+          <xs:element ref="short" minOccurs="0" maxOccurs="1"/>
+        </xs:sequence>
+        <xs:element ref="short"/>
+      </xs:choice>
+      <xs:element ref="argument" minOccurs="0" maxOccurs="1"/>
+      <xs:element ref="required" minOccurs="0" maxOccurs="1"/>
+      <xs:element ref="description" minOccurs="0" maxOccurs="1"/>
+    </xs:sequence>
+    <xs:attribute name="common" type="xs:boolean" use="optional"/>
+  </xs:complexType>
+</xs:element>
+
+
+<xs:element name="bundles">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="bundle" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element>
+
+
+<xs:element name="dependencies">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element ref="dependency" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:element>
+
+
+</xs:schema>
diff -r 9372e2088954 -r cc4b35354a39 host-cpu/distribution/plugin.xml
--- a/host-cpu/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-host-cpu-common-${project.version}.jar</bundle>
-        <bundle>thermostat-host-cpu-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-host-cpu-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>agent</name>
-      <bundles>
-        <bundle>thermostat-host-cpu-common-${project.version}.jar</bundle>
-        <bundle>thermostat-host-cpu-agent-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <!-- Requires all storage entity classes to be loaded -->
-    <extension>
-      <name>webservice</name>
-      <bundles>
-        <bundle>thermostat-host-cpu-common-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 host-cpu/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/host-cpu/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-host-cpu-common-${project.version}.jar</bundle>
+        <bundle>thermostat-host-cpu-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-host-cpu-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>agent</name>
+      <bundles>
+        <bundle>thermostat-host-cpu-common-${project.version}.jar</bundle>
+        <bundle>thermostat-host-cpu-agent-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <!-- Requires all storage entity classes to be loaded -->
+    <extension>
+      <name>webservice</name>
+      <bundles>
+        <bundle>thermostat-host-cpu-common-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 host-memory/distribution/plugin.xml
--- a/host-memory/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-host-memory-common-${project.version}.jar</bundle>
-        <bundle>thermostat-host-memory-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-host-memory-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>agent</name>
-      <bundles>
-        <bundle>thermostat-host-memory-common-${project.version}.jar</bundle>
-        <bundle>thermostat-host-memory-agent-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <!-- Requires all storage entity classes to be loaded -->
-    <extension>
-      <name>webservice</name>
-      <bundles>
-        <bundle>thermostat-host-memory-common-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 host-memory/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/host-memory/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-host-memory-common-${project.version}.jar</bundle>
+        <bundle>thermostat-host-memory-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-host-memory-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>agent</name>
+      <bundles>
+        <bundle>thermostat-host-memory-common-${project.version}.jar</bundle>
+        <bundle>thermostat-host-memory-agent-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <!-- Requires all storage entity classes to be loaded -->
+    <extension>
+      <name>webservice</name>
+      <bundles>
+        <bundle>thermostat-host-memory-common-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 host-overview/distribution/plugin.xml
--- a/host-overview/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-host-overview-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-host-overview-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 host-overview/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/host-overview/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-host-overview-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-host-overview-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 launcher/pom.xml
--- a/launcher/pom.xml	Thu May 16 14:22:47 2013 +0200
+++ b/launcher/pom.xml	Thu May 16 16:39:00 2013 +0200
@@ -58,7 +58,7 @@
       <resource>
         <directory>${basedir}/../distribution/docs/</directory>
         <includes>
-          <include>plugin.xsd</include>
+          <include>thermostat-plugin.xsd</include>
         </includes>
       </resource>
       <!-- Instructions are not cumulative to default behaviour, 
diff -r 9372e2088954 -r cc4b35354a39 launcher/src/main/java/com/redhat/thermostat/launcher/internal/PluginCommandInfoSource.java
--- a/launcher/src/main/java/com/redhat/thermostat/launcher/internal/PluginCommandInfoSource.java	Thu May 16 14:22:47 2013 +0200
+++ b/launcher/src/main/java/com/redhat/thermostat/launcher/internal/PluginCommandInfoSource.java	Thu May 16 16:39:00 2013 +0200
@@ -65,7 +65,7 @@
  */
 public class PluginCommandInfoSource implements CommandInfoSource {
 
-    private static final String PLUGIN_CONFIG_FILE = "plugin.xml";
+    private static final String PLUGIN_CONFIG_FILE = "thermostat-plugin.xml";
 
     private static final Logger logger = LoggingUtils.getLogger(PluginCommandInfoSource.class);
 
diff -r 9372e2088954 -r cc4b35354a39 launcher/src/main/java/com/redhat/thermostat/launcher/internal/PluginConfigurationParser.java
--- a/launcher/src/main/java/com/redhat/thermostat/launcher/internal/PluginConfigurationParser.java	Thu May 16 14:22:47 2013 +0200
+++ b/launcher/src/main/java/com/redhat/thermostat/launcher/internal/PluginConfigurationParser.java	Thu May 16 16:39:00 2013 +0200
@@ -209,7 +209,7 @@
     }
            
     void validate(StreamSource plugin) throws PluginConfigurationValidatorException {
-        URL schemaUrl = getClass().getResource("/plugin.xsd");
+        URL schemaUrl = getClass().getResource("/thermostat-plugin.xsd");
         SchemaFactory schemaFactory = 
                 SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
         
diff -r 9372e2088954 -r cc4b35354a39 launcher/src/test/java/com/redhat/thermostat/launcher/internal/PluginCommandInfoSourceTest.java
--- a/launcher/src/test/java/com/redhat/thermostat/launcher/internal/PluginCommandInfoSourceTest.java	Thu May 16 14:22:47 2013 +0200
+++ b/launcher/src/test/java/com/redhat/thermostat/launcher/internal/PluginCommandInfoSourceTest.java	Thu May 16 16:39:00 2013 +0200
@@ -125,7 +125,7 @@
         List<File> configurationFiles = configFilesCaptor.getAllValues();
         assertEquals(pluginDirs.length, configurationFiles.size());
         for (int i = 0; i < pluginDirs.length; i++) {
-            assertTrue(configurationFiles.contains(pluginDirs[i].resolve("plugin.xml").toFile()));
+            assertTrue(configurationFiles.contains(pluginDirs[i].resolve("thermostat-plugin.xml").toFile()));
         }
     }
 
diff -r 9372e2088954 -r cc4b35354a39 launcher/src/test/java/com/redhat/thermostat/launcher/internal/PluginConfigurationParserTest.java
--- a/launcher/src/test/java/com/redhat/thermostat/launcher/internal/PluginConfigurationParserTest.java	Thu May 16 14:22:47 2013 +0200
+++ b/launcher/src/test/java/com/redhat/thermostat/launcher/internal/PluginConfigurationParserTest.java	Thu May 16 16:39:00 2013 +0200
@@ -138,7 +138,7 @@
             String config = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                     "<plugin xmlns=\"http://icedtea.classpath.org/thermostat/plugins/v1.0\"\n" +
                     " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-                    " xsi:schemaLocation=\"http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd\">\n" +
+                    " xsi:schemaLocation=\"http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd\">\n" +
                     "  <extensions>\n" +
                     "    <extension>\n" +
                     "      <name>test</name>\n" +
@@ -161,7 +161,7 @@
             config = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                     "<plugin xmlns=\"http://icedtea.classpath.org/thermostat/plugins/v1.0\"\n" +
                     " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-                    " xsi:schemaLocation=\"http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd\">\n" +
+                    " xsi:schemaLocation=\"http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd\">\n" +
                     "  <extensions>\n" +
                     "    <extension>\n" +
                     "      <name>test</name>\n" +
@@ -189,7 +189,7 @@
         String config = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<plugin xmlns=\"http://icedtea.classpath.org/thermostat/plugins/v1.0\"\n" +
                 " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-                " xsi:schemaLocation=\"http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd\">\n" +
+                " xsi:schemaLocation=\"http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd\">\n" +
                 "  <extensions>\n" +
                 "    <something>\n" +
                 "    <extension>\n" +
@@ -334,7 +334,7 @@
         String config = "<?xml version=\"1.0\"?>\n" +
                 "<plugin xmlns=\"http://icedtea.classpath.org/thermostat/plugins/v1.0\"\n" +
                 " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-                " xsi:schemaLocation=\"http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd\">\n" +
+                " xsi:schemaLocation=\"http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd\">\n" +
                 "  <commands>\n" +
                 "    <command>\n" +
                 "      <name>test</name>\n" +
diff -r 9372e2088954 -r cc4b35354a39 numa/distribution/plugin.xml
--- a/numa/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-numa-common-${project.version}.jar</bundle>
-        <bundle>thermostat-numa-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-numa-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>agent</name>
-      <bundles>
-        <bundle>thermostat-numa-common-${project.version}.jar</bundle>
-        <bundle>thermostat-numa-agent-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <!-- Requires all storage entity classes to be loaded -->
-    <extension>
-      <name>webservice</name>
-      <bundles>
-        <bundle>thermostat-numa-common-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 numa/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/numa/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-numa-common-${project.version}.jar</bundle>
+        <bundle>thermostat-numa-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-numa-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>agent</name>
+      <bundles>
+        <bundle>thermostat-numa-common-${project.version}.jar</bundle>
+        <bundle>thermostat-numa-agent-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <!-- Requires all storage entity classes to be loaded -->
+    <extension>
+      <name>webservice</name>
+      <bundles>
+        <bundle>thermostat-numa-common-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 thread/distribution/plugin.xml
--- a/thread/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-thread-collector-${project.version}.jar</bundle>
-        <bundle>thermostat-thread-client-swing-${project.version}.jar</bundle>
-        <bundle>thermostat-thread-client-controllers-${project.version}.jar</bundle>
-        <bundle>thermostat-thread-client-common-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>agent</name>
-      <bundles>
-        <bundle>thermostat-thread-collector-${project.version}.jar</bundle>
-        <bundle>thermostat-thread-harvester-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <!-- Requires all storage entity classes to be loaded -->
-    <extension>
-      <name>webservice</name>
-      <bundles>
-        <bundle>thermostat-thread-collector-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 thread/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thread/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-thread-collector-${project.version}.jar</bundle>
+        <bundle>thermostat-thread-client-swing-${project.version}.jar</bundle>
+        <bundle>thermostat-thread-client-controllers-${project.version}.jar</bundle>
+        <bundle>thermostat-thread-client-common-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>agent</name>
+      <bundles>
+        <bundle>thermostat-thread-collector-${project.version}.jar</bundle>
+        <bundle>thermostat-thread-harvester-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <!-- Requires all storage entity classes to be loaded -->
+    <extension>
+      <name>webservice</name>
+      <bundles>
+        <bundle>thermostat-thread-collector-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-classstat/distribution/plugin.xml
--- a/vm-classstat/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-vm-classstat-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-classstat-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-classstat-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>agent</name>
-      <bundles>
-        <bundle>thermostat-vm-classstat-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-classstat-agent-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <!-- Requires all storage entity classes to be loaded -->
-    <extension>
-      <name>webservice</name>
-      <bundles>
-        <bundle>thermostat-vm-classstat-common-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-  <!-- TODO: Need to express dependency on vm-memory-common -->
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-classstat/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vm-classstat/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-vm-classstat-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-classstat-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-classstat-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>agent</name>
+      <bundles>
+        <bundle>thermostat-vm-classstat-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-classstat-agent-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <!-- Requires all storage entity classes to be loaded -->
+    <extension>
+      <name>webservice</name>
+      <bundles>
+        <bundle>thermostat-vm-classstat-common-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+  <!-- TODO: Need to express dependency on vm-memory-common -->
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-cpu/distribution/plugin.xml
--- a/vm-cpu/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-vm-cpu-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-cpu-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-cpu-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>agent</name>
-      <bundles>
-        <bundle>thermostat-vm-cpu-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-cpu-agent-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <!-- Requires all storage entity classes to be loaded -->
-    <extension>
-      <name>webservice</name>
-      <bundles>
-        <bundle>thermostat-vm-cpu-common-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>vm-stat</name>
-      <bundles>
-        <bundle>thermostat-vm-cpu-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-cpu-client-cli-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-cpu/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vm-cpu/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-vm-cpu-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-cpu-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-cpu-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>agent</name>
+      <bundles>
+        <bundle>thermostat-vm-cpu-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-cpu-agent-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <!-- Requires all storage entity classes to be loaded -->
+    <extension>
+      <name>webservice</name>
+      <bundles>
+        <bundle>thermostat-vm-cpu-common-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>vm-stat</name>
+      <bundles>
+        <bundle>thermostat-vm-cpu-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-cpu-client-cli-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-gc/distribution/plugin.xml
--- a/vm-gc/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-vm-gc-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-gc-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-gc-client-swing-${project.version}.jar</bundle>
-        <bundle>thermostat-gc-remote-collector-common-${project.version}.jar</bundle>
-        <bundle>thermostat-gc-remote-collector-client-common-${project.version}.jar</bundle>
-        <bundle>thermostat-gc-remote-collector-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>agent</name>
-      <bundles>
-        <bundle>thermostat-vm-gc-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-gc-agent-${project.version}.jar</bundle>
-        <bundle>thermostat-gc-remote-collector-common-${project.version}.jar</bundle>
-        <bundle>thermostat-gc-remote-collector-command-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <!-- Requires all storage entity classes to be loaded -->
-    <extension>
-      <name>webservice</name>
-      <bundles>
-        <bundle>thermostat-vm-gc-common-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-  <!-- TODO: Need to express dependency on vm-memory-common -->
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-gc/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vm-gc/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-vm-gc-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-gc-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-gc-client-swing-${project.version}.jar</bundle>
+        <bundle>thermostat-gc-remote-collector-common-${project.version}.jar</bundle>
+        <bundle>thermostat-gc-remote-collector-client-common-${project.version}.jar</bundle>
+        <bundle>thermostat-gc-remote-collector-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>agent</name>
+      <bundles>
+        <bundle>thermostat-vm-gc-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-gc-agent-${project.version}.jar</bundle>
+        <bundle>thermostat-gc-remote-collector-common-${project.version}.jar</bundle>
+        <bundle>thermostat-gc-remote-collector-command-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <!-- Requires all storage entity classes to be loaded -->
+    <extension>
+      <name>webservice</name>
+      <bundles>
+        <bundle>thermostat-vm-gc-common-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+  <!-- TODO: Need to express dependency on vm-memory-common -->
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-heap-analysis/distribution/plugin.xml
--- a/vm-heap-analysis/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,407 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <commands>
-    <command>
-      <name>dump-heap</name>
-      <description>trigger a heap dump on the VM</description>
-      <options>
-        <option>
-          <long>hostId</long>
-          <short>a</short>
-          <argument>host</argument>
-          <required>true</required>
-          <description>the ID of the host to monitor</description>
-        </option>
-        <option>
-          <long>vmId</long>
-          <short>v</short>
-          <argument>vm</argument>
-          <required>true</required>
-          <description>the ID of the VM to monitor</description>
-        </option>
-        <option common="true">
-          <long>dbUrl</long>
-        </option>
-        <option common="true">
-          <long>logLevel</long>
-        </option>
-      </options>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
-      </bundles>
-      <dependencies>
-        <dependency>thermostat-common-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-core-${project.version}.jar</dependency>
-        <dependency>thermostat-client-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
-        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
-        <dependency>thermostat-web-common-${project.version}.jar</dependency>
-        <dependency>thermostat-web-client-${project.version}.jar</dependency>
-        <dependency>mongo.jar</dependency>
-        <dependency>commons-beanutils.jar</dependency>
-        <dependency>commons-codec.jar</dependency>
-        <dependency>commons-collections.jar</dependency>
-        <dependency>commons-logging.jar</dependency>
-        <dependency>httpcomponents-core.jar</dependency>
-        <dependency>httpcomponents-client.jar</dependency>
-        <dependency>gson.jar</dependency>
-        <dependency>netty.jar</dependency>
-      </dependencies>
-    </command>
-    <command>
-      <name>find-objects</name>
-      <description>finds objects in a heapdump</description>
-      <arguments>
-        <argument>pattern</argument>
-      </arguments>
-      <options>
-        <option>
-          <long>heapId</long>
-          <short>h</short>
-          <argument>heap</argument>
-          <required>true</required>
-          <description>the ID of the heapdump to analyze</description>
-        </option>
-        <option>
-          <long>limit</long>
-          <short>L</short>
-          <argument>limit</argument>
-          <required>false</required>
-          <description>limit search to top N results, defaults to 10</description>
-        </option>
-        <option common="true">
-          <long>dbUrl</long>
-        </option>
-        <option common="true">
-          <long>logLevel</long>
-        </option>
-      </options>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
-      </bundles>
-      <dependencies>
-        <dependency>thermostat-common-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-core-${project.version}.jar</dependency>
-        <dependency>thermostat-client-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
-        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
-        <dependency>thermostat-web-common-${project.version}.jar</dependency>
-        <dependency>thermostat-web-client-${project.version}.jar</dependency>
-        <dependency>mongo.jar</dependency>
-        <dependency>commons-beanutils.jar</dependency>
-        <dependency>commons-codec.jar</dependency>
-        <dependency>commons-collections.jar</dependency>
-        <dependency>commons-logging.jar</dependency>
-        <dependency>httpcomponents-core.jar</dependency>
-        <dependency>httpcomponents-client.jar</dependency>
-        <dependency>gson.jar</dependency>
-        <dependency>netty.jar</dependency>
-      </dependencies>
-    </command>
-    <command>
-      <name>find-root</name>
-      <description>finds the shortest path from an object to a GC root</description>
-      <options>
-        <option>
-          <long>heapId</long>
-          <short>h</short>
-          <argument>heap</argument>
-          <required>true</required>
-          <description>the ID of the heapdump to analyze</description>
-        </option>
-        <option>
-          <long>objectId</long>
-          <short>o</short>
-          <argument>heap</argument>
-          <required>true</required>
-          <description>the ID of the object to query</description>
-        </option>
-        <option>
-          <long>all</long>
-          <short>a</short>
-          <required>false</required>
-          <description>finds all paths to GC roots</description>
-        </option>
-        <option common="true">
-          <long>dbUrl</long>
-        </option>
-        <option common="true">
-          <long>logLevel</long>
-        </option>
-      </options>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
-      </bundles>
-      <dependencies>
-        <dependency>thermostat-common-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-core-${project.version}.jar</dependency>
-        <dependency>thermostat-client-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
-        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
-        <dependency>thermostat-web-common-${project.version}.jar</dependency>
-        <dependency>thermostat-web-client-${project.version}.jar</dependency>
-        <dependency>mongo.jar</dependency>
-        <dependency>commons-beanutils.jar</dependency>
-        <dependency>commons-codec.jar</dependency>
-        <dependency>commons-collections.jar</dependency>
-        <dependency>commons-logging.jar</dependency>
-        <dependency>httpcomponents-core.jar</dependency>
-        <dependency>httpcomponents-client.jar</dependency>
-        <dependency>gson.jar</dependency>
-        <dependency>netty.jar</dependency>
-      </dependencies>
-    </command>
-    <command>
-      <name>list-heap-dumps</name>
-      <description>list all heap dumps</description>
-      <options>
-        <option>
-          <long>hostId</long>
-          <short>a</short>
-          <argument>host</argument>
-          <required>false</required>
-          <description>the ID of the host to monitor</description>
-        </option>
-        <option>
-          <long>vmId</long>
-          <short>v</short>
-          <argument>vm</argument>
-          <required>false</required>
-          <description>the ID of the VM to monitor</description>
-        </option>
-        <option common="true">
-          <long>dbUrl</long>
-        </option>
-        <option common="true">
-          <long>logLevel</long>
-        </option>
-      </options>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
-      </bundles>
-      <dependencies>
-        <dependency>thermostat-common-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-core-${project.version}.jar</dependency>
-        <dependency>thermostat-client-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
-        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
-        <dependency>thermostat-web-common-${project.version}.jar</dependency>
-        <dependency>thermostat-web-client-${project.version}.jar</dependency>
-        <dependency>mongo.jar</dependency>
-        <dependency>commons-beanutils.jar</dependency>
-        <dependency>commons-codec.jar</dependency>
-        <dependency>commons-collections.jar</dependency>
-        <dependency>commons-logging.jar</dependency>
-        <dependency>httpcomponents-core.jar</dependency>
-        <dependency>httpcomponents-client.jar</dependency>
-        <dependency>gson.jar</dependency>
-        <dependency>netty.jar</dependency>
-      </dependencies>
-    </command>
-    <command>
-      <name>object-info</name>
-      <description>prints information about an object in a heap dump</description>
-      <options>
-        <option>
-          <long>heapId</long>
-          <short>h</short>
-          <argument>heap</argument>
-          <required>true</required>
-          <description>the ID of the heapdump to analyze</description>
-        </option>
-        <option>
-          <long>objectId</long>
-          <short>o</short>
-          <argument>object</argument>
-          <required>true</required>
-          <description>the ID of the object to query</description>
-        </option>
-        <option common="true">
-          <long>dbUrl</long>
-        </option>
-        <option common="true">
-          <long>logLevel</long>
-        </option>
-      </options>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
-      </bundles>
-      <dependencies>
-        <dependency>thermostat-common-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-core-${project.version}.jar</dependency>
-        <dependency>thermostat-client-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
-        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
-        <dependency>thermostat-web-common-${project.version}.jar</dependency>
-        <dependency>thermostat-web-client-${project.version}.jar</dependency>
-        <dependency>mongo.jar</dependency>
-        <dependency>commons-beanutils.jar</dependency>
-        <dependency>commons-codec.jar</dependency>
-        <dependency>commons-collections.jar</dependency>
-        <dependency>commons-logging.jar</dependency>
-        <dependency>httpcomponents-core.jar</dependency>
-        <dependency>httpcomponents-client.jar</dependency>
-        <dependency>gson.jar</dependency>
-        <dependency>netty.jar</dependency>
-      </dependencies>
-    </command>
-    <command>
-      <name>save-heap-dump-to-file</name>
-      <description>saves a heap dump to a local file</description>
-      <options>
-        <option>
-          <long>heapId</long>
-          <short>h</short>
-          <argument>heap</argument>
-          <required>true</required>
-          <description>the ID of the heapdump to analyze</description>
-        </option>
-        <option>
-          <long>file</long>
-          <short>f</short>
-          <argument>filename</argument>
-          <required>true</required>
-          <description>the file name to save to</description>
-        </option>
-        <option common="true">
-          <long>dbUrl</long>
-        </option>
-        <option common="true">
-          <long>logLevel</long>
-        </option>
-      </options>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
-      </bundles>
-      <dependencies>
-        <dependency>thermostat-common-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-core-${project.version}.jar</dependency>
-        <dependency>thermostat-client-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
-        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
-        <dependency>thermostat-web-common-${project.version}.jar</dependency>
-        <dependency>thermostat-web-client-${project.version}.jar</dependency>
-        <dependency>mongo.jar</dependency>
-        <dependency>commons-beanutils.jar</dependency>
-        <dependency>commons-codec.jar</dependency>
-        <dependency>commons-collections.jar</dependency>
-        <dependency>commons-logging.jar</dependency>
-        <dependency>httpcomponents-core.jar</dependency>
-        <dependency>httpcomponents-client.jar</dependency>
-        <dependency>gson.jar</dependency>
-        <dependency>netty.jar</dependency>
-      </dependencies>
-    </command>
-    <command>
-      <name>show-heap-histogram</name>
-      <description>show the heap histogram</description>
-      <options>
-        <option>
-          <long>heapId</long>
-          <short>h</short>
-          <argument>heap</argument>
-          <required>true</required>
-          <description>the ID of the heapdump to analyze</description>
-        </option>
-        <option common="true">
-          <long>dbUrl</long>
-        </option>
-        <option common="true">
-          <long>logLevel</long>
-        </option>
-      </options>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
-      </bundles>
-      <dependencies>
-        <dependency>thermostat-common-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-core-${project.version}.jar</dependency>
-        <dependency>thermostat-client-command-${project.version}.jar</dependency>
-        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
-        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
-        <dependency>thermostat-web-common-${project.version}.jar</dependency>
-        <dependency>thermostat-web-client-${project.version}.jar</dependency>
-        <dependency>mongo.jar</dependency>
-        <dependency>commons-beanutils.jar</dependency>
-        <dependency>commons-codec.jar</dependency>
-        <dependency>commons-collections.jar</dependency>
-        <dependency>commons-logging.jar</dependency>
-        <dependency>httpcomponents-core.jar</dependency>
-        <dependency>httpcomponents-client.jar</dependency>
-        <dependency>gson.jar</dependency>
-        <dependency>netty.jar</dependency>
-      </dependencies>
-    </command>
-  </commands>
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>agent</name>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-heap-analysis-agent-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <!-- Requires all storage entity classes to be loaded -->
-    <extension>
-      <name>webservice</name>
-      <bundles>
-        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-heap-analysis/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vm-heap-analysis/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,407 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <commands>
+    <command>
+      <name>dump-heap</name>
+      <description>trigger a heap dump on the VM</description>
+      <options>
+        <option>
+          <long>hostId</long>
+          <short>a</short>
+          <argument>host</argument>
+          <required>true</required>
+          <description>the ID of the host to monitor</description>
+        </option>
+        <option>
+          <long>vmId</long>
+          <short>v</short>
+          <argument>vm</argument>
+          <required>true</required>
+          <description>the ID of the VM to monitor</description>
+        </option>
+        <option common="true">
+          <long>dbUrl</long>
+        </option>
+        <option common="true">
+          <long>logLevel</long>
+        </option>
+      </options>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
+      </bundles>
+      <dependencies>
+        <dependency>thermostat-common-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-core-${project.version}.jar</dependency>
+        <dependency>thermostat-client-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
+        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
+        <dependency>thermostat-web-common-${project.version}.jar</dependency>
+        <dependency>thermostat-web-client-${project.version}.jar</dependency>
+        <dependency>mongo.jar</dependency>
+        <dependency>commons-beanutils.jar</dependency>
+        <dependency>commons-codec.jar</dependency>
+        <dependency>commons-collections.jar</dependency>
+        <dependency>commons-logging.jar</dependency>
+        <dependency>httpcomponents-core.jar</dependency>
+        <dependency>httpcomponents-client.jar</dependency>
+        <dependency>gson.jar</dependency>
+        <dependency>netty.jar</dependency>
+      </dependencies>
+    </command>
+    <command>
+      <name>find-objects</name>
+      <description>finds objects in a heapdump</description>
+      <arguments>
+        <argument>pattern</argument>
+      </arguments>
+      <options>
+        <option>
+          <long>heapId</long>
+          <short>h</short>
+          <argument>heap</argument>
+          <required>true</required>
+          <description>the ID of the heapdump to analyze</description>
+        </option>
+        <option>
+          <long>limit</long>
+          <short>L</short>
+          <argument>limit</argument>
+          <required>false</required>
+          <description>limit search to top N results, defaults to 10</description>
+        </option>
+        <option common="true">
+          <long>dbUrl</long>
+        </option>
+        <option common="true">
+          <long>logLevel</long>
+        </option>
+      </options>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
+      </bundles>
+      <dependencies>
+        <dependency>thermostat-common-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-core-${project.version}.jar</dependency>
+        <dependency>thermostat-client-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
+        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
+        <dependency>thermostat-web-common-${project.version}.jar</dependency>
+        <dependency>thermostat-web-client-${project.version}.jar</dependency>
+        <dependency>mongo.jar</dependency>
+        <dependency>commons-beanutils.jar</dependency>
+        <dependency>commons-codec.jar</dependency>
+        <dependency>commons-collections.jar</dependency>
+        <dependency>commons-logging.jar</dependency>
+        <dependency>httpcomponents-core.jar</dependency>
+        <dependency>httpcomponents-client.jar</dependency>
+        <dependency>gson.jar</dependency>
+        <dependency>netty.jar</dependency>
+      </dependencies>
+    </command>
+    <command>
+      <name>find-root</name>
+      <description>finds the shortest path from an object to a GC root</description>
+      <options>
+        <option>
+          <long>heapId</long>
+          <short>h</short>
+          <argument>heap</argument>
+          <required>true</required>
+          <description>the ID of the heapdump to analyze</description>
+        </option>
+        <option>
+          <long>objectId</long>
+          <short>o</short>
+          <argument>heap</argument>
+          <required>true</required>
+          <description>the ID of the object to query</description>
+        </option>
+        <option>
+          <long>all</long>
+          <short>a</short>
+          <required>false</required>
+          <description>finds all paths to GC roots</description>
+        </option>
+        <option common="true">
+          <long>dbUrl</long>
+        </option>
+        <option common="true">
+          <long>logLevel</long>
+        </option>
+      </options>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
+      </bundles>
+      <dependencies>
+        <dependency>thermostat-common-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-core-${project.version}.jar</dependency>
+        <dependency>thermostat-client-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
+        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
+        <dependency>thermostat-web-common-${project.version}.jar</dependency>
+        <dependency>thermostat-web-client-${project.version}.jar</dependency>
+        <dependency>mongo.jar</dependency>
+        <dependency>commons-beanutils.jar</dependency>
+        <dependency>commons-codec.jar</dependency>
+        <dependency>commons-collections.jar</dependency>
+        <dependency>commons-logging.jar</dependency>
+        <dependency>httpcomponents-core.jar</dependency>
+        <dependency>httpcomponents-client.jar</dependency>
+        <dependency>gson.jar</dependency>
+        <dependency>netty.jar</dependency>
+      </dependencies>
+    </command>
+    <command>
+      <name>list-heap-dumps</name>
+      <description>list all heap dumps</description>
+      <options>
+        <option>
+          <long>hostId</long>
+          <short>a</short>
+          <argument>host</argument>
+          <required>false</required>
+          <description>the ID of the host to monitor</description>
+        </option>
+        <option>
+          <long>vmId</long>
+          <short>v</short>
+          <argument>vm</argument>
+          <required>false</required>
+          <description>the ID of the VM to monitor</description>
+        </option>
+        <option common="true">
+          <long>dbUrl</long>
+        </option>
+        <option common="true">
+          <long>logLevel</long>
+        </option>
+      </options>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
+      </bundles>
+      <dependencies>
+        <dependency>thermostat-common-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-core-${project.version}.jar</dependency>
+        <dependency>thermostat-client-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
+        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
+        <dependency>thermostat-web-common-${project.version}.jar</dependency>
+        <dependency>thermostat-web-client-${project.version}.jar</dependency>
+        <dependency>mongo.jar</dependency>
+        <dependency>commons-beanutils.jar</dependency>
+        <dependency>commons-codec.jar</dependency>
+        <dependency>commons-collections.jar</dependency>
+        <dependency>commons-logging.jar</dependency>
+        <dependency>httpcomponents-core.jar</dependency>
+        <dependency>httpcomponents-client.jar</dependency>
+        <dependency>gson.jar</dependency>
+        <dependency>netty.jar</dependency>
+      </dependencies>
+    </command>
+    <command>
+      <name>object-info</name>
+      <description>prints information about an object in a heap dump</description>
+      <options>
+        <option>
+          <long>heapId</long>
+          <short>h</short>
+          <argument>heap</argument>
+          <required>true</required>
+          <description>the ID of the heapdump to analyze</description>
+        </option>
+        <option>
+          <long>objectId</long>
+          <short>o</short>
+          <argument>object</argument>
+          <required>true</required>
+          <description>the ID of the object to query</description>
+        </option>
+        <option common="true">
+          <long>dbUrl</long>
+        </option>
+        <option common="true">
+          <long>logLevel</long>
+        </option>
+      </options>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
+      </bundles>
+      <dependencies>
+        <dependency>thermostat-common-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-core-${project.version}.jar</dependency>
+        <dependency>thermostat-client-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
+        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
+        <dependency>thermostat-web-common-${project.version}.jar</dependency>
+        <dependency>thermostat-web-client-${project.version}.jar</dependency>
+        <dependency>mongo.jar</dependency>
+        <dependency>commons-beanutils.jar</dependency>
+        <dependency>commons-codec.jar</dependency>
+        <dependency>commons-collections.jar</dependency>
+        <dependency>commons-logging.jar</dependency>
+        <dependency>httpcomponents-core.jar</dependency>
+        <dependency>httpcomponents-client.jar</dependency>
+        <dependency>gson.jar</dependency>
+        <dependency>netty.jar</dependency>
+      </dependencies>
+    </command>
+    <command>
+      <name>save-heap-dump-to-file</name>
+      <description>saves a heap dump to a local file</description>
+      <options>
+        <option>
+          <long>heapId</long>
+          <short>h</short>
+          <argument>heap</argument>
+          <required>true</required>
+          <description>the ID of the heapdump to analyze</description>
+        </option>
+        <option>
+          <long>file</long>
+          <short>f</short>
+          <argument>filename</argument>
+          <required>true</required>
+          <description>the file name to save to</description>
+        </option>
+        <option common="true">
+          <long>dbUrl</long>
+        </option>
+        <option common="true">
+          <long>logLevel</long>
+        </option>
+      </options>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
+      </bundles>
+      <dependencies>
+        <dependency>thermostat-common-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-core-${project.version}.jar</dependency>
+        <dependency>thermostat-client-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
+        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
+        <dependency>thermostat-web-common-${project.version}.jar</dependency>
+        <dependency>thermostat-web-client-${project.version}.jar</dependency>
+        <dependency>mongo.jar</dependency>
+        <dependency>commons-beanutils.jar</dependency>
+        <dependency>commons-codec.jar</dependency>
+        <dependency>commons-collections.jar</dependency>
+        <dependency>commons-logging.jar</dependency>
+        <dependency>httpcomponents-core.jar</dependency>
+        <dependency>httpcomponents-client.jar</dependency>
+        <dependency>gson.jar</dependency>
+        <dependency>netty.jar</dependency>
+      </dependencies>
+    </command>
+    <command>
+      <name>show-heap-histogram</name>
+      <description>show the heap histogram</description>
+      <options>
+        <option>
+          <long>heapId</long>
+          <short>h</short>
+          <argument>heap</argument>
+          <required>true</required>
+          <description>the ID of the heapdump to analyze</description>
+        </option>
+        <option common="true">
+          <long>dbUrl</long>
+        </option>
+        <option common="true">
+          <long>logLevel</long>
+        </option>
+      </options>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
+      </bundles>
+      <dependencies>
+        <dependency>thermostat-common-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-core-${project.version}.jar</dependency>
+        <dependency>thermostat-client-command-${project.version}.jar</dependency>
+        <dependency>thermostat-client-cli-${project.version}.jar</dependency>
+        <dependency>thermostat-storage-mongodb-${project.version}.jar</dependency>
+        <dependency>thermostat-web-common-${project.version}.jar</dependency>
+        <dependency>thermostat-web-client-${project.version}.jar</dependency>
+        <dependency>mongo.jar</dependency>
+        <dependency>commons-beanutils.jar</dependency>
+        <dependency>commons-codec.jar</dependency>
+        <dependency>commons-collections.jar</dependency>
+        <dependency>commons-logging.jar</dependency>
+        <dependency>httpcomponents-core.jar</dependency>
+        <dependency>httpcomponents-client.jar</dependency>
+        <dependency>gson.jar</dependency>
+        <dependency>netty.jar</dependency>
+      </dependencies>
+    </command>
+  </commands>
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-command-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>agent</name>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-heap-analysis-agent-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <!-- Requires all storage entity classes to be loaded -->
+    <extension>
+      <name>webservice</name>
+      <bundles>
+        <bundle>thermostat-vm-heap-analysis-common-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-memory/distribution/plugin.xml
--- a/vm-memory/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-vm-memory-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-memory-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-memory-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>agent</name>
-      <bundles>
-        <bundle>thermostat-vm-memory-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-memory-agent-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <!-- Requires all storage entity classes to be loaded -->
-    <extension>
-      <name>webservice</name>
-      <bundles>
-        <bundle>thermostat-vm-memory-common-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-    <extension>
-      <name>vm-stat</name>
-      <bundles>
-        <bundle>thermostat-vm-memory-common-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-memory-client-cli-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-  <!-- TODO: Express dependency on remote GC bundles -->
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-memory/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vm-memory/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-vm-memory-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-memory-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-memory-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>agent</name>
+      <bundles>
+        <bundle>thermostat-vm-memory-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-memory-agent-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <!-- Requires all storage entity classes to be loaded -->
+    <extension>
+      <name>webservice</name>
+      <bundles>
+        <bundle>thermostat-vm-memory-common-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+    <extension>
+      <name>vm-stat</name>
+      <bundles>
+        <bundle>thermostat-vm-memory-common-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-memory-client-cli-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+  <!-- TODO: Express dependency on remote GC bundles -->
+</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-overview/distribution/plugin.xml
--- a/vm-overview/distribution/plugin.xml	Thu May 16 14:22:47 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-
- Copyright 2012, 2013 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.
-
--->
-<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 plugin.xsd">
-  <extensions>
-    <extension>
-      <name>gui</name>
-      <bundles>
-        <bundle>thermostat-vm-overview-client-core-${project.version}.jar</bundle>
-        <bundle>thermostat-vm-overview-client-swing-${project.version}.jar</bundle>
-      </bundles>
-    </extension>
-  </extensions>
-</plugin>
diff -r 9372e2088954 -r cc4b35354a39 vm-overview/distribution/thermostat-plugin.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vm-overview/distribution/thermostat-plugin.xml	Thu May 16 16:39:00 2013 +0200
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!-- 
+
+ Copyright 2012, 2013 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.
+
+-->
+<plugin xmlns="http://icedtea.classpath.org/thermostat/plugins/v1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://icedtea.classpath.org/thermostat/plugins/v1.0 thermostat-plugin.xsd">
+  <extensions>
+    <extension>
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-vm-overview-client-core-${project.version}.jar</bundle>
+        <bundle>thermostat-vm-overview-client-swing-${project.version}.jar</bundle>
+      </bundles>
+    </extension>
+  </extensions>
+</plugin>