Author: alessio.soldano(a)jboss.com Date: 2008-07-28 03:40:18 -0400 (Mon, 28 Jul 2008) New Revision: 7917 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/Constants.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java Log: [JBWS-2265] Fixing namespace Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/Constants.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/Constants.java 2008-07-25 15:04:00 UTC (rev 7916) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/Constants.java 2008-07-28 07:40:18 UTC (rev 7917) @@ -58,9 +58,9 @@ public static final String BASE64_ENCODING_TYPE = WSS_SOAP_NS + "#Base64Binary"; - public static final String PASSWORD_TEXT_TYPE = WSSE_NS + "#PasswordText"; + public static final String PASSWORD_TEXT_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0#PasswordText"; - public static final String PASSWORD_DIGEST_TYPE = WSSE_NS + "#PasswordDigest"; + public static final String PASSWORD_DIGEST_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0#PasswordDigest"; public static final String WSSE_HEADER = WSSE_PREFIX + ":Security"; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-07-25 15:04:00 UTC (rev 7916) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-07-28 07:40:18 UTC (rev 7917) @@ -110,7 +110,7 @@ "xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd'>" + "<wsse:UsernameToken wsu:Id='token-1-1205341951321-19004769'>" + "<wsse:Username>kermit</wsse:Username>" + - "<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecur... + + "<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecur... + "<wsse:Nonce EncodingType='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss... + "<wsse:Created>CREATED</wsse:Created>" + "</wsse:UsernameToken>" + @@ -146,7 +146,7 @@ "xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd'>" + "<wsse:UsernameToken wsu:Id='token-1-1205341951321-19004769'>" + "<wsse:Username>kermit</wsse:Username>" + - "<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecur... + + "<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecur... + "<wsse:Nonce>gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=</wsse:Nonce>" + "<wsse:Created>CREATED</wsse:Created>" + "</wsse:UsernameToken>" + @@ -244,6 +244,6 @@ Element passwordEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Password")).next(); assertNotNull(passwordEl); assertNotNull(DOMUtils.getTextContent(passwordEl)); - assertEquals(passwordEl.getAttribute("Type"), Constants.WSSE_NS+"#PasswordDigest"); + assertEquals("http://docs.oasis-open.org/wss/2004/01/oasis-200401-ws...;, passwordEl.getAttribute("Type")); } } \ No newline at end of file