Author: anil.saldhana(a)jboss.com Date: 2010-11-18 11:22:16 -0500 (Thu, 18 Nov 2010) New Revision: 558 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java Log: rename const Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2010-11-18 16:21:29 UTC (rev 557) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2010-11-18 16:22:16 UTC (rev 558) @@ -191,7 +191,7 @@ { KeyInfoType keyInfo = parseKeyInfo(xmlEventReader); QName qname = new QName( WSTrustConstants.XMLDSig.DSIG_NS, WSTrustConstants.XMLDSig.KEYINFO, - WSTrustConstants.XMLDSig.PREFIX ); + WSTrustConstants.XMLDSig.DSIG_PREFIX ); JAXBElement<?> jaxb = new JAXBElement(qname, KeyInfoType.class, keyInfo ); subjectConfirmationData.getContent().add( jaxb ); } @@ -235,7 +235,7 @@ StaxParserUtil.validate(startElement, WSTrustConstants.XMLDSig.X509CERT ); String certValue = StaxParserUtil.getElementText(xmlEventReader); - QName qname = new QName( WSTrustConstants.DSIG_NS, WSTrustConstants.XMLDSig.X509CERT, WSTrustConstants.XMLDSig.PREFIX ); + QName qname = new QName( WSTrustConstants.DSIG_NS, WSTrustConstants.XMLDSig.X509CERT, WSTrustConstants.XMLDSig.DSIG_PREFIX ); JAXBElement<?> cert = new JAXBElement<byte[]>( qname, byte[].class, certValue.getBytes() ); x509.getX509IssuerSerialOrX509SKIOrX509SubjectName().add( cert ); EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2010-11-18 16:21:29 UTC (rev 557) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2010-11-18 16:22:16 UTC (rev 558) @@ -116,7 +116,7 @@ String KEYINFO = "KeyInfo"; String KEYVALUE = "KeyValue"; String MODULUS = "Modulus"; - String PREFIX = "ds"; + String DSIG_PREFIX = "ds"; String RSA_KEYVALUE = "RSAKeyValue"; String X509DATA = "X509Data"; String X509CERT = "X509Certificate"; Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java 2010-11-18 16:21:29 UTC (rev 557) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java 2010-11-18 16:22:16 UTC (rev 558) @@ -257,9 +257,9 @@ else if (useKeyTypeValue instanceof byte[]) { byte[] certificate = (byte[]) useKeyTypeValue; - StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.XMLDSig.X509CERT, + StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.DSIG_PREFIX , WSTrustConstants.XMLDSig.X509CERT, WSTrustConstants.DSIG_NS); - StaxUtil.writeNameSpace( writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.DSIG_NS); + StaxUtil.writeNameSpace( writer, WSTrustConstants.XMLDSig.DSIG_PREFIX , WSTrustConstants.DSIG_NS); StaxUtil.writeCharacters(writer, new String(certificate)); StaxUtil.writeEndElement(writer); } @@ -275,8 +275,8 @@ private void writeKeyValueType(KeyValueType type) throws ProcessingException { - StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.XMLDSig.KEYVALUE, WSTrustConstants.DSIG_NS); - StaxUtil.writeNameSpace(writer, WSTrustConstants.XMLDSig.PREFIX , WSTrustConstants.DSIG_NS); + StaxUtil.writeStartElement(writer, WSTrustConstants.XMLDSig.DSIG_PREFIX , WSTrustConstants.XMLDSig.KEYVALUE, WSTrustConstants.DSIG_NS); + StaxUtil.writeNameSpace(writer, WSTrustConstants.XMLDSig.DSIG_PREFIX , WSTrustConstants.DSIG_NS); if (type.getContent().size() == 0) throw new ProcessingException("KeyValueType must contain at least one value");