Author: asoldano Date: 2014-02-17 05:51:35 -0500 (Mon, 17 Feb 2014) New Revision: 18374 Added: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java Removed: stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/src/main/resources/modules/jboss710/ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/src/test/resources/jboss712/ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/src/test/resources/jboss713/ Modified: stack/cxf/branches/jbossws-cxf-4.2.x/ stack/cxf/branches/jbossws-cxf-4.2.x/build.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/pom.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/Install.txt stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/ant.properties.example stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-deploy.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-setup.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-testsuite.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/pom.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java stack/cxf/branches/jbossws-cxf-4.2.x/pom.xml Log: Merged revisions 18095-18096,18154,18177,18184-18185,18269,18272,18289 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r18095 | asoldano | 2013-11-18 19:08:22 +0100 (Mon, 18 Nov 2013) | 2 lines [JBWS-3736] soap:address rewrite does not consider wsdlLocation in SEI @WebService ....... r18096 | asoldano | 2013-11-19 16:47:28 +0100 (Tue, 19 Nov 2013) | 2 lines [JBWS-3731] Improving javadoc ....... r18154 | asoldano | 2013-12-09 12:04:23 +0100 (Mon, 09 Dec 2013) | 2 lines [JBWS-3743] Block HTTP GET requests with no query string ....... r18177 | asoldano | 2013-12-13 13:26:19 +0100 (Fri, 13 Dec 2013) | 2 lines [JBWS-3740] Drop AS 7.1.x support ....... r18184 | asoldano | 2013-12-16 21:42:36 +0100 (Mon, 16 Dec 2013) | 2 lines [JBWS-3709] Modifying testcase a bit to avoid counting probe matches from different hosts on the same network when possible. Moreover, actually checking match count on resolve matches only, as the address is optional and can theoretically be omitted in probe matches. ....... r18185 | asoldano | 2013-12-16 21:46:04 +0100 (Mon, 16 Dec 2013) | 2 lines [JBWS-3709] Restoring TIMEOUT setup when sending probe messages ....... r18269 | asoldano | 2014-01-21 15:44:00 +0100 (Tue, 21 Jan 2014) | 2 lines [JBWS-3662] Improving checks on availability of BouncyCastle and JCE unlimited strength crypto; also adding a check before running tests (and hence before any client side automatic registration of security provider). ....... r18272 | asoldano | 2014-01-22 15:53:45 +0100 (Wed, 22 Jan 2014) | 2 lines [JBWS-3722] Explicitly set JAXB impl / xjc dependencies in jbossws-cxf-client to be sure the dependencyManagement blocks from jbossws-cxf main pom.xml are used to choose the version. This prevent different versions (2.1 vs 2.2) from being used depending on the current JDK (Apache CXF has a maven profile that sets jaxb version depending on current jdk) ....... r18289 | asoldano | 2014-01-29 15:08:20 +0100 (Wed, 29 Jan 2014) | 2 lines [JBWS-3754] Revisit LittleProxy dependencies ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.2.x ___________________________________________________________________ Modified: svnmerge-integrated - /stack/cxf/trunk:1-18082 + /stack/cxf/trunk:1-18082,18095-18103,18105-18116,18118-18156,18158-18163,18165,18167-18196,18198-18224,18227-18228,18230-18238,18242-18248,18251-18253,18255-18267,18269,18272-18273,18276,18282-18284,18287-18289 Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 /stack/cxf/trunk:18095-18096,18154,18177-18185,18269,18272,18289 Modified: stack/cxf/branches/jbossws-cxf-4.2.x/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/build.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/build.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -68,12 +68,6 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}"> - <isset property="profiles.profile.properties.jboss712.home"/> - </condition> - <condition property="jboss713.home" value="${profiles.profile.properties.jboss713.home}"> - <isset property="profiles.profile.properties.jboss713.home"/> - </condition> <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}"> <isset property="profiles.profile.properties.jboss720.home"/> </condition> @@ -82,16 +76,10 @@ </condition> - <fail message="Application server home not set, jboss712.home=value, jboss713.home=value, jboss720.home=value or wildfly800.home=value to set"> + <fail message="Application server home not set, jboss720.home=value or wildfly800.home=value to set"> <condition> <and> <not> - <isset property="jboss712.home"/> - </not> - <not> - <isset property="jboss713.home"/> - </not> - <not> <isset property="jboss720.home"/> </not> <not> @@ -102,8 +90,6 @@ </fail> <echo/> - <echo message="jboss712.home=${jboss712.home}"/> - <echo message="jboss713.home=${jboss713.home}"/> <echo message="jboss720.home=${jboss720.home}"/> <echo message="wildfly800.home=${wildfly800.home}"/> </target> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/pom.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/pom.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -220,6 +220,16 @@ <groupId>org.jboss.spec.javax.xml.soap</groupId> <artifactId>jboss-saaj-api_1.3_spec</artifactId> </dependency> + + <!-- [JBWS-3722] Explicit JAXB dependencies to ensure the dependency management from jbossws-cxf pom.xml applies --> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + </dependency> <!-- jboss provided --> <dependency> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -76,31 +76,85 @@ * The most important customization is on the CXF Bus used * the Endpoint.publish() or client. * In particular, when a client is created, the thread - * default bus changes depending on the selected strategy: + * default bus, thread context classloader bus and the + * bus used for the client being created depend on the + * selected strategy: * - * * Thread default busses with THREAD_BUS strategy - * ------------------------------------------------------------------ - * |BEFORE client creation | USED for client | AFTER client creation| - * ------------------------------------------------------------------ - * | NULL | NEW | NEW | - * | X | X | X | - * ------------------------------------------------------------------ - * - * * Thread default busses with NEW_BUS strategy: - * ------------------------------------------------------------------ - * |BEFORE client creation | USED for client | AFTER client creation| - * ------------------------------------------------------------------ - * | NULL | NEW | NULL | - * | X | NEW | X | - * ------------------------------------------------------------------ - * - * * Thread default busses with TCCL_BUS strategy: - * ------------------------------------------------------------------ - * |BEFORE client creation | USED for client | AFTER client creation| - * ------------------------------------------------------------------ - * | NULL | TCCL | NULL | - * | X | TCCL | X | - * ------------------------------------------------------------------ + * * THREAD_BUS strategy + * + * Bus used for client + * ======================================= + * | | Client Bus | + * ======================================= + * | Default | NULL | New bus (Z) | + * | Thread |-------------------------| + * | Bus | Bus X | Bus X | + * ======================================= + * + * State of buses before and after client creation + * ======================================= + * | Bus | BEFORE | AFTER | + * ======================================= + * | Default | NULL | New bus (Z) | + * | Thread |--------------------------| + * | Bus | Bus X | Bus X | + * ======================================= + * | TCCL | NULL | NULL | + * | Bus |--------------------------| + * | | Bus Y | Bus Y | + * ======================================= + * + * + * * NEW_BUS strategy + * + * Bus used for client + * ======================================= + * | | Client Bus | + * ======================================= + * | Default | NULL | New bus | + * | Thread |-------------------------| + * | Bus | Bus X | New bus | + * ======================================= + * + * State of buses before and after client creation + * ======================================= + * | Bus | BEFORE | AFTER | + * ======================================= + * | Default | NULL | NULL | + * | Thread |--------------------------| + * | Bus | Bus X | Bus X | + * ======================================= + * | TCCL | NULL | NULL | + * | Bus |--------------------------| + * | | Bus Y | Bus Y | + * ======================================= + * + * + * * TCCL_BUS strategy + * + * Bus used for client + * ======================================= + * | | Client Bus | + * ======================================= + * | TCCL | NULL | New bus (Z) | + * | Bus |-------------------------| + * | | Bus Y | Bus Y | + * ======================================= + * + * State of buses before and after client creation + * ======================================= + * | Bus | BEFORE | AFTER | + * ======================================= + * | Default | NULL | NULL | + * | Thread |--------------------------| + * | Bus | Bus X | Bus X | + * ======================================= + * | TCCL | NULL | New bus (Z) | + * | Bus |--------------------------| + * | | Bus Y | Bus Y | + * ======================================= + * + * * * This class also ensures a proper context classloader is set * (required on JBoss AS 7, as the TCCL does not include Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/pom.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/pom.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -38,20 +38,6 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss712</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - <version>${project.version}</version> - <classifier>jboss713</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - <version>${project.version}</version> <classifier>jboss720</classifier> </dependency> @@ -126,16 +112,6 @@ <!-- container integration --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-server-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-server-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss720-server-integration</artifactId> <scope>provided</scope> </dependency> @@ -198,12 +174,6 @@ <configuration> <target> <mkdir dir="${basedir}/target/exclude-file" /> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss712.txt"> - <param name="targetName" expression="jboss712" /> - </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss713.txt"> - <param name="targetName" expression="jboss713" /> - </xslt> <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss720.txt"> <param name="targetName" expression="jboss720" /> </xslt> @@ -238,16 +208,6 @@ <!-- Libraries required for running binary distro testsuite and not available on server--> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss720-tests-integration</artifactId> <scope>provided</scope> </dependency> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/Install.txt 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/Install.txt 2014-02-17 10:51:35 UTC (rev 18374) @@ -13,8 +13,6 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss712 - ant deploy-jboss713 ant deploy-jboss720 ant deploy-wildfly800 @@ -22,7 +20,7 @@ server. In order to do that, please add the -Dspring=true property option when running the ant script: - ant -Dspring=true deploy-jboss713 + ant -Dspring=true deploy-jboss720 Please note Spring is required for advanced configuration only, whenever users want to provide their own jbossws-cxf.xml Spring configuration file. Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/ant.properties.example 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/ant.properties.example 2014-02-17 10:51:35 UTC (rev 18374) @@ -3,13 +3,11 @@ # # Optional JBoss Home -jboss712.home=(a)jboss712.home@ -jboss713.home=(a)jboss713.home@ jboss720.home=(a)jboss720.home@ wildfly800.home=(a)wildfly800.home@ # The JBoss server under test. This can be [jboss712|jboss713|jboss720|wildfly800] -jbossws.integration.target=jboss713 +jbossws.integration.target=jboss720 # The JBoss settings jboss.bind.address=localhost Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-deploy.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-deploy.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -25,98 +25,6 @@ <project> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-7.1.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-jboss71x" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - - <path id="jboss.ant.tasks.classpath"> - <fileset dir="${deploy.artifacts.dir}"> - <include name="**/jbossws-common-tools.jar"/> - <include name="**/jandex.jar"/> - </fileset> - </path> - <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jboss.ant.tasks.classpath"/> - <taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" classpathref="jboss.ant.tasks.classpath"/> - - <jandex run="true" verbose="false" newJar="true"> - <fileset dir="${deploy.artifacts.dir}/lib"> - <include name="cxf*security.jar"/> - </fileset> - </jandex> - <antcall target="deploy-jbossws-cxf-modules-as7" inheritall="false"> - <param name="installserver" value="${deploy.structure}/modules"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss710"/> - </antcall> - <copy toDir="${deploy.structure}/modules"> - <fileset dir="${deploy.artifacts.dir}/modules/jboss710"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Deployment jboss712 --> - <!-- ================================================================== --> - - <target name="target-jboss712"> - <property name="jbossws.integration.target" value="jboss712"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss712" depends="undeploy-jboss712,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss712"> - <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> - <copy todir="${jboss712.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> - <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS --> - <installModules targetDir="${jboss712.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712"> - <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss712.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> - <!-- Deployment jboss713 --> - <!-- ================================================================== --> - - <target name="target-jboss713"> - <property name="jbossws.integration.target" value="jboss713"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss713" depends="undeploy-jboss713,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss713"> - <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> - <copy todir="${jboss713.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> - <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS --> - <installModules targetDir="${jboss713.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713"> - <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-7.2.x --> <!-- ================================================================== --> @@ -254,14 +162,6 @@ </condition> </target> - <target name="install-spring-module71x" if="spring-required"> - <antcall target="deploy-spring-module" inheritall="false"> - <param name="installserver" value="${deploy.structure}/modules"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modules-jbossid" value="jboss710"/> - </antcall> - </target> - <target name="install-spring-module72x" if="spring-required"> <antcall target="deploy-spring-module" inheritall="false"> <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-setup.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-setup.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -33,13 +33,9 @@ <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> - <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/> - <property name="jboss713.available.file" value="${jboss713.home}/jboss-modules.jar"/> <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> <property name="wildfly800.available.file" value="${wildfly800.home}/jboss-modules.jar"/> - <available property="jboss712.available" file="${jboss712.available.file}"/> - <available property="jboss713.available" file="${jboss713.available.file}"/> <available property="jboss720.available" file="${jboss720.available.file}"/> <available property="wildfly800.available" file="${wildfly800.available.file}"/> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-testsuite.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-testsuite.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build-testsuite.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -31,12 +31,6 @@ <target name="tests-prepare" depends="prepare"> <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss712.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> - </condition> - <condition property="jboss.home" value="${jboss713.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss713"/> - </condition> <condition property="jboss.home" value="${jboss720.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> </condition> @@ -120,7 +114,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss71x,tests-classpath-jboss72x,tests-classpath-wildfly80x"> + <target name="tests-classpath" depends="tests-classpath-jboss72x,tests-classpath-wildfly80x"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -130,169 +124,6 @@ <path refid="integration.target.client.classpath"/> </path> </target> - - <target name="tests-classpath-jboss71x" depends="tests-prepare" if="jbossws.integration.jboss71x"> - - <!-- Java Endorsed --> - <condition property="endorsed.dirs" value="${jboss.home}/modules/javax/xml/ws/api/main/"> - <isset property="jboss.home"/> - </condition> - - <path id="integration.target.javac.classpath"> - <fileset dir="${jboss.home}/modules/javax/activation/api/main/"> - <include name="activation-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/mail/api/main/"> - <include name="mail-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/"> - <include name="jboss-common-core-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> - <include name="jboss-logging-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/picketlink/main/"> - <include name="picketlink-core*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> - <include name="jboss-ejb-api_3.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/ejb3/main/"> - <include name="jboss-ejb3-ext-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> - <include name="jboss-servlet-api_3.0_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/annotation/api/main/"> - <include name="jboss-annotations-api_1.1_spec-*.jar"/> - </fileset> - </path> - - <!-- - The 's.client.classpath' contains jars that are available in the target container's client directory. - There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. - - The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. - --> - <path id="integration.target.client.classpath"> - <!-- included from thirdparty local dir as it's not installed on AS - START --> - <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/> - <!-- included from thirdparty local dir as it's not installed on AS - END --> - <pathelement location="${jboss.home}/jboss-modules.jar"/> - <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> - <include name="jboss-logging-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/as/controller/main/"> - <include name="jboss-as-controller-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/as/controller-client/main/"> - <include name="jboss-as-controller-client-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/as/server/main/"> - <include name="jboss-as-server-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/as/protocol/main/"> - <include name="jboss-as-protocol-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/dmr/main/"> - <include name="jboss-dmr-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/marshalling/main/"> - <include name="jboss-marshalling-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/slf4j/main/"> - <include name="slf4j-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/slf4j/jcl-over-slf4j/main/"> - <include name="jcl-over-slf4j-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/slf4j/impl/main/"> - <include name="slf4j-jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/logmanager/main/"> - <include name="jboss-logmanager-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/apache/log4j/main/"> - <include name="log4j-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/mail/api/main/"> - <include name="mail-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> - <include name="jboss-servlet-api_3.0_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/transaction/api/main/"> - <include name="jboss-transaction-api_1.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/threads/main/"> - <include name="jboss-threads-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/picketbox/main/"> - <include name="picketbox-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/picketlink/main/"> - <include name="picketlink-core*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> - <include name="jboss-ejb-api_3.1_spec-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/ejb-client/main/"> - <include name="jboss-ejb-client-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/apache/xerces/main/"> - <include name="xercesImpl-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/"> - <include name="jboss-common-core-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/javassist/main/"> - <include name="javassist-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/javax/security/jacc/api/main/"> - <include name="jboss-jacc-api*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/remoting3/main/"> - <include name="jboss-remoting-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/marshalling/river/main/"> - <include name="jboss-marshalling-river-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/remoting3/remoting-jmx/main/"> - <include name="remoting-jmx-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/"> - <include name="jboss-sasl-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/netty/main/"> - <include name="netty-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/xb/main/"> - <include name="jbossxb-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/joda/time/main/"> - <include name="joda-time-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/apache/xalan/main/"> - <include name="serializer-*.jar"/> - <include name="xalan-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/codehaus/woodstox/main/"> - <include name="woodstox-core-asl-*.jar"/> - <include name="stax2-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/xnio/main/"> - <include name="xnio-api-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/"> - <include name="xnio-nio-*.jar"/> - </fileset> - <fileset dir="${jboss.home}/modules/org/jboss/remote-naming/main/"> - <include name="jboss-remote-naming-*.jar"/> - </fileset> - <pathelement location="${tools.jar}"/> - </path> - </target> <target name="tests-classpath-jboss72x" depends="tests-prepare" if="jbossws.integration.jboss72x"> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/dist/src/main/distro/build.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -57,13 +57,6 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss71x" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss713"/> - </or> - </condition> - <condition property="jbossws.integration.jboss72x" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/pom.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/pom.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -51,24 +51,6 @@ <phase>package</phase> </execution> <execution> - <id>jboss712</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss712</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> - <id>jboss713</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss713</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss713/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss720</id> <goals><goal>jar</goal></goals> <phase>package</phase> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; import java.util.Collection; @@ -64,7 +65,7 @@ */ public class RequestHandlerImpl implements RequestHandler { - private static RequestHandlerImpl me = new RequestHandlerImpl(); + private static final RequestHandlerImpl me = new RequestHandlerImpl(); RequestHandlerImpl() { @@ -191,7 +192,7 @@ * @throws ServletException if some problem occurs */ private final boolean handleQuery(HttpServletRequest req, HttpServletResponse res, AbstractHTTPDestination dest, Bus bus) - throws ServletException + throws ServletException, IOException { final String queryString = req.getQueryString(); if ((null != queryString) && (queryString.length() > 0)) @@ -226,6 +227,16 @@ } } } + else if ("GET".equals(req.getMethod())) + { + //reject HTTP GET without query string (only support messages sent w/ POST) + res.setStatus(405); + res.setContentType("text/plain"); + Writer out = res.getWriter(); + out.write("HTTP GET not supported"); + out.close(); + return true; + } return false; } Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -225,6 +225,7 @@ portName = name + "Port"; } + String annWsdlLocation; if (anWebService != null && anWebService.endpointInterface().length() > 0) { seiName = anWebService.endpointInterface(); @@ -248,8 +249,12 @@ if (seiAnnotation.portName().length() > 0 || seiAnnotation.serviceName().length() > 0 || seiAnnotation.endpointInterface().length() > 0) throw MESSAGES.webserviceAnnotationSEIAttributes(seiName); + annWsdlLocation = !"".equals(anWebService.wsdlLocation()) ? anWebService.wsdlLocation() : seiAnnotation.wsdlLocation(); } - final String annWsdlLocation = (anWebService != null) ? anWebService.wsdlLocation() : anWebServiceProvider.wsdlLocation(); + else + { + annWsdlLocation = (anWebService != null) ? anWebService.wsdlLocation() : anWebServiceProvider.wsdlLocation(); + } DDEndpoint result = new DDEndpoint(); @@ -286,7 +291,7 @@ String wsdlAddress = parser.filterSoapAddress(ddep.getServiceName(), ddep.getPortName(), SOAPAddressWSDLParser.SOAP_HTTP_NS); String rewrittenWsdlAddress = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sc); - //If "auto rewrite", leave "publishedEndpointUrl" unset so that CXF do not force host/port values for + //If "auto rewrite", leave "publishedEndpointUrl" unset so that CXF does not force host/port values for //wsdl imports and auto-rewrite them too; otherwise set the new address into "publishedEndpointUrl", //which causes CXF to override any address in the published wsdl. if (!SoapAddressRewriteHelper.isAutoRewriteOn(sc)) { Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/scripts/antrun-beans-config.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/scripts/antrun-beans-config.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -31,24 +31,6 @@ <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as7.xml" tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -389,6 +389,7 @@ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-client.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/wsf/test/ClientHelper.class"/> + <include name="org/jboss/wsf/test/CryptoHelper.class"/> <include name="org/jboss/wsf/test/TestServlet.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/ServiceIface.class"/> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -107,15 +107,11 @@ * @throws Exception */ public void testDefaultClientConfigurationInContainer() throws Exception { - if (!isTargetJBoss71()) { - assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); - } + assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); } public void testDefaultClientConfigurationOnDispatchInContainer() throws Exception { - if (!isTargetJBoss71()) { - assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch")); - } + assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch")); } /** Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -36,6 +36,7 @@ import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -91,7 +92,11 @@ EndpointFour proxy = (EndpointFour)service.getPort(EndpointFour.class); setupWsse((BindingProvider)proxy); - assertEquals("Foo4", proxy.echo("Foo4")); + try { + assertEquals("Foo4", proxy.echo("Foo4")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } final String m = bos.toString(); assertTrue("WS-Addressing was not enabled!", m.contains("http://www.w3.org/2005/08/addressing") && m.contains("http://www.w3.org/2005/08/addressing/anonymous")); assertTrue("WS-Security was not enabled!", m.contains("http://www.w3.org/2001/04/xmlenc#rsa-1_5") && m.contains("http://www.w3.org/2001/04/xmlenc#aes256-cbc")); Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -55,13 +55,11 @@ * @throws Exception */ public void testDefaultClientValidation() throws Exception { - if (!isTargetJBoss71()) { - try { - JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); - assertEquals("1", runInContainer("testDefaultClientValidation")); - } finally { - JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); - } + try { + JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); + assertEquals("1", runInContainer("testDefaultClientValidation")); + } finally { + JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); } } Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -21,6 +21,8 @@ */ package org.jboss.test.ws.jaxws.samples.wsdd; +import java.net.URL; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -34,7 +36,6 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.ws.discovery.WSDiscoveryClient; import org.apache.cxf.ws.discovery.wsdl.ProbeMatchType; -import org.apache.cxf.ws.discovery.wsdl.ProbeMatchesType; import org.apache.cxf.ws.discovery.wsdl.ProbeType; import org.apache.cxf.ws.discovery.wsdl.ResolveMatchType; import org.apache.cxf.ws.discovery.wsdl.ScopesType; @@ -65,11 +66,10 @@ ProbeType pt = new ProbeType(); ScopesType scopes = new ScopesType(); pt.setScopes(scopes); - ProbeMatchesType pmts = client.probe(pt, TIMEOUT); - assertNotNull(pmts); - assertEquals(3, pmts.getProbeMatch().size()); + List<ProbeMatchType> pmts = filterProbeMatchesForHost(client.probe(pt, TIMEOUT).getProbeMatch(), getServerHost()); + List<ResolveMatchType> rmts = new LinkedList<ResolveMatchType>(); - for (ProbeMatchType pmt : pmts.getProbeMatch()) { + for (ProbeMatchType pmt : pmts) { W3CEndpointReference epr = pmt.getEndpointReference(); ResolveMatchType rmt = client.resolve(epr, TIMEOUT); assertNotNull("Could not resolve (timeout = " + TIMEOUT + " ms) reference: " + epr, rmt); @@ -86,6 +86,34 @@ } } + private List<ProbeMatchType> filterProbeMatchesForHost(List<ProbeMatchType> probes, String serverHost) + { + final List<ProbeMatchType> filtered = new ArrayList<ProbeMatchType>(); + for (ProbeMatchType probeMatchType : probes) + { + final List<String> addresses = probeMatchType.getXAddrs(); + if (addresses == null || addresses.isEmpty()) { + //add Probe Match if it has no address (which is optional and might be omitted on probe match result) + filtered.add(probeMatchType); + } else { + for (String addr : addresses) { + try { + final URL url = new URL(addr); + //add Probe Match only if it's from the current serverHost (for test purposes we do not want + //to consider match results that might be coming from other services on the same network) + if (url.getHost().contains(serverHost)) { + filtered.add(probeMatchType); + break; + } + } catch (Exception e) { + //ignore and move on + } + } + } + } + return filtered; + } + public void testInvocation() throws Exception { Bus bus = null; @@ -96,11 +124,10 @@ ProbeType pt = new ProbeType(); ScopesType scopes = new ScopesType(); pt.setScopes(scopes); - ProbeMatchesType pmts = client.probe(pt, TIMEOUT); - assertNotNull(pmts); - assertEquals(3, pmts.getProbeMatch().size()); + List<ProbeMatchType> pmts = filterProbeMatchesForHost(client.probe(pt, TIMEOUT).getProbeMatch(), getServerHost()); + List<ResolveMatchType> rmts = new LinkedList<ResolveMatchType>(); - for (ProbeMatchType pmt : pmts.getProbeMatch()) { + for (ProbeMatchType pmt : pmts) { W3CEndpointReference epr = pmt.getEndpointReference(); ResolveMatchType rmt = client.resolve(epr, TIMEOUT); assertNotNull("Could not resolve (timeout = " + TIMEOUT + " ms) reference: " + epr, rmt); Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -32,6 +32,7 @@ import junit.framework.Test; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -69,12 +70,16 @@ public void test() throws Exception { - QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "AnnotatedSecurityService"); - URL wsdlURL = new URL(serviceURL + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - AnnotatedServiceIface proxy = (AnnotatedServiceIface)service.getPort(AnnotatedServiceIface.class); - setupWsse(proxy); - assertEquals("Secure Hello World!", proxy.sayHello()); + try { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "AnnotatedSecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + AnnotatedServiceIface proxy = (AnnotatedServiceIface)service.getPort(AnnotatedServiceIface.class); + setupWsse(proxy); + assertEquals("Secure Hello World!", proxy.sayHello()); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } private void setupWsse(AnnotatedServiceIface proxy) Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -34,6 +34,7 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.ws.api.configuration.ClientConfigUtil; import org.jboss.wsf.test.ClientHelper; +import org.jboss.wsf.test.CryptoHelper; public class SignEncryptHelper implements ClientHelper { @@ -91,7 +92,7 @@ } catch (SOAPFaultException e) { - throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + throw CryptoHelper.checkAndWrapException(e); } } Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -31,6 +31,7 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -68,7 +69,11 @@ Service service = Service.create(new URL(serviceURL + "SecurityService221?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService221Port"), ServiceIface.class); setupWsse(proxy); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) X.509 Certificates, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) X.509 Certificates, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -86,7 +91,11 @@ Service service = Service.create(new URL(serviceURL + "SecurityService222?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService222Port"), ServiceIface.class); setupWsse(proxy); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -104,7 +113,11 @@ Service service = Service.create(new URL(serviceURL + "SecurityService223?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService223Port"), ServiceIface.class); setupWsse(proxy); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Anonymous with X.509 Certificates, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Anonymous with X.509 Certificates, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -122,7 +135,11 @@ Service service = Service.create(new URL(serviceURL + "SecurityService224?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService224Port"), ServiceIface.class); setupWsse(proxy); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } private void setupWsse(ServiceIface proxy) Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -32,6 +32,7 @@ import junit.framework.Test; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -155,7 +156,11 @@ reqCtx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice"); reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob"); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Sender Vouches with X.509 Certificates, Sign, Optional Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Sender Vouches with X.509 Certificates, Sign, Optional Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -177,7 +182,11 @@ reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice"); reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob"); reqCtx.put(SecurityConstants.SELF_SIGN_SAML_ASSERTION, "true"); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Holder of Key, Sign, Optional Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) SAML1.1 Holder of Key, Sign, Optional Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } /** @@ -257,6 +266,10 @@ reqCtx.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); reqCtx.put(SecurityConstants.SIGNATURE_USERNAME, "alice"); reqCtx.put(SecurityConstants.ENCRYPT_USERNAME, "bob"); - assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) SAML1.1/2.0 Sender Vouches with X.509 Certificate, Sign, Encrypt")); + try { + assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) SAML1.1/2.0 Sender Vouches with X.509 Certificate, Sign, Encrypt")); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } } Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -30,6 +30,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSTest; /** @@ -66,7 +67,11 @@ final QName stsPortName = new QName("urn:picketlink:identity-federation:sts", "PicketLinkSTSPort"); WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName); - assertEquals("WS-Trust Hello World!", proxy.sayHello()); + try { + assertEquals("WS-Trust Hello World!", proxy.sayHello()); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } finally { Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -30,6 +30,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; +import org.jboss.wsf.test.CryptoHelper; import org.jboss.wsf.test.JBossWSTest; /** @@ -72,8 +73,12 @@ final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/";, "SecurityTokenService"); final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/";, "UT_Port"); WSTrustTestUtils.setupWsseAndSTSClient(proxy, bus, stsURL + "?wsdl", stsServiceName, stsPortName); - - assertEquals("WS-Trust Hello World!", proxy.sayHello()); + + try { + assertEquals("WS-Trust Hello World!", proxy.sayHello()); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } finally { @@ -100,7 +105,11 @@ WSTrustTestUtils.setupWsse(proxy, bus); - assertEquals("WS-Trust Hello World!", proxy.sayHello()); + try { + assertEquals("WS-Trust Hello World!", proxy.sayHello()); + } catch (Exception e) { + throw CryptoHelper.checkAndWrapException(e); + } } finally { Copied: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java (from rev 18269, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.test; + +import java.security.NoSuchAlgorithmException; + +import org.apache.cxf.binding.soap.SoapFault; + +public final class CryptoHelper +{ + public static Exception checkAndWrapException(Exception e) throws Exception { + if (!isBouncyCastleAvailable()) { + return new Exception("Bouncy Castle JCE provider does not seem to be properly installed; either install it " + + "or run the testuite with -Dexclude-integration-tests-BC-related=true to exclude this test.", e); + } else if(!isUnlimitedStrengthCryptographyAvailable()) { + return new Exception("JCE unlimited strength cryptography extension does not seem to be properly installed; either install it " + + "or run the testuite with '-Dexclude-integration-tests-unlimited-strength-related=true' to exclude this test.", e); + } else if (e.getCause() != null && e.getCause() instanceof SoapFault && e.getMessage() != null && e.getMessage().contains("algorithm")) { + return new Exception("Please check for Bouncy Castle JCE provider and JCE unlimited strenght cryptography extension availability on server side.", e); + } else { + return e; + } + } + + public static boolean isBouncyCastleAvailable() { + return java.security.Security.getProvider("BC") != null; + } + + public static boolean isUnlimitedStrengthCryptographyAvailable() { + try { + return (javax.crypto.Cipher.getMaxAllowedKeyLength("RC5") >= 256); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + } +} Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -101,25 +101,6 @@ <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.bouncycastle</groupId> <artifactId>bcprov-jdk16</artifactId> <version>${bc.version}</version> @@ -614,146 +595,6 @@ </profile> <!-- - Name: jboss712 - Descr: JBoss-7.1.2 specific options - --> - <profile> - <id>jboss712</id> - <properties> - <jboss.version>${jboss712.version}</jboss.version> - <jbossws.integration.target>jboss712</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </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> - - <!-- # [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> - - <!--# [AS7-537] Fixed on AS 8 or greater --> - <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> - - <!--# [JBWS-3560] fastinfoset module is required in as712 --> - <exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude> - - <!--# [WFLY-308] Provide facility for running ejb3 ws endpoints authorization independently --> - <exclude>org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase*</exclude> - - <!-- Manually setup KDC before run this test--> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: jboss713 - Descr: JBoss-7.1.3 specific options - --> - <profile> - <id>jboss713</id> - <properties> - <jboss.version>${jboss713.version}</jboss.version> - <jbossws.integration.target>jboss713</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </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> - - <!-- # [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> - - <!--# [AS7-537] Fixed on AS 8 or greater --> - <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude> - - <!--# [JBWS-3560] fastinfoset module is required in as713 --> - <exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude> - - <!--# [WFLY-308] Provide facility for running ejb3 ws endpoints authorization independently --> - <exclude>org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase*</exclude> - - <!-- Manually setup KDC before run this test--> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss720 Descr: JBoss-7.2.0 specific options --> @@ -768,6 +609,26 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss720-tests-integration</artifactId> </dependency> + <!-- LittleProxy depencency declared in this profile as other profiles require different exclusions --> + <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> </dependencies> <build> <plugins> @@ -838,6 +699,31 @@ <artifactId>wildfly-webservices-tests-integration</artifactId> <version>${jboss.version}</version> </dependency> + <!-- LittleProxy depencency declared in this profile as other profiles require different exclusions --> + <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> + <!-- Let the container messaging subsystem control the Netty dependency version --> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> <plugins> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -777,19 +777,6 @@ <include name="jboss-webservices.xml" /> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2241-as71.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2241/EJB3Bean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2241/EJB3RemoteInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointService.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2241/META-INF-as71"> - <include name="jboss.xml" /> - <include name="jboss-ejb3.xml" /> - <include name="jboss-webservices.xml" /> - </metainf> - </jar> <!-- jaxws-jbws2250 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2250/WEB-INF/web.xml"> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -122,15 +122,11 @@ * @throws Exception */ public void testDefaultClientConfigurationInContainer() throws Exception { - if (!isTargetJBoss71()) { - assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); - } + assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); } public void testDefaultClientConfigurationOnDispatchInContainer() throws Exception { - if (!isTargetJBoss71()) { - assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch")); - } + assertEquals("1", runTestInContainer("testDefaultClientConfigurationOnDispatch")); } /** Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -43,7 +43,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2241TestCase.class, isTargetJBoss71() ? "jaxws-jbws2241-as71.jar" : "jaxws-jbws2241.jar", true); + return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", true); } private EndpointInterface getPort(String user, String pwd) throws MalformedURLException { Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/pom.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/pom.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -32,4 +32,26 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>check-bc-and-unlimited-crypto</id> + <phase>pre-integration-test</phase> + <goals> + <goal>java</goal> + </goals> + <configuration> + <mainClass>org.jboss.wsf.test.CryptoCheckMain</mainClass> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Copied: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java (from rev 18269, stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/CryptoCheckMain.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -0,0 +1,19 @@ +package org.jboss.wsf.test; + +/** + * + * @author Rostislav Svoboda + */ +public class CryptoCheckMain +{ + + public static void main(String[] args) throws Exception + { + System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + System.out.println("JCE unlimited strength cryptography: " + ((javax.crypto.Cipher.getMaxAllowedKeyLength("RC5") < 256)?"NOT ":"") + "INSTALLED" ); + System.out.println("Bouncy Castle JCE Provider: " + ((java.security.Security.getProvider("BC") == null)?"NOT ":"") + "INSTALLED" ); + System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); + } + +} + Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -207,11 +207,6 @@ return JBossWSTestHelper.isTargetJBoss7(); } - public static boolean isTargetJBoss71() - { - return JBossWSTestHelper.isTargetJBoss71(); - } - public static boolean isTargetJBoss72() { return JBossWSTestHelper.isTargetJBoss72(); Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-02-17 10:51:35 UTC (rev 18374) @@ -151,36 +151,18 @@ return target.startsWith("jboss7"); } - public static boolean isTargetJBoss71() - { - String target = getIntegrationTarget(); - return target.startsWith("jboss71"); - } - public static boolean isTargetJBoss72() { String target = getIntegrationTarget(); return target.startsWith("jboss72"); } - @Deprecated - public static boolean isTargetJBoss8() - { - return isTargetJBoss8(); - } - public static boolean isTargetWildFly8() { String target = getIntegrationTarget(); return target.startsWith("wildfly8"); } - @Deprecated - public static boolean isTargetJBoss80() - { - return isTargetWildFly80(); - } - public static boolean isTargetWildFly80() { String target = getIntegrationTarget(); Modified: stack/cxf/branches/jbossws-cxf-4.2.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/pom.xml 2014-02-17 10:07:20 UTC (rev 18373) +++ stack/cxf/branches/jbossws-cxf-4.2.x/pom.xml 2014-02-17 10:51:35 UTC (rev 18374) @@ -63,12 +63,8 @@ <jbossws.spi.version>2.2.2.Final</jbossws.spi.version> <jbossws.common.version>2.2.3.Final</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> - <jbossws.jboss712.version>4.2.1.Final</jbossws.jboss712.version> - <jbossws.jboss713.version>4.2.1.Final</jbossws.jboss713.version> <jbossws.jboss720.version>4.2.2.Final</jbossws.jboss720.version> <jbossws.native.version>4.1.2.Final</jbossws.native.version> - <jboss712.version>7.1.2.Final</jboss712.version> - <jboss713.version>7.1.3.Final</jboss713.version> <jboss720.version>7.2.0.Final</jboss720.version> <wildfly800.version>8.0.0.Beta2-SNAPSHOT</wildfly800.version> <ejb.api.version>1.0.2.Final</ejb.api.version> @@ -138,26 +134,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-server-integration</artifactId> - <version>${jbossws.jboss712.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> - <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.ws</groupId> <artifactId>jbossws-jboss720-server-integration</artifactId> <version>${jbossws.jboss720.version}</version> </dependency> @@ -1358,34 +1334,10 @@ </profile> <!-- - Name: jboss712 - Descr: JBoss-7.1.2 specific options + Name: jboss720 + Descr: JBoss-7.2.0 specific options --> <profile> - <id>jboss712</id> - <properties> - <jbossws.integration.target>jboss712</jbossws.integration.target> - <jboss.home>${jboss712.home}</jboss.home> - </properties> - </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: jboss711 - Descr: JBoss-7.1.1 specific options - --> - <profile> <id>jboss720</id> <properties> <jbossws.integration.target>jboss720</jbossws.integration.target>