[jbossws-commits] JBossWS SVN: r7197 - in stack/cxf/trunk/modules/testsuite: cxf-tests and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-05-29 05:08:15 -0400 (Thu, 29 May 2008) New Revision: 7197 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/ Removed: stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/ Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml Log: Add -Dnoprepare Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-05-29 07:09:24 UTC (rev 7196) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-05-29 09:08:15 UTC (rev 7197) @@ -14,116 +14,47 @@ <relativePath>../pom.xml</relativePath> </parent> - <!-- Plugins --> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="src/scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - + <!-- Profiles --> <profiles> <!-- - Name: jboss422 - Descr: JBoss-4.2.2 specific options + Name: noprepare + Descr: Skip test preparation with -Dnoprepare --> <profile> - <id>jboss422</id> + <id>noprepare</id> <activation> + <property> + <name>!noprepare</name> + </property> </activation> <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> - </configuration> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"/> + </tasks> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> </profile> - <!-- - Name: jboss423 - Descr: JBoss-4.2.3 specific options - --> - <profile> - <id>jboss423</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: jboss500 - Descr: JBoss-5.0.0 specific options - --> - <profile> - <id>jboss500</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: jboss501 - Descr: JBoss-5.0.1 specific options - --> - <profile> - <id>jboss501</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts (from rev 7196, stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts) Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-29 07:09:24 UTC (rev 7196) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-29 09:08:15 UTC (rev 7197) @@ -32,46 +32,6 @@ </filesets> </configuration> </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>testsuite</classifier> - <type>zip</type> - </artifactItem> - </artifactItems> - <outputDirectory>src/test</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -79,88 +39,62 @@ <profiles> <!-- - Name: jboss422 - Descr: JBoss-4.2.2 specific options + Name: noprepare + Descr: Skip test preparation with -Dnoprepare --> <profile> - <id>jboss422</id> + <id>noprepare</id> <activation> + <property> + <name>!noprepare</name> + </property> </activation> <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> - </configuration> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>testsuite</classifier> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>src/test</outputDirectory> + </configuration> + </execution> + </executions> </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: jboss423 - Descr: JBoss-4.2.3 specific options - --> - <profile> - <id>jboss423</id> - <activation> - </activation> - <build> - <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> - </configuration> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> + </tasks> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> </profile> - <!-- - Name: jboss500 - Descr: JBoss-5.0.0 specific options - --> - <profile> - <id>jboss500</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: jboss501 - Descr: JBoss-5.0.1 specific options - --> - <profile> - <id>jboss501</id> - <activation> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-29 07:09:24 UTC (rev 7196) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-29 09:08:15 UTC (rev 7197) @@ -16,8 +16,8 @@ <!-- Properties --> <properties> - <surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args> - <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args> + <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args> + <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory> <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> @@ -111,8 +111,27 @@ </testResources> <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>target/wsconsume/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <failIfNoTests>false</failIfNoTests> <systemProperties> <property> <name>java.naming.provider.url</name> @@ -139,6 +158,30 @@ <value>${project.build.directory}</value> </property> <property> + <name>org.jboss.ws.wsse.keyStore</name> + <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStore</name> + <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.truststore</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStorePassword</name> + <value>jbossws</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStorePassword</name> + <value>jbossws</value> + </property> + <property> + <name>org.jboss.ws.wsse.keyStoreType</name> + <value>jks</value> + </property> + <property> + <name>org.jboss.ws.wsse.trustStoreType</name> + <value>jks</value> + </property> + <property> <name>test.archive.directory</name> <value>${test.archive.directory}</value> </property> @@ -164,6 +207,33 @@ <profiles> <!-- + Name: debug + Descr: Enable remote debuging for tests + --> + <profile> + <id>debug</id> + <activation> + <property> + <name>debug</name> + </property> + </activation> + <properties> + <surefire.jvm.args>${surefire.security.args} ${surefire.jdwp.args}</surefire.jvm.args> + </properties> + </profile> + <profile> + <id>no-debug</id> + <activation> + <property> + <name>!debug</name> + </property> + </activation> + <properties> + <surefire.jvm.args>${surefire.security.args}</surefire.jvm.args> + </properties> + </profile> + + <!-- Name: hudson Descr: Ignore test failures on hudson --> @@ -205,6 +275,13 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> + <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> @@ -238,6 +315,13 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> + <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> @@ -281,9 +365,16 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> + <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -314,6 +405,13 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> + <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>