Author: richard.opalka(a)jboss.com Date: 2010-08-31 06:58:11 -0400 (Tue, 31 Aug 2010) New Revision: 12876 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java Log: fix AS trunk regression Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-08-30 12:32:39 UTC (rev 12875) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-08-31 10:58:11 UTC (rev 12876) @@ -233,7 +233,7 @@ </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest.sar"> + <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"/> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2010-08-30 12:32:39 UTC (rev 12875) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2010-08-31 10:58:11 UTC (rev 12876) @@ -47,20 +47,20 @@ public final class UsernameDigestTestCase extends JBossWSTest { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-digest"; - + private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityServicePort"); - + public static Test suite() { - return new JBossWSTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.sar jaxws-samples-wsse-username-digest.war"); + return new JBossWSTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war"); } public void testAuthorized() throws Exception { - doTestAuthorized(serviceURL, servicePort, "kermit"); + doTestAuthorized(serviceURL, servicePort, "kermit"); } - -private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception + + private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityService"); URL wsdlURL = new URL(endpointAddress + "?wsdl"); @@ -90,9 +90,9 @@ public void testUnauthorized() throws Exception { - doTestUnauthorized(serviceURL, servicePort, "kermit"); + doTestUnauthorized(serviceURL, servicePort, "kermit"); } - + private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityService"); @@ -110,7 +110,7 @@ assertEquals("Unauthorized", ex.getMessage()); } } - + private void setupWsse(ServiceIface proxy, String username) { Client client = ClientProxy.getClient(proxy); @@ -125,6 +125,4 @@ cxfEndpoint.getOutInterceptors().add(wssOut); cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor()); } - - }