Mercurial > hg > thermostat-ng > agent

changeset 2692:a5425acc4260

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable kill-vm plugin. Reviewed-by: ebaron Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-June/023629.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Mon, 12 Jun 2017 19:04:06 +0200
parents c4ea301ff07b
children d2535ae16b77
files distribution/assembly/plugin-assembly.xml plugins/killvm/distribution/assemblies/plugin-assembly.xml
diffstat 2 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/assembly/plugin-assembly.xml	Mon Jun 12 20:50:03 2017 +0200
+++ b/distribution/assembly/plugin-assembly.xml	Mon Jun 12 19:04:06 2017 +0200
@@ -65,8 +65,8 @@
 <!--        <include>com.redhat.thermostat:thermostat-vm-io-distribution</include>-->
 <!--        <include>com.redhat.thermostat:thermostat-vm-jmx-distribution</include>-->
         <include>com.redhat.thermostat:thermostat-commands-distribution</include>
+        <include>com.redhat.thermostat:thermostat-killvm-distribution</include>
 <!--        <include>com.redhat.thermostat:thermostat-vm-profiler-distribution</include>-->
-<!--        <include>com.redhat.thermostat:thermostat-killvm-distribution</include>-->
 <!--        <include>com.redhat.thermostat:thermostat-vm-numa-distribution</include>-->
       </includes>
       <unpackOptions>
--- a/plugins/killvm/distribution/assemblies/plugin-assembly.xml	Mon Jun 12 20:50:03 2017 +0200
+++ b/plugins/killvm/distribution/assemblies/plugin-assembly.xml	Mon Jun 12 19:04:06 2017 +0200
@@ -43,8 +43,7 @@
   <formats>
     <format>zip</format>
   </formats>
-  <baseDirectory>${thermostat.plugin}</baseDirectory>
-  <includeBaseDirectory>true</includeBaseDirectory>
+  <includeBaseDirectory>false</includeBaseDirectory>
   
   <dependencySets>
     <dependencySet>
@@ -53,15 +52,18 @@
       </includes>
       <useProjectArtifact>false</useProjectArtifact>
       <useStrictFiltering>true</useStrictFiltering>
+      <outputDirectory>plugins/${thermostat.plugin}</outputDirectory>
     </dependencySet>
   </dependencySets>
   
-  <files>
-    <file>
-      <source>thermostat-plugin.xml</source>
-      <outputDirectory>/</outputDirectory>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>thermostat-plugin.xml</include>
+      </includes>
+      <outputDirectory>plugins/${thermostat.plugin}</outputDirectory>
       <filtered>true</filtered>
-    </file>
-  </files>
+    </fileSet>
+  </fileSets>
 </assembly>