[jboss-cvs] JBossAS SVN: r82771 - in projects/aop/trunk: asintegration-core/src and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 12 08:46:19 EST 2009
Author: kabir.khan at jboss.com
Date: 2009-01-12 08:46:19 -0500 (Mon, 12 Jan 2009)
New Revision: 82771
Removed:
projects/aop/trunk/asintegration-core/src/assembly/
projects/aop/trunk/asintegration-jmx/src/assembly/
Modified:
projects/aop/trunk/asintegration-core/pom.xml
projects/aop/trunk/asintegration-jmx/pom.xml
projects/aop/trunk/asintegration-mc/pom.xml
Log:
[JBAOP-666] Enable tests in maven, using antrun plugin to create the test jars and remove the A, B, C test classes from the classpath
Modified: projects/aop/trunk/asintegration-core/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-core/pom.xml 2009-01-12 13:19:04 UTC (rev 82770)
+++ projects/aop/trunk/asintegration-core/pom.xml 2009-01-12 13:46:19 UTC (rev 82771)
@@ -50,40 +50,33 @@
</excludes>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
- <id>test-classpool-a</id>
- <phase>process-test-classes</phase>
+ <id>create-test-jars</id>
<goals>
- <goal>attached</goal>
+ <goal>run</goal>
</goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-a.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>test-classpool-b</id>
<phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
<configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-b.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
+ <tasks>
+ <property name="test.jar.suffix" value="-test-classpool-"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/support/a/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/support/b/*.class"/>
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/support/a"/>
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/support/b"/>
+ </tasks>
</configuration>
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -91,7 +84,6 @@
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
- <skip>true</skip>
</configuration>
</plugin>
</plugins>
Modified: projects/aop/trunk/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-jmx/pom.xml 2009-01-12 13:19:04 UTC (rev 82770)
+++ projects/aop/trunk/asintegration-jmx/pom.xml 2009-01-12 13:46:19 UTC (rev 82771)
@@ -58,92 +58,46 @@
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<forkMode>always</forkMode>
- <skip>true</skip>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
- <id>test-classpool-a1</id>
- <phase>process-test-classes</phase>
+ <id>create-test-jars</id>
<goals>
- <goal>attached</goal>
+ <goal>run</goal>
</goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-a1.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>test-classpool-a2</id>
<phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
<configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-a2.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
+ <tasks>
+ <property name="test.jar.suffix" value="-test-classpool-"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/ucl/support/a/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a2.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/ucl/support/a/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b1.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/ucl/support/b/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b2.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/ucl/support/b/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c1.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/ucl/support/c/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c2.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/ucl/support/c/*.class"/>
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/ucl/support/a"/>
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/ucl/support/b"/>
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/ucl/support/c"/>
+ </tasks>
</configuration>
</execution>
- <execution>
- <id>test-classpool-b1</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-b1.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>test-classpool-b2</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-b2.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>test-classpool-c1</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-c1.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>test-classpool-c2</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-c2.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml 2009-01-12 13:19:04 UTC (rev 82770)
+++ projects/aop/trunk/asintegration-mc/pom.xml 2009-01-12 13:46:19 UTC (rev 82771)
@@ -51,11 +51,9 @@
<configuration>
<excludes>
<exclude>org/jboss/aop/junit/**</exclude>
- <!--
<exclude>org/jboss/test/aop/classpool/jbosscl/support/a/A.class</exclude>
<exclude>org/jboss/test/aop/classpool/jbosscl/support/b/B.class</exclude>
<exclude>org/jboss/test/aop/classpool/jbosscl/support/c/C.class</exclude>
- -->
</excludes>
</configuration>
</plugin>
@@ -68,10 +66,12 @@
<forkMode>always</forkMode>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
- <include>org/jboss/test/**/*UnitTestCase.class</include>
+ <include>org/jboss/test/**/*TestCase.class</include>
</includes>
<excludes>
<exclude>org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.class</exclude>
+ <exclude>org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithHierarchicalDomainTestCase.class</exclude>
+ <exclude>org/jboss/test/aop/classpool/jbosscl/test/ClassLoaderWithHierarchicalDomainSanityTestCase.class</exclude>
</excludes>
<systemProperties>
<property>
@@ -81,92 +81,46 @@
</systemProperties>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
- <id>test-classpool-a1</id>
- <phase>process-test-classes</phase>
+ <id>create-test-jars</id>
<goals>
- <goal>attached</goal>
+ <goal>run</goal>
</goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-a1.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>test-classpool-a2</id>
<phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
<configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-a2.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
+ <tasks>
+ <property name="test.jar.suffix" value="-test-classpool-"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/jbosscl/support/a/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a2.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/jbosscl/support/a/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b1.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/jbosscl/support/b/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}b2.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/jbosscl/support/b/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c1.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/jbosscl/support/c/*.class"/>
+ <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}c2.jar"
+ basedir="${project.build.testOutputDirectory}"
+ includes="org/jboss/test/aop/classpool/jbosscl/support/c/*.class"/>
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/support/a"/>
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/support/b"/>
+ <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/support/c"/>
+ </tasks>
</configuration>
</execution>
- <execution>
- <id>test-classpool-b1</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-b1.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>test-classpool-b2</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-b2.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>test-classpool-c1</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-c1.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
- <execution>
- <id>test-classpool-c2</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/test-classpool-c2.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}</finalName>
- </configuration>
- </execution>
</executions>
- </plugin>
- </plugins>
+ </plugin> </plugins>
</build>
<dependencies>
More information about the jboss-cvs-commits
mailing list