Author: alessio.soldano(a)jboss.com Date: 2011-05-09 11:21:05 -0400 (Mon, 09 May 2011) New Revision: 14333 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl Log: [JBWS-3284] Fixing Username + https testcase Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java 2011-05-09 14:59:28 UTC (rev 14332) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java 2011-05-09 15:21:05 UTC (rev 14333) @@ -48,7 +48,7 @@ System.setProperty("javax.net.ssl.trustStore", "/dati/truststore_abc"); System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); System.setProperty("javax.net.ssl.trustStoreType", "jks"); - return new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war"); + return new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wsse-policy-username.war"); } public void test() throws Exception @@ -82,6 +82,6 @@ private void setupWsse(ServiceIface proxy, String username) { ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.USERNAME, username); - ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, "org.jboss.test.ws.jaxws.samples.wssePolicy.UsernamePasswordCallback"); + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, "org.jboss.test.ws.jaxws.samples.wsse.policy.UsernamePasswordCallback"); } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml 2011-05-09 14:59:28 UTC (rev 14332) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml 2011-05-09 15:21:05 UTC (rev 14333) @@ -12,4 +12,14 @@ <servlet-name>TestService</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> + + <security-constraint> + <web-resource-collection> + <web-resource-name>TestService</web-resource-name> + <url-pattern>/*</url-pattern> + </web-resource-collection> + <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + </security-constraint> </web-app> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl 2011-05-09 14:59:28 UTC (rev 14332) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl 2011-05-09 15:21:05 UTC (rev 14333) @@ -41,7 +41,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wssePolicy-username"/> + <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-username"/> </port> </service>