Mercurial > hg > release > thermostat-2.0
changeset 2605:b51cb6d91023
Optionally build agent-only image
Reviewed-by: jerboaa, neugens
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-February/022206.html
PR3239
line wrap: on
line diff
--- a/distribution/assembly/all-plugin-assembly.xml Wed Mar 01 18:41:34 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Copyright 2012-2017 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. - ---> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> - <id>plugin-assembly</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <unpack>true</unpack> - <includes> - <include>com.redhat.thermostat:thermostat-host-cpu-distribution</include> - <include>com.redhat.thermostat:thermostat-host-memory-distribution</include> - <include>com.redhat.thermostat:thermostat-host-overview-distribution</include> - <include>com.redhat.thermostat:thermostat-notes-distribution</include> - <include>com.redhat.thermostat:thermostat-numa-distribution</include> - <include>com.redhat.thermostat:thermostat-storage-profile-distribution</include> - <include>com.redhat.thermostat:thermostat-storage-populator-distribution</include> - <include>com.redhat.thermostat:thermostat-thread-distribution</include> - <include>com.redhat.thermostat:thermostat-validate-distribution</include> - <include>com.redhat.thermostat:thermostat-setup-distribution</include> - <include>com.redhat.thermostat:thermostat-local-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-byteman-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-classstat-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-compiler-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-cpu-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-find-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-gc-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-heap-analysis-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-io-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-jmx-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-memory-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-overview-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-profiler-distribution</include> - <include>com.redhat.thermostat:thermostat-schema-info-distribution</include> - <include>com.redhat.thermostat:thermostat-web-endpoint-distribution</include> - <include>com.redhat.thermostat:thermostat-killvm-distribution</include> - <include>com.redhat.thermostat:thermostat-vm-numa-distribution</include> - <include>com.redhat.thermostat:thermostat-platform-distribution</include> - <include>com.redhat.thermostat:thermostat-platform-swing-distribution</include> - <include>com.redhat.thermostat:thermostat-dependency-tool-distribution</include> - <include>com.redhat.thermostat:thermostat-gui-distribution</include> - </includes> - </dependencySet> - </dependencySets> - -</assembly> -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/assembly/core-assembly-agent-macosx.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>core-assembly</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <useProjectArtifact>true</useProjectArtifact> + <unpack>false</unpack> + <includes> + <include>com.redhat.thermostat:thermostat-main</include> + <include>com.redhat.thermostat:thermostat-launcher</include> + <include>com.redhat.thermostat:thermostat-agent-core</include> + <include>com.redhat.thermostat:thermostat-agent-cli</include> + <include>com.redhat.thermostat:thermostat-agent-command</include> + <include>com.redhat.thermostat:thermostat-agent-command-server</include> + <include>com.redhat.thermostat:thermostat-agent-proxy-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-tcpsocket-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-tcpsocket-client</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-unixsocket-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-unixsocket-client</include> + <include>com.redhat.thermostat:thermostat-common-core</include> + <include>com.redhat.thermostat:thermostat-common-command</include> + <include>com.redhat.thermostat:thermostat-common-portability</include> + <include>com.redhat.thermostat:thermostat-process-handler</include> + <include>com.redhat.thermostat:thermostat-storage-core</include> + <include>com.redhat.thermostat:thermostat-storage-mongodb</include> + <include>com.redhat.thermostat:thermostat-keyring</include> + <include>com.redhat.thermostat:thermostat-web-client</include> + <include>com.redhat.thermostat:thermostat-system-backend</include> + <include>org.osgi:org.osgi.compendium</include> + <include>org.apache:org.apache.felix.scr</include> + <include>io.netty:netty-handler</include> + <include>commons-codec:commons-codec</include> + <include>org.apache.httpcomponents:httpclient-osgi</include> + <!-- Remove once upstream has OSGi metadata --> + <include>com.redhat.thermostat:jnr-x86asm</include> + </includes> + <excludes> + <exclude>org.osgi:org.osgi.core</exclude> + <!-- Exclude upstream jnr-x86asm jar in favour of our wrapped bundle --> + <exclude>com.github.jnr:jnr-x86asm</exclude> + </excludes> + <useTransitiveDependencies>true</useTransitiveDependencies> + <useTransitiveFiltering>true</useTransitiveFiltering> + </dependencySet> + </dependencySets> + <!-- Include native library dependencies --> + <fileSets> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/common/portability/target</directory> + <includes> + <include>libHostNameWrapper${sharedlib.suffix}</include> + <include>libUserNameUtilWrapper${sharedlib.suffix}</include> + <include>libMacOSHelperWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + </fileSets> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/assembly/core-assembly-agent-windows.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>core-assembly</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <useProjectArtifact>true</useProjectArtifact> + <unpack>false</unpack> + <includes> + <include>com.redhat.thermostat:thermostat-main</include> + <include>com.redhat.thermostat:thermostat-launcher</include> + <include>com.redhat.thermostat:thermostat-agent-core</include> + <include>com.redhat.thermostat:thermostat-agent-cli</include> + <include>com.redhat.thermostat:thermostat-agent-command</include> + <include>com.redhat.thermostat:thermostat-agent-command-server</include> + <include>com.redhat.thermostat:thermostat-agent-proxy-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-tcpsocket-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-tcpsocket-client</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-winpipes-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-winpipes-client</include> + <include>com.redhat.thermostat:thermostat-common-core</include> + <include>com.redhat.thermostat:thermostat-common-command</include> + <include>com.redhat.thermostat:thermostat-common-portability</include> + <include>com.redhat.thermostat:thermostat-process-handler</include> + <include>com.redhat.thermostat:thermostat-storage-core</include> + <include>com.redhat.thermostat:thermostat-storage-mongodb</include> + <include>com.redhat.thermostat:thermostat-keyring</include> + <include>com.redhat.thermostat:thermostat-web-client</include> + <include>com.redhat.thermostat:thermostat-system-backend</include> + <include>org.osgi:org.osgi.compendium</include> + <include>org.apache:org.apache.felix.scr</include> + <include>io.netty:netty-handler</include> + <include>commons-codec:commons-codec</include> + <include>org.apache.httpcomponents:httpclient-osgi</include> + </includes> + <excludes> + <exclude>org.osgi:org.osgi.core</exclude> + </excludes> + <useTransitiveDependencies>true</useTransitiveDependencies> + <useTransitiveFiltering>true</useTransitiveFiltering> + </dependencySet> + </dependencySets> + <!-- Include native library dependencies --> + <fileSets> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/common/portability/target</directory> + <includes> + <include>HostNameWrapper${sharedlib.suffix}</include> + <include>UserNameUtilWrapper${sharedlib.suffix}</include> + <include>WindowsHelperWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/agent/ipc/windows-named-pipes/common/target</directory> + <includes> + <include>WinPipesNativeWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + </fileSets> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/assembly/core-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>core-assembly</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <useProjectArtifact>true</useProjectArtifact> + <unpack>false</unpack> + <includes> + <include>com.redhat.thermostat:thermostat-main</include> + <include>com.redhat.thermostat:thermostat-launcher</include> + <include>com.redhat.thermostat:thermostat-agent-core</include> + <include>com.redhat.thermostat:thermostat-agent-cli</include> + <include>com.redhat.thermostat:thermostat-agent-command</include> + <include>com.redhat.thermostat:thermostat-agent-command-server</include> + <include>com.redhat.thermostat:thermostat-agent-proxy-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-tcpsocket-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-tcpsocket-client</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-unixsocket-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-unixsocket-client</include> + <include>com.redhat.thermostat:thermostat-common-core</include> + <include>com.redhat.thermostat:thermostat-common-command</include> + <include>com.redhat.thermostat:thermostat-common-portability</include> + <include>com.redhat.thermostat:thermostat-process-handler</include> + <include>com.redhat.thermostat:thermostat-storage-core</include> + <include>com.redhat.thermostat:thermostat-storage-mongodb</include> + <include>com.redhat.thermostat:thermostat-keyring</include> + <include>com.redhat.thermostat:thermostat-web-client</include> + <include>com.redhat.thermostat:thermostat-system-backend</include> + <include>org.osgi:org.osgi.compendium</include> + <include>org.apache:org.apache.felix.scr</include> + <include>io.netty:netty-handler</include> + <include>commons-codec:commons-codec</include> + <include>org.apache.httpcomponents:httpclient-osgi</include> + <!-- Remove once upstream has OSGi metadata --> + <include>com.redhat.thermostat:jnr-x86asm</include> + </includes> + <excludes> + <exclude>org.osgi:org.osgi.core</exclude> + <!-- Exclude upstream jnr-x86asm jar in favour of our wrapped bundle --> + <exclude>com.github.jnr:jnr-x86asm</exclude> + </excludes> + <useTransitiveDependencies>true</useTransitiveDependencies> + <useTransitiveFiltering>true</useTransitiveFiltering> + </dependencySet> + </dependencySets> + <!-- Include native library dependencies --> + <fileSets> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/keyring/target</directory> + <includes> + <include>libGnomeKeyringWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/common/portability/target</directory> + <includes> + <include>libHostNameWrapper${sharedlib.suffix}</include> + <include>libUserNameUtilWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + </fileSets> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/assembly/core-assembly-macosx.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>core-assembly</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <useProjectArtifact>true</useProjectArtifact> + <unpack>false</unpack> + <includes> + <include>com.redhat.thermostat:thermostat-main</include> + <include>com.redhat.thermostat:thermostat-launcher</include> + <include>com.redhat.thermostat:thermostat-client-swing</include> + <include>com.redhat.thermostat:thermostat-swing-components</include> + <include>com.redhat.thermostat:thermostat-client-command</include> + <include>com.redhat.thermostat:thermostat-client-cli</include> + <include>com.redhat.thermostat:thermostat-osgi-living-vm-filter-swing</include> + <include>com.redhat.thermostat:thermostat-agent-core</include> + <include>com.redhat.thermostat:thermostat-agent-cli</include> + <include>com.redhat.thermostat:thermostat-agent-command</include> + <include>com.redhat.thermostat:thermostat-agent-command-server</include> + <include>com.redhat.thermostat:thermostat-agent-proxy-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-tcpsocket-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-tcpsocket-client</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-unixsocket-server</include> + <include>com.redhat.thermostat:thermostat-agent-ipc-unixsocket-client</include> + <include>com.redhat.thermostat:thermostat-common-core</include> + <include>com.redhat.thermostat:thermostat-common-command</include> + <include>com.redhat.thermostat:thermostat-common-portability</include> + <include>com.redhat.thermostat:thermostat-process-handler</include> + <include>com.redhat.thermostat:thermostat-storage-cli</include> + <include>com.redhat.thermostat:thermostat-storage-mongodb</include> + <include>com.redhat.thermostat:thermostat-keyring</include> + <include>com.redhat.thermostat:thermostat-web-client</include> + <include>com.redhat.thermostat:thermostat-system-backend</include> + <include>com.redhat.thermostat:thermostat-laf-utils</include> + <include>org.osgi:org.osgi.compendium</include> + <include>org.apache:org.apache.felix.scr</include> + <!-- Remove once upstream has OSGi metadata --> + <include>com.redhat.thermostat:jnr-x86asm</include> + </includes> + <excludes> + <exclude>org.osgi:org.osgi.core</exclude> + <!-- Exclude upstream jnr-x86asm jar in favour of our wrapped bundle --> + <exclude>com.github.jnr:jnr-x86asm</exclude> + </excludes> + <useTransitiveDependencies>true</useTransitiveDependencies> + <useTransitiveFiltering>true</useTransitiveFiltering> + </dependencySet> + </dependencySets> + <!-- Include native library dependencies --> + <fileSets> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/common/portability/target</directory> + <includes> + <include>libHostNameWrapper${sharedlib.suffix}</include> + <include>libUserNameUtilWrapper${sharedlib.suffix}</include> + <include>libMacOSHelperWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + </fileSets> +</assembly> +
--- a/distribution/assembly/core-assembly-windows.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/distribution/assembly/core-assembly-windows.xml Thu Mar 02 15:00:42 2017 -0500 @@ -77,17 +77,32 @@ <include>com.redhat.thermostat:thermostat-laf-utils</include> <include>org.osgi:org.osgi.compendium</include> <include>org.apache:org.apache.felix.scr</include> - <!-- Remove once upstream has OSGi metadata --> - <include>com.redhat.thermostat:jnr-x86asm</include> </includes> <excludes> <exclude>org.osgi:org.osgi.core</exclude> - <!-- Exclude upstream jnr-x86asm jar in favour of our wrapped bundle --> - <exclude>com.github.jnr:jnr-x86asm</exclude> </excludes> <useTransitiveDependencies>true</useTransitiveDependencies> <useTransitiveFiltering>true</useTransitiveFiltering> </dependencySet> </dependencySets> + <!-- Include native library dependencies --> + <fileSets> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/common/portability/target</directory> + <includes> + <include>HostNameWrapper${sharedlib.suffix}</include> + <include>UserNameUtilWrapper${sharedlib.suffix}</include> + <include>WindowsHelperWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/agent/ipc/windows-named-pipes/common/target</directory> + <includes> + <include>WinPipesNativeWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + </fileSets> </assembly>
--- a/distribution/assembly/core-assembly.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/distribution/assembly/core-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -89,5 +89,30 @@ <useTransitiveFiltering>true</useTransitiveFiltering> </dependencySet> </dependencySets> + <!-- Include native library dependencies --> + <fileSets> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/keyring/target</directory> + <includes> + <include>libGnomeKeyringWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/common/portability/target</directory> + <includes> + <include>libHostNameWrapper${sharedlib.suffix}</include> + <include>libUserNameUtilWrapper${sharedlib.suffix}</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>native</outputDirectory> + <directory>${main.basedir}/laf-utils/target</directory> + <includes> + <include>libGTKThemeUtils${sharedlib.suffix}</include> + </includes> + </fileSet> + </fileSets> </assembly>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/assembly/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <unpack>true</unpack> + <includes> + <include>com.redhat.thermostat:thermostat-host-cpu-distribution</include> + <include>com.redhat.thermostat:thermostat-host-memory-distribution</include> + <include>com.redhat.thermostat:thermostat-numa-distribution</include> + <include>com.redhat.thermostat:thermostat-thread-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-byteman-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-classstat-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-compiler-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-cpu-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-gc-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-io-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-jmx-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-memory-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> + </dependencySet> + </dependencySets> + +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/assembly/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <unpack>true</unpack> + <includes> + <include>com.redhat.thermostat:thermostat-host-cpu-distribution</include> + <include>com.redhat.thermostat:thermostat-host-memory-distribution</include> + <include>com.redhat.thermostat:thermostat-host-overview-distribution</include> + <include>com.redhat.thermostat:thermostat-notes-distribution</include> + <include>com.redhat.thermostat:thermostat-numa-distribution</include> + <include>com.redhat.thermostat:thermostat-storage-profile-distribution</include> + <include>com.redhat.thermostat:thermostat-storage-populator-distribution</include> + <include>com.redhat.thermostat:thermostat-thread-distribution</include> + <include>com.redhat.thermostat:thermostat-validate-distribution</include> + <include>com.redhat.thermostat:thermostat-setup-distribution</include> + <include>com.redhat.thermostat:thermostat-local-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-byteman-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-classstat-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-compiler-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-cpu-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-find-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-gc-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-io-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-jmx-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-memory-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-overview-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-profiler-distribution</include> + <include>com.redhat.thermostat:thermostat-schema-info-distribution</include> + <include>com.redhat.thermostat:thermostat-web-endpoint-distribution</include> + <include>com.redhat.thermostat:thermostat-killvm-distribution</include> + <include>com.redhat.thermostat:thermostat-vm-numa-distribution</include> + <include>com.redhat.thermostat:thermostat-platform-distribution</include> + <include>com.redhat.thermostat:thermostat-platform-swing-distribution</include> + <include>com.redhat.thermostat:thermostat-dependency-tool-distribution</include> + <include>com.redhat.thermostat:thermostat-gui-distribution</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/assembly/scripts-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>scripts-assembly</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <outputDirectory>bin</outputDirectory> + <directory>scripts</directory> + <excludes> + <exclude>thermostat-webservice</exclude> + <exclude>thermostat-setup</exclude> + <exclude>thermostat-devsetup</exclude> + </excludes> + <filtered>true</filtered> + </fileSet> + <fileSet> + <outputDirectory>etc</outputDirectory> + <directory>config</directory> + <includes> + <include>agent.properties</include> + <include>agent.auth</include> + <include>ssl.properties</include> + <include>thermostatrc</include> + <include>logging.properties</include> + <include>bash-complete-logging.properties</include> + <include>osgi-export.properties</include> + <include>commands/agent.properties</include> + <include>commands/help.properties</include> + </includes> + <filtered>true</filtered> + </fileSet> + </fileSets> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/assembly/scripts-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>scripts-assembly</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <outputDirectory>bin</outputDirectory> + <directory>scripts</directory> + <filtered>true</filtered> + </fileSet> + <fileSet> + <outputDirectory>libs</outputDirectory> + <directory>libs</directory> + <includes> + <include>create-user.js</include> + </includes> + <filtered>true</filtered> + </fileSet> + <fileSet> + <outputDirectory>etc</outputDirectory> + <directory>config</directory> + <includes> + <include>agent.properties</include> + <include>web-storage-service.properties</include> + <include>agent.auth</include> + <include>web.auth</include> + <include>ssl.properties</include> + <include>thermostatrc</include> + <include>thermostat-users.properties</include> + <include>thermostat-roles.properties</include> + <include>thermostat_jaas.conf</include> + <include>devsetup.input</include> + <include>db.properties</include> + <include>logging.properties</include> + <include>bash-complete-logging.properties</include> + <include>osgi-export.properties</include> + <include>commands/*.properties</include> + </includes> + <filtered>true</filtered> + </fileSet> + <fileSet> + <outputDirectory>etc/examples</outputDirectory> + <directory>config/examples</directory> + <includes> + <!-- Example files with real users. agent-tester and client-tester --> + <include>thermostat-users-example.properties</include> + <include>thermostat-roles-example.properties</include> + </includes> + <filtered>false</filtered> + </fileSet> + <fileSet> + <outputDirectory>etc/plugins.d</outputDirectory> + <directory>config</directory> + <includes> + <include>shell-command/shell-prompt.conf</include> + <include>storage-populator/*.json</include> + </includes> + <filtered>true</filtered> + </fileSet> + </fileSets> + <!-- Application descriptors used by Platform --> + <files> + <file> + <source>${main.basedir}/platform/swing/core/target/generated-sources/annotations/template.json</source> + <outputDirectory>etc/plugins.d/platform</outputDirectory> + </file> + <file> + <source>${main.basedir}/thermostat-gui/core/target/generated-sources/annotations/gui.json</source> + <outputDirectory>etc/plugins.d/platform</outputDirectory> + </file> + </files> +</assembly> +
--- a/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -102,32 +102,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!--linux only files --> - <execution> - <id>directory-structure-linux</id> - <phase>prepare-package</phase> - <configuration> - <target> - <copy file="${main.basedir}/keyring/target/libGnomeKeyringWrapper${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - <copy file="${main.basedir}/common/portability/target/libHostNameWrapper${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - <copy file="${main.basedir}/common/portability/target/libUserNameUtilWrapper${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - <copy file="${main.basedir}/laf-utils/target/libGTKThemeUtils${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <executions> @@ -139,7 +113,7 @@ </execution> </executions> <configuration> - <executable>${project.basedir}/tools/verify-bash-completion.sh</executable> + <executable>${project.basedir}/tools/verify-bash-completion${thermostat.assemblyconfig}.sh</executable> </configuration> </plugin> </plugins> @@ -153,7 +127,7 @@ <os><family>mac</family></os> </activation> <properties> - <assemblyfile.suffix/> + <assemblyfile.suffix>macosx</assemblyfile.suffix> <agent.extra.bundles>,com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \ ${jffi-native.bundle.symbolic.name}=${jffi.version}</agent.extra.bundles> <service.extra.bundles>,com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \ @@ -179,30 +153,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!--linux only files --> - <execution> - <id>directory-structure-linux</id> - <phase>prepare-package</phase> - <configuration> - <target> - <copy file="${main.basedir}/common/portability/target/libHostNameWrapper${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - <copy file="${main.basedir}/common/portability/target/libUserNameUtilWrapper${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - <copy file="${main.basedir}/common/portability/target/libMacOSHelperWrapper${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <executions> @@ -214,7 +164,7 @@ </execution> </executions> <configuration> - <executable>${project.basedir}/tools/verify-bash-completion.sh</executable> + <executable>${project.basedir}/tools/verify-bash-completion${thermostat.assemblyconfig}.sh</executable> </configuration> </plugin> </plugins> @@ -246,34 +196,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!-- windows-only files--> - <execution> - <id>directory-structure-windows</id> - <phase>prepare-package</phase> - <configuration> - <target> - <!-- copy and rename the native libraries --> - <copy file="${main.basedir}/common/portability/target/HostNameWrapper${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - <copy file="${main.basedir}/common/portability/target/UserNameUtilWrapper${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - <copy file="${main.basedir}/common/portability/target/WindowsHelperWrapper${sharedlib.suffix}" - todir="${project.build.directory}/image/libs/native" /> - <copy file="${main.basedir}/agent/ipc/windows-named-pipes/common/target/WinPipesNativeWrapper.dll" - todir="${project.build.directory}/image/libs/native" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> @@ -315,7 +237,7 @@ <executable>cmd.exe</executable> <arguments> <argument>/c</argument> - <argument>${project.basedir}/tools/verify-bash-completion.cmd</argument> + <argument>${project.basedir}/tools/verify-bash-completion${thermostat.assemblyconfig}.cmd</argument> </arguments> </configuration> </execution> @@ -324,6 +246,45 @@ </plugins> </build> </profile> + + <profile> + <id>full-image</id> + <activation> + <property> + <name>!agentImage</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <!-- Copy the extracted thermostat web archive to directory image/webapp + using maven-dependency-plugin. The thermostat-web-war artifact + will be extracted as the only artifact. --> + <execution> + <id>copy-exploded-web-archive-to-image-dir</id> + <phase>package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-web-war</artifactId> + <type>war</type> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/image/webapp</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <build> @@ -337,32 +298,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <!-- Copy the extracted thermostat web archive to directory image/webapp - using maven-dependency-plugin. The thermostat-web-war artifact - will be extracted as the only artifact. --> - <execution> - <id>copy-exploded-web-archive-to-image-dir</id> - <phase>package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-web-war</artifactId> - <type>war</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/image/webapp</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <appendAssemblyId>false</appendAssemblyId> @@ -372,7 +307,7 @@ <id>assemble-core</id> <configuration> <descriptors> - <descriptor>assembly/core-assembly${assemblyfile.suffix}.xml</descriptor> + <descriptor>assembly/core-assembly${thermostat.assemblyconfig}${assemblyfile.suffix}.xml</descriptor> </descriptors> <finalName>image/libs</finalName> <attach>false</attach> @@ -386,7 +321,7 @@ <id>assemble-all-plugins</id> <configuration> <descriptors> - <descriptor>assembly/all-plugin-assembly.xml</descriptor> + <descriptor>assembly/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> </descriptors> <finalName>image/plugins</finalName> <attach>false</attach> @@ -410,6 +345,20 @@ <goal>single</goal> </goals> </execution> + <execution> + <id>assemble-scripts</id> + <configuration> + <descriptors> + <descriptor>assembly/scripts-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> + <finalName>image</finalName> + <attach>false</attach> + </configuration> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> </executions> </plugin> <plugin> @@ -425,62 +374,6 @@ <outputDirectory>${project.build.directory}</outputDirectory> <resources> <resource> - <directory>scripts</directory> - <targetPath>image/bin</targetPath> - <filtering>true</filtering> - </resource> - <resource> - <directory>libs</directory> - <targetPath>image/libs</targetPath> - <filtering>true</filtering> - <includes> - <include>create-user.js</include> - </includes> - </resource> - <resource> - <directory>config</directory> - <targetPath>image/etc</targetPath> - <filtering>true</filtering> - <includes> - <include>agent.properties</include> - <include>web-storage-service.properties</include> - <include>agent.auth</include> - <include>web.auth</include> - <include>ssl.properties</include> - <include>thermostatrc</include> - <include>thermostat-users.properties</include> - <include>thermostat-roles.properties</include> - <include>thermostat_jaas.conf</include> - <include>devsetup.input</include> - <include>db.properties</include> - <include>logging.properties</include> - <include>bash-complete-logging.properties</include> - <include>osgi-export.properties</include> - <include>commands/*.properties</include> - </includes> - </resource> - <resource> - <directory>config/examples</directory> - <targetPath>image/etc/examples</targetPath> - <filtering>false</filtering> - <includes> - <!-- Example files with real users. agent-tester and client-tester --> - <include>thermostat-users-example.properties</include> - <include>thermostat-roles-example.properties</include> - </includes> - </resource> - <resource> - <directory>config</directory> - <targetPath>image/etc/plugins.d</targetPath> - <filtering>true</filtering> - <includes> - <include>shell-command/shell-prompt.conf</include> - <include>storage-populator/*.json</include> - <include>platform/*.json</include> - <include>thermostat-gui/*.json</include> - </includes> - </resource> - <resource> <directory>tools</directory> <targetPath>tools</targetPath> <filtering>true</filtering> @@ -551,21 +444,6 @@ <goal>run</goal> </goals> </execution> - <execution> - <id>directory-structure-common</id> - <phase>prepare-package</phase> - <configuration> - <target> - <copy file="${main.basedir}/platform/swing/core/target/generated-sources/annotations/template.json" - todir="${project.build.directory}/image/etc/plugins.d/platform" /> - <copy file="${main.basedir}/thermostat-gui/core/target/generated-sources/annotations/gui.json" - todir="${project.build.directory}/image/etc/plugins.d/platform" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> </executions> </plugin> </plugins> @@ -573,7 +451,7 @@ <dependencies> <!-- thermostat core parts. Be sure to - also adjust ../distribution/assembly/core-assembly.xml --> + also adjust ../distribution/assembly/core-assembly*.xml --> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-main</artifactId> @@ -717,7 +595,7 @@ <!-- Plugins --> <!-- Be sure to add the distribution module of your plugin below - with type "zip", and also to ../distribution/assembly/all-plugin-assembly.xml --> + with type "zip", and also to ../distribution/assembly/plugin-assembly*.xml --> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-host-cpu-distribution</artifactId>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/tools/verify-bash-completion-agent.cmd Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,12 @@ +@echo off + +set CMD_DIR=%~dp0 +set CYGWIN_DIR=c:\cygwin64 +set PATH=%PATH%;%CYGWIN_DIR%\bin + +for /f "delims=" %%a in ('%CYGWIN_DIR%\bin\cygpath -u %CMD_DIR%') do @set CMD_DIR=%%a + +%CYGWIN_DIR%\bin\bash -c %CMD_DIR%verify-bash-completion-agent.sh + +rem echo XXX ERRR = %errorlevel% +exit /b %errorlevel%
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/tools/verify-bash-completion-agent.sh Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,55 @@ +#!/bin/bash +# +# Copyright 2012-2017 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. +# + +# Tests for bash-completion + +set -e + +# Source functions from the same directory as this script +CWD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +. "${CWD}"/verify-bash-completion-functions.sh + +__init + +echo "Testing bash completions..." + +__check_completion "thermostat --v" "--version" +__check_completion "thermostat --p" "--print-osgi-info" + +__check_completion "thermostat ag" "agent" + +exit $errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/distribution/tools/verify-bash-completion-functions.sh Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,113 @@ +#!/bin/bash +# +# Copyright 2012-2017 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. +# + +errors=0 + +TARGET="$(dirname "$0")/../target" + +# Join the supplied arguments into a single string using the specified separator +# $1 : the separator +# everything else: arguments to join +function __join { local IFS="$1"; shift; echo "$*"; } + +# Remove trailing and leading spaces and convert \n to spaces +function __prettify { + tr '\n' ' ' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' +} + +function __print_completions { + for ((i=0;i<${#COMPREPLY[*]};i++)) + do + echo ${COMPREPLY[i]} + done +} + +function __init { + USER_THERMOSTAT_HOME="$TARGET/bash-completion-test-user-home" + echo "Exporting custom home..." + export USER_THERMOSTAT_HOME + echo "Checking that help works..." + "${TARGET}/image/bin/thermostat" help >/dev/null + + completion_file="${TARGET}/packaging/bash-completion/thermostat-completion" + echo "'$completion_file'" + source "${completion_file}" +} + +# Find completions for the given input +# +# Writes completion results to stdout. Writes any non-completion output +# to stderr. +function __find_completion { + COMP_WORDS=("${@}") + COMP_LINE=$(__join " " "${COMP_WORD[@]}") + COMP_COUNT=${#COMP_LINE} + COMP_CWORD=1 + # Use 'complete -p | sed' to find out the function that does completion, + # then call it + $(complete -p thermostat | sed "s/.*-F \\([^ ]*\\) .*/\\1/") 1>&2 + __print_completions +} + +# $1: The text to complete +# eg: 'thermostat --foo' +# 'thermostat g' +# $2: The expected completion output. Multiple results are separate by +# newlines. +# eg: '--foo-the-bar' +# $'gc\ngui' ($'' interprets special characters) +function __check_completion { + input=$1 + expected=$2 + expected_pretty=$(echo $expected | __prettify) + # clean up (cygwin doesn't seem to delete redirect files if no output) + rm -f "${TARGET}/completion.actual" + # save completions and any other output separately and check both + __find_completion $input > "${TARGET}/completion.actual" 2> "${TARGET}/completion.output" + actual=$(<"${TARGET}/completion.actual") + actual_pretty=$(echo "$actual" | __prettify) + output=$(<"${TARGET}/completion.output") + if [[ $actual == $expected && -z $output ]] ; then + echo "[OK] '$input' => '$actual_pretty'" + elif [[ -z $output ]]; then + echo -e "[\e[31mFAIL\e[0m] '$input' => '$actual_pretty' (expected '$expected_pretty')" + errors=1 + else + echo -e "[\e[31mFAIL\e[0m] '$input' produced output on stdout/stderr" + errors=1 + fi +}
--- a/distribution/tools/verify-bash-completion.sh Wed Mar 01 18:41:34 2017 +0100 +++ b/distribution/tools/verify-bash-completion.sh Thu Mar 02 15:00:42 2017 -0500 @@ -39,83 +39,9 @@ set -e -errors=0 - -TARGET="$(dirname "$0")/../target" - -# Join the supplied arguments into a single string using the specified separator -# $1 : the separator -# everything else: arguments to join -function __join { local IFS="$1"; shift; echo "$*"; } - -# Remove trailing and leading spaces and convert \n to spaces -function __prettify { - tr '\n' ' ' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' -} - -function __print_completions { - for ((i=0;i<${#COMPREPLY[*]};i++)) - do - echo ${COMPREPLY[i]} - done -} - -function __init { - USER_THERMOSTAT_HOME="$TARGET/bash-completion-test-user-home" - echo "Exporting custom home..." - export USER_THERMOSTAT_HOME - echo "Checking that help works..." - "${TARGET}/image/bin/thermostat" help >/dev/null - - completion_file="${TARGET}/packaging/bash-completion/thermostat-completion" - echo "'$completion_file'" - source "${completion_file}" -} - -# Find completions for the given input -# -# Writes completion results to stdout. Writes any non-completion output -# to stderr. -function __find_completion { - COMP_WORDS=("${@}") - COMP_LINE=$(__join " " "${COMP_WORD[@]}") - COMP_COUNT=${#COMP_LINE} - COMP_CWORD=1 - # Use 'complete -p | sed' to find out the function that does completion, - # then call it - $(complete -p thermostat | sed "s/.*-F \\([^ ]*\\) .*/\\1/") 1>&2 - __print_completions -} - -# $1: The text to complete -# eg: 'thermostat --foo' -# 'thermostat g' -# $2: The expected completion output. Multiple results are separate by -# newlines. -# eg: '--foo-the-bar' -# $'gc\ngui' ($'' interprets special characters) -function __check_completion { - input=$1 - expected=$2 - expected_pretty=$(echo $expected | __prettify) - # clean up (cygwin doesn't seem to delete redirect files if no output) - rm -f "${TARGET}/completion.actual" - # save completions and any other output separately and check both - __find_completion $input > "${TARGET}/completion.actual" 2> "${TARGET}/completion.output" - actual=$(<"${TARGET}/completion.actual") - actual_pretty=$(echo "$actual" | __prettify) - output=$(<"${TARGET}/completion.output") - if [[ $actual == $expected && -z $output ]] ; then - echo "[OK] '$input' => '$actual_pretty'" - elif [[ -z $output ]]; then - echo -e "[\e[31mFAIL\e[0m] '$input' => '$actual_pretty' (expected '$expected_pretty')" - errors=1 - else - echo -e "[\e[31mFAIL\e[0m] '$input' produced output on stdout/stderr" - errors=1 - fi -} - +# Source functions from the same directory as this script +CWD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +. "${CWD}"/verify-bash-completion-functions.sh __init
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-cpu/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-host-cpu-common</include> + <include>com.redhat.thermostat:thermostat-host-cpu-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-cpu/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-host-cpu-common</include> + <include>com.redhat.thermostat:thermostat-host-cpu-client-core</include> + <include>com.redhat.thermostat:thermostat-host-cpu-client-swing</include> + <include>com.redhat.thermostat:thermostat-host-cpu-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/host-cpu/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/host-cpu/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-cpu/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.host.cpu.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.host.cpu.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-memory/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-host-memory-common</include> + <include>com.redhat.thermostat:thermostat-host-memory-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-memory/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-host-memory-common</include> + <include>com.redhat.thermostat:thermostat-host-memory-client-core</include> + <include>com.redhat.thermostat:thermostat-host-memory-client-swing</include> + <include>com.redhat.thermostat:thermostat-host-memory-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/host-memory/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/host-memory/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-memory/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.host.memory.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.host.memory.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- a/integration-tests/itest-run/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/integration-tests/itest-run/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -100,6 +100,7 @@ </goals> <configuration> <skip>false</skip> + <includesFile>${project.basedir}/test${thermostat.assemblyconfig}.includes</includesFile> <!-- Don't run the suite class. We only have it for the stand-alone itest thingy --> <excludes> <exclude>**/AllStandaloneTests.java</exclude>
--- a/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/AllCommandsResolvableTest.java Wed Mar 01 18:41:34 2017 +0100 +++ b/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/AllCommandsResolvableTest.java Thu Mar 02 15:00:42 2017 -0500 @@ -78,7 +78,7 @@ public void testAllCommandsOsgiResolve() throws Exception { List<String> allCmds = parseAvailableCommandsFromHelp(); System.out.println(allCmds); - assertTrue("sanity check help output failed", allCmds.containsAll(Arrays.asList("list-vms", "help"))); + assertTrue("sanity check help output failed", allCmds.containsAll(Arrays.asList("agent", "help"))); for (String command: allCmds) { System.out.println("###### testing command: " + command); Spawn shell = spawnThermostat(command, UNKNOWN_CMD_OPTION);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/integration-tests/itest-run/test-agent.includes Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,5 @@ +# Include tests that only depend on the "agent" command +**/AllCommandsResolvableTest.java +**/EnvironmentExecutorTest.java +**/LogConfiguratorTest.java +**/PropertiesExecutorTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/integration-tests/itest-run/test.includes Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,1 @@ +**/*Test.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/killvm/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-killvm-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/killvm/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-killvm-common</include> + <include>com.redhat.thermostat:thermostat-killvm-command</include> + <include>com.redhat.thermostat:thermostat-killvm-client-swing</include> + <include>com.redhat.thermostat:thermostat-killvm-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/killvm/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/killvm/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -57,17 +57,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/killvm/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,51 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.killvm.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- a/launcher/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/launcher/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -120,6 +120,10 @@ <artifactId>org.apache.felix.scr.annotations</artifactId> </dependency> <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + </dependency> + <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-common-core</artifactId> <version>${project.version}</version>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/numa/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-numa-common</include> + <include>com.redhat.thermostat:thermostat-numa-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/numa/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-numa-common</include> + <include>com.redhat.thermostat:thermostat-numa-client-core</include> + <include>com.redhat.thermostat:thermostat-numa-client-swing</include> + <include>com.redhat.thermostat:thermostat-numa-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/numa/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/numa/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/numa/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.numa.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.numa.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- a/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -206,6 +206,31 @@ <license.skip>true</license.skip> </properties> </profile> + + <!-- Profiles to control what components are added to the built image --> + <profile> + <id>agent-image</id> + <activation> + <property> + <name>agentImage</name> + </property> + </activation> + <properties> + <thermostat.assemblyconfig>-agent</thermostat.assemblyconfig> + </properties> + </profile> + <profile> + <id>full-image</id> + <activation> + <property> + <name>!agentImage</name> + </property> + </activation> + <properties> + <thermostat.assemblyconfig/> + </properties> + </profile> + </profiles> <properties>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thread/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-thread-harvester</include> + <include>com.redhat.thermostat:thermostat-thread-collector</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thread/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-thread-client-common</include> + <include>com.redhat.thermostat:thermostat-thread-client-controllers</include> + <include>com.redhat.thermostat:thermostat-thread-client-swing</include> + <include>com.redhat.thermostat:thermostat-thread-harvester</include> + <include>com.redhat.thermostat:thermostat-thread-collector</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/thread/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/thread/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thread/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.thread.collector</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.thread.harvester</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-byteman/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-byteman-common</include> + <include>com.redhat.thermostat:thermostat-vm-byteman-agent</include> + <include>org.jboss.byteman:byteman-submit</include> + <include>org.jboss.byteman:byteman-install</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-byteman/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-byteman-common</include> + <include>com.redhat.thermostat:thermostat-vm-byteman-client-cli</include> + <include>com.redhat.thermostat:thermostat-vm-byteman-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-byteman-agent</include> + <include>org.jboss.byteman:byteman-submit</include> + <include>org.jboss.byteman:byteman-install</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-byteman/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-byteman/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-byteman/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + + Copyright 2012-2017 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 http://icedtea.classpath.org/thermostat/docs/1.0/thermostat-plugin.xsd"> + <extensions> + <extension> + <name>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.byteman.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.byteman.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-classstat/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-classstat-common</include> + <include>com.redhat.thermostat:thermostat-vm-classstat-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-classstat/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-classstat-common</include> + <include>com.redhat.thermostat:thermostat-vm-classstat-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-classstat-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-classstat-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-classstat/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-classstat/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-classstat/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.classstat.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.classstat.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> + <!-- TODO: Need to express dependency on vm-memory-common --> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-compiler/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-compiler-common</include> + <include>com.redhat.thermostat:thermostat-vm-compiler-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-compiler/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-compiler-common</include> + <include>com.redhat.thermostat:thermostat-vm-compiler-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-compiler-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-compiler-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-compiler/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-compiler/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-compiler/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.compiler.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.compiler.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-cpu/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-cpu-common</include> + <include>com.redhat.thermostat:thermostat-vm-cpu-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-cpu/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-cpu-common</include> + <include>com.redhat.thermostat:thermostat-vm-cpu-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-cpu-client-cli</include> + <include>com.redhat.thermostat:thermostat-vm-cpu-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-cpu-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-cpu/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-cpu/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-cpu/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.cpu.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.cpu.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-gc/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-gc-common</include> + <include>com.redhat.thermostat:thermostat-vm-gc-agent</include> + <include>com.redhat.thermostat:thermostat-gc-remote-collector-common</include> + <include>com.redhat.thermostat:thermostat-gc-remote-collector-command</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-gc/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-gc-common</include> + <include>com.redhat.thermostat:thermostat-vm-gc-command</include> + <include>com.redhat.thermostat:thermostat-vm-gc-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-gc-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-gc-agent</include> + <include>com.redhat.thermostat:thermostat-gc-remote-collector-common</include> + <include>com.redhat.thermostat:thermostat-gc-remote-collector-command</include> + <include>com.redhat.thermostat:thermostat-gc-remote-collector-client-common</include> + <include>com.redhat.thermostat:thermostat-gc-remote-collector-client-swing</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-gc/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-gc/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-gc/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,55 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.gc.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.gc.agent</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.gc.remote.common.command</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.gc.remote.command</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> + <!-- TODO: Need to express dependency on vm-memory-common --> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-heap-analysis/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-common</include> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-agent</include> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-hprof</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene-analyzers-common</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-heap-analysis/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-common</include> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-command</include> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-agent</include> + <include>com.redhat.thermostat:thermostat-vm-heap-analysis-hprof</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene-analyzers-common</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-heap-analysis/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-heap-analysis/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-heap-analysis/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.heap.analysis.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.heap.analysis.hprof</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.heap.analysis.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-io/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-io-common</include> + <include>com.redhat.thermostat:thermostat-vm-io-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-io/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-io-common</include> + <include>com.redhat.thermostat:thermostat-vm-io-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-io-client-cli</include> + <include>com.redhat.thermostat:thermostat-vm-io-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-io-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-io/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-io/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-io/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.io.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.io.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-jmx/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-jmx-common</include> + <include>com.redhat.thermostat:thermostat-vm-jmx-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-jmx/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-jmx-common</include> + <include>com.redhat.thermostat:thermostat-vm-jmx-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-jmx-client-cli</include> + <include>com.redhat.thermostat:thermostat-vm-jmx-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-jmx-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-jmx/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-jmx/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-jmx/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.jmx.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.jmx.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-memory/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-memory-common</include> + <include>com.redhat.thermostat:thermostat-vm-memory-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-memory/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-memory-common</include> + <include>com.redhat.thermostat:thermostat-vm-memory-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-memory-client-cli</include> + <include>com.redhat.thermostat:thermostat-vm-memory-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-memory-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-memory/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-memory/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-memory/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.memory.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.memory.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> + <!-- TODO: Express dependency on remote GC bundles --> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-numa/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-numa-common</include> + <include>com.redhat.thermostat:thermostat-vm-numa-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-numa/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-numa-common</include> + <include>com.redhat.thermostat:thermostat-vm-numa-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-numa-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-numa-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-numa/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-numa/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-numa/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<!-- + + Copyright 2012-2017 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>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.numa.agent</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.numa.common</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-profiler/distribution/assemblies/plugin-assembly-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-profiler-common</include> + <include>com.redhat.thermostat:thermostat-vm-profiler-agent</include> + <include>com.redhat.thermostat:thermostat-vm-profiler-jvm-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin-agent.xml</source> + <destName>thermostat-plugin.xml</destName> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-profiler/distribution/assemblies/plugin-assembly.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2012-2017 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. + +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>plugin-assembly</id> + <formats> + <format>zip</format> + </formats> + <baseDirectory>${thermostat.plugin}</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <includes> + <include>com.redhat.thermostat:thermostat-vm-profiler-common</include> + <include>com.redhat.thermostat:thermostat-vm-profiler-client-core</include> + <include>com.redhat.thermostat:thermostat-vm-profiler-client-cli</include> + <include>com.redhat.thermostat:thermostat-vm-profiler-client-swing</include> + <include>com.redhat.thermostat:thermostat-vm-profiler-agent</include> + <include>com.redhat.thermostat:thermostat-vm-profiler-jvm-agent</include> + </includes> + <useProjectArtifact>false</useProjectArtifact> + <useTransitiveDependencies>false</useTransitiveDependencies> + <useStrictFiltering>true</useStrictFiltering> + </dependencySet> + </dependencySets> + + <files> + <file> + <source>thermostat-plugin.xml</source> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + </file> + </files> +</assembly> +
--- a/vm-profiler/distribution/pom.xml Wed Mar 01 18:41:34 2017 +0100 +++ b/vm-profiler/distribution/pom.xml Thu Mar 02 15:00:42 2017 -0500 @@ -58,17 +58,10 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.redhat.thermostat</groupId> - <artifactId>thermostat-assembly</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> - <descriptorRefs> - <descriptorRef>plugin-assembly</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>assemblies/plugin-assembly${thermostat.assemblyconfig}.xml</descriptor> + </descriptors> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-profiler/distribution/thermostat-plugin-agent.xml Thu Mar 02 15:00:42 2017 -0500 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + + Copyright 2012-2017 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 http://icedtea.classpath.org/thermostat/docs/1.0/thermostat-plugin.xsd"> + <extensions> + <extension> + <name>agent</name> + <bundles> + <bundle><symbolic-name>com.redhat.thermostat.vm.profiler.common</symbolic-name><version>${project.version}</version></bundle> + <bundle><symbolic-name>com.redhat.thermostat.vm.profiler.agent</symbolic-name><version>${project.version}</version></bundle> + </bundles> + </extension> + </extensions> +</plugin>