[jboss-osgi-commits] JBoss-OSGI SVN: r86646 - in projects/jboss-osgi/trunk: runtime/equinox and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-02 04:04:05 -0400 (Thu, 02 Apr 2009) New Revision: 86646 Added: projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml projects/jboss-osgi/trunk/runtime/equinox/pom.xml projects/jboss-osgi/trunk/runtime/felix/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Execute the testsuite as part of the framework module(s) Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-04-02 07:58:28 UTC (rev 86645) +++ projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-04-02 08:04:05 UTC (rev 86646) @@ -35,7 +35,7 @@ --> <resources> <resource> - <directory>${pom.basedir}/en</directory> + <directory>en</directory> <filtering>true</filtering> </resource> </resources> Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-02 07:58:28 UTC (rev 86645) +++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-02 08:04:05 UTC (rev 86646) @@ -17,8 +17,9 @@ <!-- Properties --> <properties> + <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> </properties> - + <!-- Dependencies --> <dependencies> <dependency> @@ -31,9 +32,19 @@ <artifactId>osgi</artifactId> <version>3.4.3.R34x_v20081215-1030</version> </dependency> - + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> + <!-- Test Dependencies --> <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <version>${version}</version> + <type>zip</type> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -47,8 +58,35 @@ <!-- Build --> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/testsuite/resources</directory> + </testResource> + </testResources> <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-test-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>src/testsuite</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> @@ -67,6 +105,16 @@ </executions> </plugin> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/testsuite</directory> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <excludes> @@ -77,4 +125,118 @@ </plugins> </build> + <profiles> + + <!-- + Name: framework-equinox + Descr: Setup for Equinox integration testing + --> + <profile> + <id>framework-equinox</id> + <activation> + <property> + <name>framework</name> + <value>equinox</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <type>zip</type> + <outputDirectory>src/testsuite</outputDirectory> + <excludes>test-libs/**</excludes> + </artifactItem> + <artifactItem> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <type>zip</type> + <outputDirectory>target</outputDirectory> + <includes>test-libs/**</includes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: embedded-tesing + Descr: Setup for embedded integration testing + --> + <profile> + <id>embedded-tesing</id> + <activation> + <property> + <name>!jboss.bind.address</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <!-- Exclude all testsuite tests --> + <exclude>org/jboss/test/osgi/jbosgi*/**</exclude> + <exclude>org/jboss/test/osgi/service/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: remote-tesing + Descr: Setup for remote integration testing + --> + <profile> + <id>remote-tesing</id> + <activation> + <property> + <name>jboss.bind.address</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <scope>test</scope> + <type>pom</type> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.security.args}</argLine> + <excludes> + <!-- Exclude all testsuite tests --> + <exclude>org/jboss/test/osgi/jbosgi*/**</exclude> + <exclude>org/jboss/test/osgi/service/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + </profiles> + </project> Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-02 07:58:28 UTC (rev 86645) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-02 08:04:05 UTC (rev 86646) @@ -17,8 +17,9 @@ <!-- Properties --> <properties> + <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> </properties> - + <!-- Dependencies --> <dependencies> <dependency> @@ -30,9 +31,19 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> </dependency> - + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> + <!-- Test Dependencies --> <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <version>${version}</version> + <type>zip</type> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -46,8 +57,35 @@ <!-- Build --> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/testsuite/resources</directory> + </testResource> + </testResources> <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-test-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>src/testsuite</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> @@ -66,6 +104,16 @@ </executions> </plugin> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/testsuite</directory> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <excludes> @@ -76,4 +124,172 @@ </plugins> </build> + <!-- Profiles --> + <profiles> + + + <!-- + Name: framework-default + Descr: Setup for default integration testing + --> + <profile> + <id>framework-default</id> + <activation> + <property> + <name>!framework</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <type>zip</type> + <outputDirectory>src/testsuite</outputDirectory> + <excludes>test-libs/**</excludes> + </artifactItem> + <artifactItem> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <type>zip</type> + <outputDirectory>target</outputDirectory> + <includes>test-libs/**</includes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: framework-felix + Descr: Setup for Felix integration testing + --> + <profile> + <id>framework-felix</id> + <activation> + <property> + <name>framework</name> + <value>felix</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <type>zip</type> + <outputDirectory>src/testsuite</outputDirectory> + <excludes>test-libs/**</excludes> + </artifactItem> + <artifactItem> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-testsuite</artifactId> + <type>zip</type> + <outputDirectory>target</outputDirectory> + <includes>test-libs/**</includes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: embedded-tesing + Descr: Setup for embedded integration testing + --> + <profile> + <id>embedded-tesing</id> + <activation> + <property> + <name>!jboss.bind.address</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <!-- Exclude tests that require remote access --> + <exclude>org/jboss/test/osgi/**/*DeployerTestCase.java</exclude> + <exclude>org/jboss/test/osgi/service/http/junit/*TestCase.java</exclude> + <exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude> + <!-- [JBOSGI-36] Bundle classes leak into system classloader --> + <exclude>org/jboss/test/osgi/jbosgi36/*TestCase.java</exclude> + <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle --> + <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: remote-tesing + Descr: Setup for remote integration testing + --> + <profile> + <id>remote-tesing</id> + <activation> + <property> + <name>jboss.bind.address</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <scope>test</scope> + <type>pom</type> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.security.args}</argLine> + <excludes> + <!-- [JBOSGI-40] Cannot run embedded tests with SecurityManager --> + <exclude>org/jboss/test/osgi/**/*EmbeddedTestCase.java</exclude> + <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle --> + <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + </profiles> + </project> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-02 07:58:28 UTC (rev 86645) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-02 08:04:05 UTC (rev 86646) @@ -2,6 +2,14 @@ <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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <!-- + *************************************************************************************** + * * + * The Testsuite module provides the test artifacts that can be reused by the various * + * supported OSGi Frameworks. The tests are not run as part of the Testsuite module. * + * * + *************************************************************************************** + --> <name>JBossOSGi - Testsuite</name> <description>JBossOSGi - Testsuite</description> @@ -17,24 +25,24 @@ <!-- Properties --> <properties> - <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> </properties> <!-- Dependencies --> <dependencies> <dependency> + <groupId>biz.aQute</groupId> + <artifactId>bnd</artifactId> + </dependency> + <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-deployer</artifactId> <version>${version}</version> + <scope>provided</scope> </dependency> - <dependency> - <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> - </dependency> - <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> @@ -47,16 +55,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> </dependencies> <!-- Build --> @@ -69,6 +67,46 @@ </testResources> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>testsuite</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-testsuite.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/${project.artifactId}-${project.version}.zip + </file> + <type>zip</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -87,161 +125,13 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> </plugins> </build> - - <!-- Profiles --> - <profiles> - - <!-- - Name: framework-default - Descr: Setup for default framework testing - --> - <profile> - <id>framework-default</id> - <activation> - <property> - <name>!framework</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - - <!-- - Name: framework-felix - Descr: Setup for Felix framework testing - --> - <profile> - <id>framework-felix</id> - <activation> - <property> - <name>framework</name> - <value>felix</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - - <!-- - Name: framework-equinox - Descr: Setup for Felix framework testing - --> - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - - <!-- - Name: embedded-tesing - Descr: Setup for embedded integration testing - --> - <profile> - <id>embedded-tesing</id> - <activation> - <property> - <name>!jboss.bind.address</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <!-- Exclude tests that require remote access --> - <exclude>org/jboss/test/osgi/**/*DeployerTestCase.java</exclude> - <exclude>org/jboss/test/osgi/service/http/junit/*TestCase.java</exclude> - <exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude> - <!-- [JBOSGI-36] Bundle classes leak into system classloader --> - <exclude>org/jboss/test/osgi/jbosgi36/*TestCase.java</exclude> - <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle --> - <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: remote-tesing - Descr: Setup for remote integration testing - --> - <profile> - <id>remote-tesing</id> - <activation> - <property> - <name>jboss.bind.address</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.security.args}</argLine> - <excludes> - <!-- [JBOSGI-40] Cannot run embedded tests with SecurityManager --> - <exclude>org/jboss/test/osgi/**/*EmbeddedTestCase.java</exclude> - <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle --> - <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - </profiles> - + </project> Added: projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml 2009-04-02 08:04:05 UTC (rev 86646) @@ -0,0 +1,18 @@ +<assembly 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/assembly-1.1.0-SNAPSHOT.xsd"> + <id>testsuite</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/test</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>target/test-libs</directory> + <outputDirectory>/test-libs</outputDirectory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF