Mercurial > hg > release > thermostat-1.0
view distribution/pom.xml @ 1382:7caa7f9afb14
Separate storage command from agent-cli
Backport of PR1608.
We get an exception that the RMI registry port is already
in use for running "thermostat storage --status". This happens because
agent-core's activator creates a thread pool for JMX connections, which
in turn creates the RMI registry. My proposed solution is to separate
the storage command from the agent bundles, currently it resides in
agent-cli. This patch creates a storage-cli bundle that houses
StorageCommand and its related classes. There are then some
modifications to the ServiceCommand in order to invoke the storage
command without having a bundle dependency on storage-cli, which would
also entail having to export StorageCommand.
Reviewed-by: vanaltj
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-December/009022.html
PR1648
author | Elliott Baron <ebaron@redhat.com> |
---|---|
date | Mon, 10 Feb 2014 19:08:50 -0500 |
parents | 31528d30c099 |
children | 76079eeed002 |
line wrap: on
line source
<?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2012, 2013 Red Hat, Inc. This file is part of Thermostat. Thermostat is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. Thermostat is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Thermostat; see the file COPYING. If not see <http://www.gnu.org/licenses />. Linking this code with other modules is making a combined work based on this code. Thus, the terms and conditions of the GNU General Public License cover the whole combination. As a special exception, the copyright holders of this code give you permission to link this code with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module. An independent module is a module which is not derived from or based on this code. If you modify this code, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat</artifactId> <version>1.0.1-SNAPSHOT</version> </parent> <artifactId>thermostat-distribution</artifactId> <!-- Define packaging type "pom" since this works around an issue with more than one attached artifacts which seems to confuse maven. Note that maven-assembly-plugin may confuse maven itself by replacing the jar artifact with a zip. --> <packaging>pom</packaging> <name>Thermostat Distribution</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <main.basedir>${project.basedir}/..</main.basedir> </properties> <build> <plugins> <!-- skip unit test run--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> </configuration> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <appendAssemblyId>false</appendAssemblyId> </configuration> <executions> <execution> <id>assemble-core</id> <configuration> <descriptors> <descriptor>assembly/core-assembly.xml</descriptor> </descriptors> <finalName>image/libs</finalName> <attach>false</attach> </configuration> <phase>package</phase> <goals> <goal>single</goal> </goals> </execution> <execution> <id>assemble-all-plugins</id> <configuration> <descriptors> <descriptor>assembly/all-plugin-assembly.xml</descriptor> </descriptors> <finalName>image/plugins</finalName> <attach>false</attach> </configuration> <phase>package</phase> <goals> <goal>single</goal> </goals> </execution> </executions> </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.5</version> <executions> <execution> <id>copy-scripts</id> <phase>prepare-package</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> <outputDirectory>${project.build.directory}</outputDirectory> <resources> <resource> <directory>desktop</directory> <targetPath /> <filtering>true</filtering> </resource> <resource> <directory>scripts</directory> <targetPath>image/bin</targetPath> <filtering>true</filtering> </resource> <!-- systemd service unit files --> <resource> <directory>systemd</directory> <targetPath/> <filtering>true</filtering> </resource> <resource> <directory>config</directory> <targetPath>image/etc</targetPath> <filtering>true</filtering> <includes> <include>agent.properties</include> <include>agent.auth</include> <include>ssl.properties</include> <include>thermostat-users.properties</include> <include>thermostat-roles.properties</include> <include>thermostat_jaas.conf</include> <include>agent_proxy_jaas.conf</include> <include>db.properties</include> <include>logging.properties</include> <include>osgi-export.properties</include> <include>commands/*.properties</include> </includes> </resource> <resource> <directory>tools</directory> <targetPath>tools</targetPath> <filtering>true</filtering> </resource> </resources> </configuration> </execution> <execution> <id>copy-icons</id> <phase>prepare-package</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> <outputDirectory>${project.build.directory}</outputDirectory> <resources> <resource> <directory>icons</directory> <targetPath /> <filtering>false</filtering> </resource> </resources> </configuration> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> <executions> <execution> <id>chmod</id> <phase>prepare-package</phase> <configuration> <target> <chmod file="${project.build.directory}/image/bin/*" perm="755" /> <chmod file="${project.build.directory}/tools/*" perm="755" /> </target> </configuration> <goals> <goal>run</goal> </goals> </execution> <execution> <id>directory-structure</id> <phase>prepare-package</phase> <configuration> <target> <!-- copy the native libraries --> <copy file="${main.basedir}/keyring/target/libGnomeKeyringWrapper.so" todir="${project.build.directory}/image/libs/native" /> <copy file="${main.basedir}/agent/core/target/libHostNameWrapper.so" todir="${project.build.directory}/image/libs/native" /> <copy file="${main.basedir}/agent/core/target/libUserNameUtilWrapper.so" todir="${project.build.directory}/image/libs/native" /> <copy file="${main.basedir}/agent/proxy/server/target/libAgentProxy.so" todir="${project.build.directory}/image/libs/native" /> <copy file="${main.basedir}/laf-utils/target/libGTKThemeUtils.so" todir="${project.build.directory}/image/libs/native" /> </target> </configuration> <goals> <goal>run</goal> </goals> </execution> </executions> </plugin> </plugins> <pluginManagement> <plugins> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> <version>1.0.1-SNAPSHOT</version> <configuration> <lifecycleMappingMetadata> <pluginExecutions> <pluginExecution> <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <versionRange>[2.4,)</versionRange> <goals> <goal>copy-dependencies</goal> </goals> </pluginExecutionFilter> <action> <ignore></ignore> </action> </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> </plugin> </plugins> </pluginManagement> </build> <dependencies> <!-- integration tests --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <!-- thermostat parts --> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-main</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-launcher</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-client-swing</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-swing-components</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-client-command</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-client-cli</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-osgi-living-vm-filter-swing</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-agent-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-agent-cli</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-storage-cli</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-agent-command</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-agent-proxy-server</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-killvm-agent</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-killvm-client-swing</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-common-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-common-command</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-osgi-process-handler</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-keyring</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-laf-utils</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-web-client</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-web-server</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>8.1.5.v20120716</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <version>8.1.5.v20120716</version> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-system-backend</artifactId> <version>${project.version}</version> </dependency> <!-- Plugins --> <!-- Be sure to add the distribution module of your plugin below with type "zip", and also to assembly/all-plugin-assembly.xml --> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-host-cpu-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-validate-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-host-memory-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-host-overview-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-numa-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-thread-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-vm-classstat-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-vm-cpu-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-vm-gc-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-vm-heap-analysis-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-vm-jmx-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-vm-memory-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-vm-overview-distribution</artifactId> <version>${project.version}</version> <type>zip</type> </dependency> </dependencies> </project>