Author: alessio.soldano(a)jboss.com Date: 2013-04-17 03:16:51 -0400 (Wed, 17 Apr 2013) New Revision: 17505 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3622] Restoring tests Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2013-04-16 22:27:18 UTC (rev 17504) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2013-04-17 07:16:51 UTC (rev 17505) @@ -71,10 +71,9 @@ } else { - sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("keystore-password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("alias", "tomcat"); + sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("server-identity.ssl.keystore-password", "changeit"); + sslOptions.put("server-identity.ssl.alias", "tomcat"); } setup.setHttpsConnectorRequirement(sslOptions); return setup; @@ -126,10 +125,6 @@ */ public void test2121() throws Exception { - if (true) { - System.out.println("FIXME: [JBWS-3622] Restore HTTPS tests w/ Undertow"); - return; - } Service service = Service.create(new URL(serviceURLHttps + "SecurityService2121?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService2121Port"), ServiceIface.class); setupWsse(proxy); Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-16 22:27:18 UTC (rev 17504) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-17 07:16:51 UTC (rev 17505) @@ -839,11 +839,6 @@ <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> - <!-- # [JBWS-3622] Restore HTTPS tests w/ Undertow --> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase*</exclude> - <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags --> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>