[jbossws-commits] JBossWS SVN: r12512 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest and 1 other directories.

Author: sergeyb Date: 2010-06-22 07:32:27 -0400 (Tue, 22 Jun 2010) New Revision: 12512 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml Log: [JBWS-3028] Fixing the digest test on JBoss 5.1 by adding a sar archive Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-06-22 10:38:51 UTC (rev 12511) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-06-22 11:32:27 UTC (rev 12512) @@ -229,15 +229,27 @@ </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-digest/WEB-INF"> <include name="jboss-web.xml"/> + <include name="jbossws-cxf.xml"/> + <include name="wsdl/*"/> + <!-- if these files deployed in war then it works ok on AS 6.0 but not on 5.1 <include name="jboss-service.xml"/> - <include name="jbossws-cxf.xml"/> <include name="login-config.xml"/> <include name="jbossws-users.properties"/> <include name="jbossws-roles.properties"/> - <include name="wsdl/*"/> + --> + </webinf> </war> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest.sar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-digest/WEB-INF"> + <include name="jboss-service.xml"/> + <include name="login-config.xml"/> + <include name="jbossws-users.properties"/> + <include name="jbossws-roles.properties"/> + </metainf> + </jar> + <!-- jaxws-samples-wsseEJB --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsseEJB.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2010-06-22 10:38:51 UTC (rev 12511) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2010-06-22 11:32:27 UTC (rev 12512) @@ -52,7 +52,7 @@ public static Test suite() { - return new JBossWSTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war"); + return new JBossWSTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.sar jaxws-samples-wsse-username-digest.war"); } public void testAuthorized() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2010-06-22 10:38:51 UTC (rev 12511) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2010-06-22 11:32:27 UTC (rev 12512) @@ -6,7 +6,7 @@ <!-- ==================================================================== --> <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" name="jboss:service=DynamicLoginConfig"> - <attribute name="AuthConfig">login-config.xml</attribute> + <attribute name="AuthConfig">META-INF/login-config.xml</attribute> <!-- The service which supports dynamic processing of login-config.xml configurations. --> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2010-06-22 10:38:51 UTC (rev 12511) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2010-06-22 11:32:27 UTC (rev 12512) @@ -2,14 +2,14 @@ <!DOCTYPE policy PUBLIC "-//JBoss//DTD JBOSS Security Config 3.0//EN" "http://www.jboss.org/j2ee/dtd/security_config.dtd"> -<policy> <!-- xmlns="urn:jboss:security-config:5.0"> --> +<policy> <application-policy name="JBossWSDigest"> <authentication> <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> - <module-option name="usersProperties">jbossws-users.properties</module-option> - <module-option name="rolesProperties">jbossws-roles.properties</module-option> + <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option> + <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option> <module-option name="hashAlgorithm">SHA</module-option> <module-option name="hashEncoding">BASE64</module-option> <module-option name="hashCharset">UTF-8</module-option>