[jbossws-commits] JBossWS SVN: r17325 - in projects/wsi-bp12-test/trunk: modules and 3 other directories.

Author: jim.ma Date: 2013-02-20 02:30:45 -0500 (Wed, 20 Feb 2013) New Revision: 17325 Removed: projects/wsi-bp12-test/trunk/modules/addons/ projects/wsi-bp12-test/trunk/modules/client/ projects/wsi-bp12-test/trunk/modules/dist/ projects/wsi-bp12-test/trunk/modules/endorsed/ projects/wsi-bp12-test/trunk/modules/resources/ projects/wsi-bp12-test/trunk/modules/server/ projects/wsi-bp12-test/trunk/modules/testsuite/cxf-spring-tests/ projects/wsi-bp12-test/trunk/modules/testsuite/cxf-tests/ projects/wsi-bp12-test/trunk/modules/testsuite/shared-tests/ Modified: projects/wsi-bp12-test/trunk/modules/testsuite/bp12-tests/pom.xml projects/wsi-bp12-test/trunk/modules/testsuite/bp12-tests/scripts/cxf-jars-jaxws.xml projects/wsi-bp12-test/trunk/modules/testsuite/pom.xml projects/wsi-bp12-test/trunk/pom.xml Log: Remove unused modules Modified: projects/wsi-bp12-test/trunk/modules/testsuite/bp12-tests/pom.xml =================================================================== --- projects/wsi-bp12-test/trunk/modules/testsuite/bp12-tests/pom.xml 2013-02-19 14:44:55 UTC (rev 17324) +++ projects/wsi-bp12-test/trunk/modules/testsuite/bp12-tests/pom.xml 2013-02-20 07:30:45 UTC (rev 17325) @@ -2,45 +2,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss Web Services - WSI-BP Test</name> - <artifactId>jbossws-bp-tests</artifactId> + <name>JBoss Web Services -WSI-BP12 Test</name> + <artifactId>wsi-bp12-tests</artifactId> <packaging>jar</packaging> <!-- Parent --> <parent> <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.1.1-SNAPSHOT</version> + <artifactId>wsi-bp12-testsuite</artifactId> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> - </parent> - - <properties> - <!-- This is used for test archives embedding Spring and is intentionally different from the - version specified in the jbossws-cxf main pom.xml to test there're no classloading clashes --> - <test.spring.version>3.0.3.RELEASE</test.spring.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.picketlink</groupId> - <artifactId>picketlink-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + </parent> <!-- Profiles --> <profiles> - <!-- Name: noprepare Descr: Skip test preparation with -Dnoprepare @@ -54,25 +29,7 @@ </activation> <build> <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-jars</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <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"/> - </target> - </configuration> - </execution> - </executions> - </plugin> + <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run --> <artifactId>maven-resources-plugin</artifactId> <executions> @@ -88,7 +45,7 @@ <resource> <directory>${basedir}/../../endorsed/target/</directory> <includes> - <include>jbossws-cxf-factories-${project.version}.jar</include> + <include>jbossws-cxf-factories-${jbossws.cxf.version}.jar</include> </includes> </resource> </resources> @@ -118,47 +75,24 @@ </execution> </executions> </plugin> - <plugin> <!-- This downloads and copies some Spring libs into target/spring to be later picked up and included in some test jars --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> <executions> - <execution> - <id>copy-spring</id> - <phase>process-test-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - <version>${test.spring.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${test.spring.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${test.spring.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${test.spring.version}</version> - </artifactItem> - <artifactItem> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <version>${test.spring.version}</version> - </artifactItem> - </artifactItems> - <outputDirectory>target/spring</outputDirectory> - </configuration> - </execution> + <execution> + <id>build-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <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"/> + </target> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: projects/wsi-bp12-test/trunk/modules/testsuite/bp12-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- projects/wsi-bp12-test/trunk/modules/testsuite/bp12-tests/scripts/cxf-jars-jaxws.xml 2013-02-19 14:44:55 UTC (rev 17324) +++ projects/wsi-bp12-test/trunk/modules/testsuite/bp12-tests/scripts/cxf-jars-jaxws.xml 2013-02-20 07:30:45 UTC (rev 17325) @@ -66,9 +66,9 @@ <include name="org/jboss/test/ws/jaxws/bp12/basedoc/utf16/*.class"/> <exclude name="org/jboss/test/ws/jaxws/bp12/basedoc/utf16/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/bp12/basedoc-utf16/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/bp12/basedoc-utf16/WEB-INF" encoding="UTF-16"> <include name="wsdl/*" /> - </webinf> + </webinf> </war> <!-- jaxws-bp12complex-rpc --> @@ -78,8 +78,8 @@ <exclude name="org/jboss/test/ws/jaxws/bp12/compelxrpc/*TestCase.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/bp12/complexrpc/WEB-INF"> - <include name="wsdl/*" /> - </webinf> + <include name="wsdl/*"/> + </webinf> </war> <!-- jaxws-bp12complex-doc --> Modified: projects/wsi-bp12-test/trunk/modules/testsuite/pom.xml =================================================================== --- projects/wsi-bp12-test/trunk/modules/testsuite/pom.xml 2013-02-19 14:44:55 UTC (rev 17324) +++ projects/wsi-bp12-test/trunk/modules/testsuite/pom.xml 2013-02-20 07:30:45 UTC (rev 17325) @@ -2,16 +2,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss Web Services - Stack CXF Testsuite</name> - <artifactId>jbossws-cxf-testsuite</artifactId> + <name>JBoss Web Services - WSI-BP Testsuite</name> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>wsi-bp-testsuite</artifactId> <packaging>pom</packaging> - + <description>JBossWS CXF WSI BP Test</description> + <version>1.0.0-SNAPSHOT</version> + <!-- Parent --> <parent> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>4.1.1-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-parent</artifactId> + <version>1.1.0.GA</version> </parent> <!-- Properties --> @@ -23,106 +25,90 @@ <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> - <log4j.output.dir>${project.build.directory}</log4j.output.dir> - <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir> - <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version> - <org.slf4j.version>1.6.1</org.slf4j.version> + + <jbossws.cxf.version>4.1.3.Final</jbossws.cxf.version> + <jbossws.shared.testsuite.version>4.1.1.Final</jbossws.shared.testsuite.version> + <gnu.getopt.version>1.0.13</gnu.getopt.version> <log4j.version>1.2.14</log4j.version> + + <jboss711.version>7.1.1.Final</jboss711.version> + <jboss712.version>7.1.2.Final</jboss712.version> + <jboss713.version>7.1.3.Final</jboss713.version> + <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> + + <ejb.api.version>1.0.1.Final</ejb.api.version> + <jaxb.api.version>1.0.3.Final</jaxb.api.version> + <jaxws.api.version>2.0.0.Final</jaxws.api.version> + <jsr181.api.version>1.0-MR1</jsr181.api.version> + <spring.version>3.0.7.RELEASE</spring.version> </properties> <!-- Modules --> <modules> - <module>cxf-tests</module> - <module>shared-tests</module> + <module>bp12-tests</module> </modules> <!-- Dependencies --> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> + <artifactId>jbossws-shared-testsuite</artifactId> + <version>${jbossws.shared.testsuite.version}</version> + <scope>test</scope> </dependency> + <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common-tools</artifactId> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-server</artifactId> + <version>${jbossws.cxf.version}</version> </dependency> + <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-shared-testsuite</artifactId> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-client</artifactId> + <version>${jbossws.cxf.version}</version> </dependency> + <dependency> <groupId>gnu-getopt</groupId> <artifactId>getopt</artifactId> <version>${gnu.getopt.version}</version> <scope>test</scope> </dependency> + <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <version>${ejb.api.version}</version> </dependency> + <dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> + <version>${jsr181.api.version}</version> </dependency> + <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-client</artifactId> - <version>${project.version}</version> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <version>${jaxws.api.version}</version> </dependency> + <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-factories</artifactId> - <version>${project.version}</version> + <groupId>org.jboss.spec.javax.xml.bind</groupId> + <artifactId>jboss-jaxb-api_2.2_spec</artifactId> + <version>${jaxb.api.version}</version> </dependency> + <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.10</version> <scope>test</scope> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.littleshoot</groupId> - <artifactId>littleproxy</artifactId> - <version>${org.littleshoot.littleproxy.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - </dependencies> - - <!-- Build --> + <build> <testResources> <!-- copy etc files --> @@ -172,6 +158,27 @@ </testResources> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>validate-jboss-home</id> + <phase>validate</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <echo /> + <echo message="profile=${jbossws.integration.target}" /> + <echo message="jboss.home=${jboss.home}" /> + <echo /> + </target> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> @@ -205,48 +212,7 @@ </execution> </executions> </plugin> - <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run --> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-factories-jar</id> - <phase>pre-integration-test</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../endorsed/target/</directory> - <includes> - <include>jbossws-cxf-factories-${project.version}.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> <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> <skip>true</skip> @@ -367,117 +333,7 @@ </property> </systemProperties> </configuration> - </execution> - - <execution> - <id>forked-integration-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <forkMode>pertest</forkMode> - <skip>false</skip> - <includes> - <include>**/jaxws/cxf/httpproxy/*TestCaseForked.java</include> - <include>**/jaxws/samples/schemavalidation/*TestCaseForked.java</include> - <include>**/jbws2150/**/*TestCaseForked.java</include> - <include>**/jms*/**/*TestCaseForked.java</include> - <include>**/smoke/tools/**/*TestForked.java</include> - <include>**/smoke/tools/**/*TestCaseForked.java</include> - </includes> - <systemProperties> - <property> - <name>jboss.bind.address</name> - <value>${jboss.bind.address}</value> - </property> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>javax.net.ssl.trustStore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>javax.net.ssl.trustStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.trustStoreType</name> - <value>jks</value> - </property> - <property> - <name>javax.net.ssl.keyStore</name> - <value>${project.build.directory}/test-classes/client.keystore</value> - </property> - <property> - <name>javax.net.ssl.keyStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.keyStoreType</name> - <value>jks</value> - </property> - <property> - <name>org.jboss.security.ignoreHttpsHost</name> - <value>true</value> - </property> - <property> - <name>jboss.home</name> - <value>${jboss.home}</value> - </property> - <property> - <name>jbossws.integration.target</name> - <value>${jbossws.integration.target}</value> - </property> - <property> - <name>test.disable.deployment</name> - <value>false</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${log4j.output.dir}</value> - </property> - <property> - <name>appclient.output.dir</name> - <value>${appclient.output.dir}</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-users.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.roles.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-roles.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.keystore</name> - <value>${project.build.directory}/test-classes/test.keystore</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.truststore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>test.archive.directory</name> - <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>${test.resources.directory}</value> - </property> - <property> - <name>wsdl.publish.location</name> - <value>${wsdl.publish.location}</value> - </property> - </systemProperties> - </configuration> - </execution> + </execution> </executions> </plugin> </plugins> @@ -633,29 +489,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes> - <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - - <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements--> - <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> - - <!--# [JBWS-2561] XOP request not properly inlined--> - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - - <!--# [JBWS-2480] Soap attachments are dropped on server response--> - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - - <!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude> - - <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - - <!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services --> - <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> - </excludes> </configuration> </plugin> </plugins> @@ -692,28 +525,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes> - <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - - <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements--> - <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> - - <!--# [JBWS-2561] XOP request not properly inlined--> - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - - <!--# [JBWS-2480] Soap attachments are dropped on server response--> - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - - <!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - - <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - - <!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services --> - <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> - </excludes> </configuration> </plugin> </plugins> @@ -750,28 +561,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes> - <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - - <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements--> - <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> - - <!--# [JBWS-2561] XOP request not properly inlined--> - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - - <!--# [JBWS-2480] Soap attachments are dropped on server response--> - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - - <!-- # [JBWS-3493] WS-Trust tests w/ PicketLink STS require PL 2.1.2.Final or greater --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - - <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - - <!--# [JBWS-3441] Support CDI interceptors for POJO JAX-WS services --> - <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> - </excludes> </configuration> </plugin> </plugins> @@ -805,28 +594,6 @@ </compilerArguments> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes> - <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - - <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements--> - <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> - - <!--# [JBWS-2561] XOP request not properly inlined--> - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - - <!--# [JBWS-2480] Soap attachments are dropped on server response--> - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - - <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed --> - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </profile> @@ -873,6 +640,7 @@ </properties> </profile> + </profiles> </project> Modified: projects/wsi-bp12-test/trunk/pom.xml =================================================================== --- projects/wsi-bp12-test/trunk/pom.xml 2013-02-19 14:44:55 UTC (rev 17324) +++ projects/wsi-bp12-test/trunk/pom.xml 2013-02-20 07:30:45 UTC (rev 17325) @@ -27,12 +27,11 @@ <name>JBoss Web Services - Stack CXF</name> <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf</artifactId> + <artifactId>wsi-bp12</artifactId> <packaging>pom</packaging> - <description>JBossWS CXF stack</description> - + <description>JBossWS CXF WSI BP12 Test</description> - <version>4.1.1-SNAPSHOT</version> + <version>4.1.3.Final</version> <!-- Parent --> <parent> @@ -43,47 +42,42 @@ <!-- Source Control Management --> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tr... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/... - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/projects/wsi... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/projec... + <url>http://fisheye.jboss.com/viewrep/JBossWS/projects/wsi-bp12-test/tr... </scm> <!-- Modules --> <modules> - <module>modules/server</module> - <module>modules/client</module> - <module>modules/endorsed</module> - <module>modules/resources</module> - <module>modules/addons</module> + <module>modules/testsuite</module> </modules> <!-- Properties --> <properties> <jbossws.api.version>1.0.1.Final</jbossws.api.version> - <jbossws.spi.version>2.1.0.Final</jbossws.spi.version> - <jbossws.common.version>2.1.0.Final</jbossws.common.version> + <jbossws.spi.version>2.1.1.Final</jbossws.spi.version> + <jbossws.common.version>2.1.1.Final</jbossws.common.version> <jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version> - <jbossws.shared.testsuite.version>4.1.0.Final</jbossws.shared.testsuite.version> - <jbossws.jboss710.version>4.1.0.Final</jbossws.jboss710.version> - <jbossws.jboss711.version>4.1.0.Final</jbossws.jboss711.version> - <jbossws.jboss712.version>4.1.0.Final</jbossws.jboss712.version> - <jbossws.native.version>4.1.0-SNAPSHOT</jbossws.native.version> - <jboss710.version>7.1.0.Final</jboss710.version> + <jbossws.shared.testsuite.version>4.1.1.Final</jbossws.shared.testsuite.version> + <jbossws.jboss711.version>4.1.1.Final</jbossws.jboss711.version> + <jbossws.jboss712.version>4.1.1.Final</jbossws.jboss712.version> + <jbossws.jboss713.version>4.1.1.Final</jbossws.jboss713.version> + <jbossws.native.version>4.1.1.Final</jbossws.native.version> <jboss711.version>7.1.1.Final</jboss711.version> <jboss712.version>7.1.2.Final</jboss712.version> + <jboss713.version>7.1.3.Final</jboss713.version> <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> <ejb.api.version>1.0.1.Final</ejb.api.version> - <cxf.version>2.6.5</cxf.version> + <cxf.version>2.6.6</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> <cxf.xjcplugins.version>2.6.0</cxf.xjcplugins.version> - <fastinfoset.api.version>1.2.9</fastinfoset.api.version> <jboss.common.core.version>2.2.17.GA</jboss.common.core.version> - <jboss.logging.version>3.1.0.GA</jboss.logging.version> + <jboss-logging.version>3.1.2.GA</jboss-logging.version> <jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version> <jboss.jandex.version>1.0.3.Final</jboss.jandex.version> <jboss.xb.version>2.0.3.GA</jboss.xb.version> <picketbox.version>4.0.9.Final</picketbox.version> - <picketlink.version>2.1.1.Final</picketlink.version> + <picketlink.version>2.1.4.Final</picketlink.version> <jaxws-jboss-httpserver-httpspi.version>1.0.1.GA</jaxws-jboss-httpserver-httpspi.version> <httpserver.version>1.0.0.Final</httpserver.version> <jaxb.api.version>1.0.3.Final</jaxb.api.version> @@ -104,8 +98,8 @@ <jms.api.version>1.0.0.Final</jms.api.version> <velocity.version>1.7</velocity.version> <xerces.version>2.9.1</xerces.version> - <xmlsec.version>1.5.2</xmlsec.version> - <wss4j.version>1.6.6</wss4j.version> + <xmlsec.version>1.5.3</xmlsec.version> + <wss4j.version>1.6.9</wss4j.version> <wstx.version>4.1.4</wstx.version> <spring.version>3.0.7.RELEASE</spring.version> </properties> @@ -151,16 +145,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710-server-integration</artifactId> - <version>${jbossws.jboss710.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710-tests-integration</artifactId> - <version>${jbossws.jboss710.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss711-server-integration</artifactId> <version>${jbossws.jboss711.version}</version> </dependency> @@ -180,6 +164,16 @@ <version>${jbossws.jboss712.version}</version> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss713-server-integration</artifactId> + <version>${jbossws.jboss713.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss713-tests-integration</artifactId> + <version>${jbossws.jboss713.version}</version> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss720.version}</version> @@ -237,6 +231,12 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-object</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -921,11 +921,6 @@ <version>${ejb.api.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.fastinfoset</groupId> - <artifactId>FastInfoset</artifactId> - <version>${fastinfoset.api.version}</version> - </dependency> - <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>${velocity.version}</version> @@ -1161,6 +1156,12 @@ <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <version>${jboss.common.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + </exclusions> <scope>provided</scope> </dependency> <dependency> @@ -1226,7 +1227,7 @@ <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> - <version>${jboss.logging.version}</version> + <version>${jboss-logging.version}</version> </dependency> <dependency> <groupId>org.jboss.logging</groupId> @@ -1254,7 +1255,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.10</version> +com <version>4.10</version> <scope>test</scope> </dependency> </dependencies> @@ -1340,18 +1341,6 @@ </profile> <!-- - Name: jboss710 - Descr: JBoss-7.1.0 specific options - --> - <profile> - <id>jboss710</id> - <properties> - <jbossws.integration.target>jboss710</jbossws.integration.target> - <jboss.home>${jboss710.home}</jboss.home> - </properties> - </profile> - - <!-- Name: jboss711 Descr: JBoss-7.1.1 specific options --> @@ -1376,6 +1365,18 @@ </profile> <!-- + Name: jboss713 + Descr: JBoss-7.1.3 specific options + --> + <profile> + <id>jboss713</id> + <properties> + <jbossws.integration.target>jboss713</jbossws.integration.target> + <jboss.home>${jboss713.home}</jboss.home> + </properties> + </profile> + + <!-- Name: jboss720 Descr: JBoss-7.2.0 specific options -->