[jbossws-commits] JBossWS SVN: r7190 - in stack/metro/trunk/modules/testsuite: framework-tests and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-05-28 07:58:41 -0400 (Wed, 28 May 2008) New Revision: 7190 Added: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml Removed: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/ Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/metro/trunk/modules/testsuite/metro-tests/pom.xml stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml stack/metro/trunk/modules/testsuite/pom.xml Log: Add noprepare Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -31,62 +31,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> - <id>wsconsume</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> - </tasks> - </configuration> - </execution> - <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}"/> - <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> @@ -94,88 +38,78 @@ <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> + <id>wsconsume</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.test.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="project.version" value="${project.version}"/> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + </tasks> + </configuration> + </execution> + <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/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -19,7 +19,7 @@ <!-- Define the JAX-WS wsconsume task --> <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> Modified: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -22,132 +22,62 @@ </dependency> </dependencies> - <!-- Plugins --> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>wsconsume</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> - </tasks> - </configuration> - </execution> - <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}"/> - <ant antfile="src/scripts/metro-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/scripts/metro-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>wsconsume</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.test.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="project.version" value="${project.version}"/> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + </tasks> + </configuration> + </execution> + <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/metro-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="scripts/metro-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> Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -19,7 +19,7 @@ <!-- Define the JAX-WS wsconsume task --> <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> Copied: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml (from rev 7186, stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-jars-jaxws.xml) =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml (rev 0) +++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<project> + + <description>JBossWS test archive builder</description> + + <!-- ============================================================================== --> + <!-- Building --> + <!-- --> + <!-- Where to create your tests --> + <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#... --> + <!-- --> + <!-- ============================================================================== --> + + <target name="build-jars-jaxws" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/test-libs"/> + + <!-- jbws1869 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws1869/**/*"/> + </classes> + </war> + + <!-- jbws1871 --> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws1871/**/*"/> + </classes> + </war> + + <!-- wsit-rm --> + <war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/> + <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/> + <include name="org/jboss/test/ws/wsit/rm/Add.class"/> + <include name="org/jboss/test/ws/wsit/rm/AddResponse.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/wsit/rm/WEB-INF"> + <include name="sun-web.xml"/> + <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/> + </webinf> + </war> + + </target> + +</project> Copied: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml (from rev 7186, stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml) =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml (rev 0) +++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-samples-jaxws.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -0,0 +1,182 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> + + <mkdir dir="${tests.output.dir}/test-libs"/> + + <!-- jaxws-samples-wsa --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/> + </classes> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + + <!-- jaxws-samples-wsrm --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> + <include name="wsit-*.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + + <!-- jaxws-samples-wsse-sign --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"> + <include name="wsit-*.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <include name="server-*.jks"/> + <include name="services/**"/> + </metainf> + </war> + + <!-- jaxws-samples-wsse-sign-50 --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-50.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"> + <include name="wsit-*.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF" + includes="server-*.jks" + prefix="WEB-INF/classes/META-INF"/> + </war> + + <!-- jaxws-samples-wsse-sign-client --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <include name="client-*.jks"/> + <include name="wsit-client.xml"/> + </metainf> + </jar> + + <!-- jaxws-samples-wsse-sign-encrypt --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="wsit-*.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <include name="server-*.jks"/> + <include name="services/**"/> + </metainf> + </war> + + <!-- jaxws-samples-wsse-sign-encrypt-50 --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-50.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"> + <include name="wsit-*.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF" + includes="server-*.jks" + prefix="WEB-INF/classes/META-INF"/> + </war> + + <!-- jaxws-samples-wsse-sign-encrypt-client --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <include name="client-*.jks"/> + <include name="wsit-client.xml"/> + </metainf> + </jar> + + <!-- jaxws-samples-wsse-username --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF"> + <include name="wsit-*.xml"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF"> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + + <!-- jaxws-samples-wsse-username-client --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF"> + <include name="wsit-client.xml"/> + </metainf> + </jar> + + <!-- Please add alphabetically --> + + </target> + +</project> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-05-28 11:36:44 UTC (rev 7189) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-05-28 11:58:41 UTC (rev 7190) @@ -16,8 +16,12 @@ <!-- 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> + <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <hibernate.version>3.2.4.sp1</hibernate.version> <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet> </properties> @@ -89,13 +93,11 @@ <!-- copy etc files --> <testResource> <directory>src/test/etc</directory> - <filtering>true</filtering> </testResource> <!-- copy handler definitions --> <testResource> <targetPath>../test-classes</targetPath> <directory>src/test/java</directory> - <filtering>false</filtering> <includes> <include>**/*.xml</include> </includes> @@ -104,17 +106,16 @@ <testResource> <targetPath>../test-resources</targetPath> <directory>src/test/resources</directory> - <filtering>true</filtering> <includes> <include>**/*.wsdl</include> <include>**/*.xml</include> </includes> + <filtering>true</filtering> </testResource> <!-- copy binary files --> <testResource> <targetPath>../test-resources</targetPath> <directory>src/test/resources</directory> - <filtering>false</filtering> <excludes> <exclude>**/*.wsdl</exclude> <exclude>**/*.xml</exclude> @@ -123,16 +124,29 @@ </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> - <argLine>${surefire.jvm.args}</argLine> - <!--argLine>${surefire.jdpw.args}</argLine--> + <failIfNoTests>false</failIfNoTests> <systemProperties> <property> - <name>log4j.output.dir</name> - <value>${project.build.directory}</value> - </property> - <property> <name>java.naming.provider.url</name> <value>jnp://${jboss.bind.address}:1099</value> </property> @@ -153,13 +167,49 @@ <value>${jbossws.integration.target}</value> </property> <property> + <name>log4j.output.dir</name> + <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>${project.build.directory}/test-libs</value> + <value>${test.archive.directory}</value> </property> <property> + <name>test.classes.directory</name> + <value>${test.classes.directory}</value> + </property> + <property> <name>test.resources.directory</name> - <value>${project.build.directory}/test-resources</value> + <value>${test.resources.directory}</value> </property> + <property> + <name>wsdl.publish.location</name> + <value>${wsdl.publish.location}</value> + </property> </systemProperties> </configuration> </plugin> @@ -170,6 +220,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 --> @@ -216,9 +293,16 @@ <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>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -254,9 +338,16 @@ <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>-Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -297,9 +388,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>-Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -340,9 +438,16 @@ <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>-Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -367,7 +472,6 @@ <jboss.bind.address>localhost</jboss.bind.address> </properties> </profile> - </profiles> </project>