[rhq] modules/enterprise modules/plugins pom.xml

modules/enterprise/agent/pom.xml | 2 + modules/plugins/aliases/pom.xml | 55 ++++++++++++++++++++++++++++--------- modules/plugins/apache/pom.xml | 55 ++++++++++++++++++++++++++++--------- modules/plugins/cobbler/pom.xml | 55 ++++++++++++++++++++++++++++--------- modules/plugins/cron/pom.xml | 57 ++++++++++++++++++++++++++++++--------- modules/plugins/grub/pom.xml | 55 ++++++++++++++++++++++++++++--------- modules/plugins/hosts/pom.xml | 55 ++++++++++++++++++++++++++++--------- modules/plugins/pom.xml | 15 ++++++++++ modules/plugins/postfix/pom.xml | 55 ++++++++++++++++++++++++++++--------- modules/plugins/samba/pom.xml | 55 ++++++++++++++++++++++++++++--------- modules/plugins/sshd/pom.xml | 55 ++++++++++++++++++++++++++++--------- modules/plugins/sudoers/pom.xml | 55 ++++++++++++++++++++++++++++--------- pom.xml | 4 ++ 13 files changed, 442 insertions(+), 131 deletions(-) New commits: commit 60c0b9212c29997c9590717871282f9b94df866a Author: Lukas Krejci <lkrejci(a)redhat.com&gt; Date: Fri May 27 18:07:00 2011 +0200 BZ 707781 - use the bundled augeas in the unit tests that require it. diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 08e6c9f..1a5c01b 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -187,6 +187,8 @@ Build-Number=${buildNumber} <property name="jaxb-api.version" value="${jaxb-api.version}" /> <property name="jaxb-impl.version" value="${jaxb-impl.version}" /> <property name="jline.version" value="${jline.version}" /> + <property name="augeas.version" values="${augeas.version}" /> + <property name="augeas.zip.version" values="${augeas.zip.version}" /> </ant> </tasks> </configuration> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 9bf41dc..fe596d7 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -65,6 +65,7 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up integration test plugin container environment under target/itest/...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -94,11 +95,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -125,18 +157,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>true</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 0c60643..7d91615 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -126,6 +126,7 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository/" /> <mkdir dir="target/itest" /> @@ -152,11 +153,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -182,18 +214,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>false</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 3c7dcb5..dfff97f 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -71,6 +71,7 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up integration test plugin container environment under target/itest/...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -100,11 +101,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -131,18 +163,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>true</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 07fed71..fc7df42 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -58,12 +58,14 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar... </echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> <mkdir dir="target/itest/plugins" /> <mkdir dir="target/itest/lib" /> + <copy toDir="target/itest/plugins" flatten="true"> <fileset dir="${settings.localRepository}/"> <include name="org/rhq/rhq-platform-plugin/${project.version}/rhq-platform-plugin-${project.version}.jar" /> @@ -73,6 +75,7 @@ <include name="${project.artifactId}-${project.version}.jar" /> </fileset> </copy> + <unzip dest="target/itest/lib"> <fileset dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}" includes="*.zip" /> <patternset> @@ -85,11 +88,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> + </move> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -116,18 +150,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>false</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 049fa1d..ebde5dd 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -58,6 +58,7 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar... </echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -84,11 +85,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -115,18 +147,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>false</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 6a2019b..63d8f39 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -66,6 +66,7 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up integration test plugin container environment under target/itest/...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -95,11 +96,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -126,18 +158,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>true</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index d1863d4..4a856b6 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -227,5 +227,20 @@ </profiles> + <build> + <plugins> + <!-- a lot of tests need <if> from ant-contrib, so let's define it in here --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>20020829</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> </project> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 6fe2470..cb9c6e0 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -64,6 +64,7 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up integration test plugin container environment under target/itest/...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -93,11 +94,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -124,18 +156,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>true</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 3f0af95..4777494 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -64,6 +64,7 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up integration test plugin container environment under target/itest/...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -93,11 +94,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -124,18 +156,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>true</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 4e6f17a..c58478b 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -59,6 +59,7 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar... </echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -85,11 +86,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -116,18 +148,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>false</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 07c38eb..e2f5e5a 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -53,6 +53,7 @@ <phase>pre-integration-test</phase> <configuration> <tasks> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <echo>Setting up integration test plugin container environment under target/itest/...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -82,11 +83,42 @@ </patternset> </unzip> <move todir="target/itest/lib" flatten="true"> - <fileset dir="target/itest/lib"> + <fileset dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}"> <include name="**/lib/*" /> </fileset> </move> - <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> + <delete dir="target/itest/lib/hyperic-sigar-${sigar.zip.version}" /> + + <unzip dest="target/itest/lib"> + <fileset dir="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}" includes="*.zip" /> + <patternset> + <include name="**/lib*/*.so" /> + <include name="**/lib*/*.so.*" /> + </patternset> + </unzip> + <!-- by default deploy the 32bit augeas libs --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <!-- overwrite with 64bits if needed --> + <move todir="target/itest/lib/"> + <fileset dir="target/itest/lib/augeas-native-${augeas.zip.version}/lib64"> + <include name="**/*.so"/> + <include name="**/*.so.*"/> + </fileset> + </move> + </then> + </if> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> </tasks> </configuration> <goals> @@ -113,18 +145,15 @@ <skip>${maven.test.skip}</skip> <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>false</useSystemClassLoader> - <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> <!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>--> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <environmentVariables> + <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/pom.xml b/pom.xml index 6a1b1f5..3c5dd4c 100644 --- a/pom.xml +++ b/pom.xml @@ -92,13 +92,15 @@ <richfaces.version>3.3.3.Final</richfaces.version> <jline.version>0.9.94</jline.version> <sigar.version>1.6.5.132</sigar.version> + <sigar.zip.version>1.6.5</sigar.zip.version> <quartz.version>1.6.5</quartz.version> <jna.version>3.2.5</jna.version> <twitter4j.version>2.1.2</twitter4j.version> <commons-codec.version>1.4</commons-codec.version> <testng.version>5.13.1</testng.version> <cobertura.version>1.9.4.1</cobertura.version> - + <augeas.version>0.7.1.1</augeas.version> + <augeas.zip.version>0.7.1</augeas.zip.version> <!-- defaults for datasource used by integration tests -