Author: alessio.soldano(a)jboss.com Date: 2013-04-09 10:22:28 -0400 (Tue, 09 Apr 2013) New Revision: 17485 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 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/WSSecurityPolicyExamples23xTestCase.java Log: [JBWS-3622] Initial changes on ssl option names specified to create https listener on AS8 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2013-04-09 06:19:32 UTC (rev 17484) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2013-04-09 14:22:28 UTC (rev 17485) @@ -56,10 +56,20 @@ */ JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war"); Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("key-alias", "tomcat"); + if (isTargetJBoss7()) + { + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("key-alias", "tomcat"); + } + 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"); + } setup.setHttpsConnectorRequirement(sslOptions); return setup; } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2013-04-09 06:19:32 UTC (rev 17484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2013-04-09 14:22:28 UTC (rev 17485) @@ -56,10 +56,20 @@ */ JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameOverTransportTestCase.class, "jaxws-samples-wsse-policy-username.war"); Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("key-alias", "tomcat"); + if (isTargetJBoss7()) + { + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("key-alias", "tomcat"); + } + 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"); + } setup.setHttpsConnectorRequirement(sslOptions); return setup; } 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-09 06:19:32 UTC (rev 17484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2013-04-09 14:22:28 UTC (rev 17485) @@ -62,10 +62,20 @@ JBossWSCXFTestSetup setup = new JBossWSCXFTestSetup(WSSecurityPolicyExamples21xTestCase.class, "jaxws-samples-wsse-policy-oasis-21x.war,jaxws-samples-wsse-policy-oasis-client.jar"); Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("key-alias", "tomcat"); + if (isTargetJBoss7()) + { + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("key-alias", "tomcat"); + } + 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"); + } setup.setHttpsConnectorRequirement(sslOptions); return setup; } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2013-04-09 06:19:32 UTC (rev 17484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2013-04-09 14:22:28 UTC (rev 17485) @@ -65,12 +65,24 @@ JBossWSCXFTestSetup setup = new JBossWSCXFTestSetup(WSSecurityPolicyExamples23xTestCase.class, "jaxws-samples-wsse-policy-oasis-23x.war,jaxws-samples-wsse-policy-oasis-client.jar"); Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("password", "changeit"); - sslOptions.put("verify-client", "true"); //enable SSL mutual authentication (https client cert is checked on server side) - sslOptions.put("key-alias", "tomcat"); - sslOptions.put("ca-certificate-file", System.getProperty("org.jboss.ws.testsuite.server.truststore")); - sslOptions.put("ca-certificate-password", "changeit"); + if (isTargetJBoss7()) + { + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "true"); //enable SSL mutual authentication (https client cert is checked on server side) + sslOptions.put("key-alias", "tomcat"); + sslOptions.put("ca-certificate-file", System.getProperty("org.jboss.ws.testsuite.server.truststore")); + sslOptions.put("ca-certificate-password", "changeit"); + } + else + { + sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("keystore-password", "changeit"); + sslOptions.put("verify-client", "true"); //enable SSL mutual authentication (https client cert is checked on server side) + sslOptions.put("alias", "tomcat"); + sslOptions.put("ca-certificate-file", System.getProperty("org.jboss.ws.testsuite.server.truststore")); + sslOptions.put("ca-certificate-password", "changeit"); + } setup.setHttpsConnectorRequirement(sslOptions); return setup; }