Author: alessio.soldano(a)jboss.com Date: 2011-12-14 17:51:45 -0500 (Wed, 14 Dec 2011) New Revision: 15380 Removed: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java Log: Updates to the testsuiteUpdates to the testsuites Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -123,16 +123,6 @@ </war> <!-- jaxws-cxf-jms-api --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6.war" - needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jms/TestServlet.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6/wsdl" - prefix="WEB-INF/classes/META-INF/wsdl"/> - </war> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> @@ -148,15 +138,6 @@ </war> <!-- jaxws-jms-api-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6"> - <include name="wsdl/**/*" /> - <include name="jboss-dependency.xml"/> - </metainf> - </jar> <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> @@ -165,11 +146,6 @@ <include name="wsdl/**/*" /> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/hornetq-testqueue-as6.sar"> - <fileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6"> - <include name="hornetq-jms.xml"/> - </fileset> - </jar> <!-- jaxws-jms-only-deployment --> <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment.jar"> Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -213,28 +213,12 @@ <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="login-config.xml"/> - <include name="jbossws-users.properties"/> - <include name="jbossws-roles.properties"/> - --> - </webinf> <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-server"/> </manifest> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest-service.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/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -44,24 +44,19 @@ { public static Test suite() { - if (isTargetJBoss6()) { - return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "hornetq-testqueue-as6.sar,jaxws-cxf-jms-api-as6-client.jar,jaxws-cxf-jms-api-as6.war"); - } else { - return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war"); - } + return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war"); } public void testServerSide() throws Exception { - final String asSuffix = isTargetJBoss6() ? "as6" : "as7"; - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api-" + asSuffix); + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api-as7"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("true", br.readLine()); } public void testClientSide() throws Exception { - if (!isTargetJBoss6()) { + if (isTargetJBoss7()) { System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; } Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -55,7 +55,7 @@ public void testJMSEndpointClientSide() throws Exception { - if (!isTargetJBoss6()) + if (isTargetJBoss7()) { System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -55,7 +55,7 @@ public void testJMSEndpointClientSide() throws Exception { - if (!isTargetJBoss6()) + if (isTargetJBoss7()) { System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -52,7 +52,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", true); } public void testAuthorized() throws Exception Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -54,28 +54,20 @@ public static Test suite() { JBossWSCXFTestSetup testSetup; - if (!isTargetJBoss6()) - { - testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war"); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("hashAlgorithm", "SHA"); - authenticationOptions.put("hashEncoding", "BASE64"); - authenticationOptions.put("hashCharset", "UTF-8"); - authenticationOptions.put("hashUserPassword", "false"); - authenticationOptions.put("hashStorePassword", "true"); - authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); - } - else - { - testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, - "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war"); - } + testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("hashAlgorithm", "SHA"); + authenticationOptions.put("hashEncoding", "BASE64"); + authenticationOptions.put("hashCharset", "UTF-8"); + authenticationOptions.put("hashUserPassword", "false"); + authenticationOptions.put("hashStorePassword", "true"); + authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); return testSetup; } Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -49,7 +49,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar", true); } private EjbEndpoint getPort() throws Exception @@ -79,14 +79,7 @@ } catch (Exception ex) { - if (isTargetJBoss6()) - { - assertEquals("Caller unauthorized", ex.getMessage()); - } - else - { - assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed")); - } + assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed")); } } Deleted: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> - <!-- ==================================================================== --> - <!-- Dynamic login config to install the login module using digest --> - <!-- ==================================================================== --> - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" - name="jboss:service=DynamicLoginConfig"> - <attribute name="AuthConfig">META-INF/login-config.xml</attribute> - <!-- The service which supports dynamic processing of login-config.xml - configurations. - --> - <depends optional-attribute-name="LoginConfigService"> - jboss.security:service=XMLLoginConfig - </depends> - <!-- Optionally specify the security mgr service to use when - this service is stopped to flush the auth caches of the domains - registered by this service. - --> - <depends optional-attribute-name="SecurityManagerService"> - jboss.security:service=JaasSecurityManager - </depends> - </mbean> -</server> Deleted: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -1,25 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> -<policy> - - <application-policy name="JBossWSDigest"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <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> - <module-option name="hashUserPassword">false</module-option> - <module-option name="hashStorePassword">true</module-option> - <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option> - <module-option name="unauthenticatedIdentity">anonymous</module-option> - </login-module> - </authentication> - </application-policy> - -</policy> - Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -384,15 +384,6 @@ </manifest> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-digest-service.sar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/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-wsse-policy-username-jaas-ejb --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-ejb.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -50,28 +50,20 @@ public static Test suite() { JBossWSCXFTestSetup testSetup; - if (!isTargetJBoss6()) - { - testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war"); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("hashAlgorithm", "SHA"); - authenticationOptions.put("hashEncoding", "BASE64"); - authenticationOptions.put("hashCharset", "UTF-8"); - authenticationOptions.put("hashUserPassword", "false"); - authenticationOptions.put("hashStorePassword", "true"); - authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); - } - else - { - testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, - "jaxws-samples-wsse-policy-username-jaas-digest-service.sar jaxws-samples-wsse-policy-username-jaas-digest.war"); - } + testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("hashAlgorithm", "SHA"); + authenticationOptions.put("hashEncoding", "BASE64"); + authenticationOptions.put("hashCharset", "UTF-8"); + authenticationOptions.put("hashUserPassword", "false"); + authenticationOptions.put("hashStorePassword", "true"); + authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); return testSetup; } Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", true); } public void test() throws Exception Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -46,7 +46,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", true); } public void test() throws Exception Deleted: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> - <!-- ==================================================================== --> - <!-- Dynamic login config to install the login module using digest --> - <!-- ==================================================================== --> - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" - name="jboss:service=DynamicLoginConfig"> - <attribute name="AuthConfig">META-INF/login-config.xml</attribute> - <!-- The service which supports dynamic processing of login-config.xml - configurations. - --> - <depends optional-attribute-name="LoginConfigService"> - jboss.security:service=XMLLoginConfig - </depends> - <!-- Optionally specify the security mgr service to use when - this service is stopped to flush the auth caches of the domains - registered by this service. - --> - <depends optional-attribute-name="SecurityManagerService"> - jboss.security:service=JaasSecurityManager - </depends> - </mbean> -</server> Deleted: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -1,25 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> -<policy> - - <application-policy name="JBossWSDigest"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <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> - <module-option name="hashUserPassword">false</module-option> - <module-option name="hashStorePassword">true</module-option> - <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option> - <module-option name="unauthenticatedIdentity">anonymous</module-option> - </login-module> - </authentication> - </application-policy> - -</policy> -