You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2011/01/27 12:11:37 UTC

svn commit: r1064079 [12/12] - in /santuario/xml-security-java/trunk/src: main/java/javax/xml/crypto/ main/java/javax/xml/crypto/dom/ main/java/javax/xml/crypto/dsig/ main/java/javax/xml/crypto/dsig/dom/ main/java/javax/xml/crypto/dsig/keyinfo/ main/ja...

Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java?rev=1064079&r1=1064078&r2=1064079&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Thu Jan 27 11:11:33 2011
@@ -48,79 +48,79 @@ public final class DOMXMLSignatureFactor
     public DOMXMLSignatureFactory() {}
 
     public XMLSignature newXMLSignature(SignedInfo si, KeyInfo ki) {
-	return new DOMXMLSignature(si, ki, null, null, null);
+        return new DOMXMLSignature(si, ki, null, null, null);
     }
 
     public XMLSignature newXMLSignature(SignedInfo si, KeyInfo ki,
         List objects, String id, String signatureValueId) {
-	return new DOMXMLSignature(si, ki, objects, id, signatureValueId);
+        return new DOMXMLSignature(si, ki, objects, id, signatureValueId);
     }
 
     public Reference newReference(String uri, DigestMethod dm) {
-	return newReference(uri, dm, null, null, null);
+        return newReference(uri, dm, null, null, null);
     }
 
     public Reference newReference(String uri, DigestMethod dm, List transforms,
         String type, String id) {
-	return new DOMReference(uri, type, dm, transforms, id, getProvider());
+        return new DOMReference(uri, type, dm, transforms, id, getProvider());
     }
 
     public Reference newReference(String uri, DigestMethod dm, 
-	List appliedTransforms, Data result, List transforms, String type, 
-	String id) {
-	if (appliedTransforms == null) {
-	    throw new NullPointerException("appliedTransforms cannot be null");
-	}
-	if (appliedTransforms.isEmpty()) {
-	    throw new NullPointerException("appliedTransforms cannot be empty");
-	}
-	if (result == null) {
-	    throw new NullPointerException("result cannot be null");
-	}
-	return new DOMReference
-	    (uri, type, dm, appliedTransforms, result, transforms, id, getProvider());
+        List appliedTransforms, Data result, List transforms, String type, 
+        String id) {
+        if (appliedTransforms == null) {
+            throw new NullPointerException("appliedTransforms cannot be null");
+        }
+        if (appliedTransforms.isEmpty()) {
+            throw new NullPointerException("appliedTransforms cannot be empty");
+        }
+        if (result == null) {
+            throw new NullPointerException("result cannot be null");
+        }
+        return new DOMReference
+            (uri, type, dm, appliedTransforms, result, transforms, id, getProvider());
     }
 
     public Reference newReference(String uri, DigestMethod dm, List transforms,
         String type, String id, byte[] digestValue) {
-	if (digestValue == null) {
-	    throw new NullPointerException("digestValue cannot be null");
-	}
-	return new DOMReference
-	    (uri, type, dm, null, null, transforms, id, digestValue, getProvider());
+        if (digestValue == null) {
+            throw new NullPointerException("digestValue cannot be null");
+        }
+        return new DOMReference
+            (uri, type, dm, null, null, transforms, id, digestValue, getProvider());
     }
 
     public SignedInfo newSignedInfo(CanonicalizationMethod cm,
-	SignatureMethod sm, List references) {
-	return newSignedInfo(cm, sm, references, null);
+        SignatureMethod sm, List references) {
+        return newSignedInfo(cm, sm, references, null);
     }
 
     public SignedInfo newSignedInfo(CanonicalizationMethod cm,
-	SignatureMethod sm, List references, String id) {
-	return new DOMSignedInfo(cm, sm, references, id);
+        SignatureMethod sm, List references, String id) {
+        return new DOMSignedInfo(cm, sm, references, id);
     }
 
     // Object factory methods
     public XMLObject newXMLObject(List content, String id, String mimeType,
-	String encoding) {
-	return new DOMXMLObject(content, id, mimeType, encoding);
+        String encoding) {
+        return new DOMXMLObject(content, id, mimeType, encoding);
     }
 
     public Manifest newManifest(List references) {
-	return newManifest(references, null);
+        return newManifest(references, null);
     }
 
     public Manifest newManifest(List references, String id) {
-	return new DOMManifest(references, id);
+        return new DOMManifest(references, id);
     }
 
     public SignatureProperties newSignatureProperties(List props, String id) {
-	return new DOMSignatureProperties(props, id);
+        return new DOMSignatureProperties(props, id);
     }
 
     public SignatureProperty newSignatureProperty
-	(List info, String target, String id) {
-	return new DOMSignatureProperty(info, target, id);
+        (List info, String target, String id) {
+        return new DOMSignatureProperty(info, target, id);
     }
 
     public XMLSignature unmarshalXMLSignature(XMLValidateContext context)
@@ -129,7 +129,7 @@ public final class DOMXMLSignatureFactor
         if (context == null) {
             throw new NullPointerException("context cannot be null");
         }
-	return unmarshal(((DOMValidateContext) context).getNode(), context);
+        return unmarshal(((DOMValidateContext) context).getNode(), context);
     }
 
     public XMLSignature unmarshalXMLSignature(XMLStructure xmlStructure)
@@ -138,13 +138,13 @@ public final class DOMXMLSignatureFactor
         if (xmlStructure == null) {
             throw new NullPointerException("xmlStructure cannot be null");
         }
-	return unmarshal
-	    (((javax.xml.crypto.dom.DOMStructure) xmlStructure).getNode(), 
-	     null);
+        return unmarshal
+            (((javax.xml.crypto.dom.DOMStructure) xmlStructure).getNode(), 
+             null);
     }
 
     private XMLSignature unmarshal(Node node, XMLValidateContext context) 
-	throws MarshalException {
+        throws MarshalException {
 
         node.normalize();
         
@@ -155,15 +155,15 @@ public final class DOMXMLSignatureFactor
             element = (Element) node;
         } else {
             throw new MarshalException
-		("Signature element is not a proper Node");
+                ("Signature element is not a proper Node");
         }
 
         // check tag
         String tag = element.getLocalName();
-	if (tag == null) {
-	    throw new MarshalException("Document implementation must " +
-		"support DOM Level 2 and be namespace aware");
-	}
+        if (tag == null) {
+            throw new MarshalException("Document implementation must " +
+                "support DOM Level 2 and be namespace aware");
+        }
         if (tag.equals("Signature")) {
             return new DOMXMLSignature(element, context, getProvider());
         } else {
@@ -182,9 +182,9 @@ public final class DOMXMLSignatureFactor
     public DigestMethod newDigestMethod(String algorithm,
         DigestMethodParameterSpec params) throws NoSuchAlgorithmException,
         InvalidAlgorithmParameterException {
-	if (algorithm == null) {
-	    throw new NullPointerException();
-	}
+        if (algorithm == null) {
+            throw new NullPointerException();
+        }
         if (algorithm.equals(DigestMethod.SHA1)) {
             return new DOMDigestMethod.SHA1(params);
         } else if (algorithm.equals(DigestMethod.SHA256)) {
@@ -193,17 +193,17 @@ public final class DOMXMLSignatureFactor
             return new DOMDigestMethod.SHA384(params);
         } else if (algorithm.equals(DigestMethod.SHA512)) {
             return new DOMDigestMethod.SHA512(params);
-	} else {
-	    throw new NoSuchAlgorithmException("unsupported algorithm");
-	}
+        } else {
+            throw new NoSuchAlgorithmException("unsupported algorithm");
+        }
     }
 
     public SignatureMethod newSignatureMethod(String algorithm,
         SignatureMethodParameterSpec params) throws NoSuchAlgorithmException,
         InvalidAlgorithmParameterException {
-	if (algorithm == null) {
-	    throw new NullPointerException();
-	}
+        if (algorithm == null) {
+            throw new NullPointerException();
+        }
         if (algorithm.equals(SignatureMethod.RSA_SHA1)) {
             return new DOMSignatureMethod.SHA1withRSA(params);
         } else if (algorithm.equals(DOMSignatureMethod.RSA_SHA256)) {
@@ -238,64 +238,64 @@ public final class DOMXMLSignatureFactor
     public Transform newTransform(String algorithm,
         TransformParameterSpec params) throws NoSuchAlgorithmException,
         InvalidAlgorithmParameterException {
-	TransformService spi;
-	try {
-	    spi = TransformService.getInstance(algorithm, "DOM");
-	} catch (NoSuchAlgorithmException nsae) {
-	    spi = TransformService.getInstance(algorithm, "DOM", getProvider());
-	}
-	spi.init(params);
-	return new DOMTransform(spi);
+        TransformService spi;
+        try {
+            spi = TransformService.getInstance(algorithm, "DOM");
+        } catch (NoSuchAlgorithmException nsae) {
+            spi = TransformService.getInstance(algorithm, "DOM", getProvider());
+        }
+        spi.init(params);
+        return new DOMTransform(spi);
     }
 
     public Transform newTransform(String algorithm,
         XMLStructure params) throws NoSuchAlgorithmException,
         InvalidAlgorithmParameterException {
-	TransformService spi;
-	try {
-	    spi = TransformService.getInstance(algorithm, "DOM");
-	} catch (NoSuchAlgorithmException nsae) {
-	    spi = TransformService.getInstance(algorithm, "DOM", getProvider());
-	}
-	if (params == null) {
-	    spi.init(null);
-	} else {
-	    spi.init(params, null);
-	}
-	return new DOMTransform(spi);
+        TransformService spi;
+        try {
+            spi = TransformService.getInstance(algorithm, "DOM");
+        } catch (NoSuchAlgorithmException nsae) {
+            spi = TransformService.getInstance(algorithm, "DOM", getProvider());
+        }
+        if (params == null) {
+            spi.init(null);
+        } else {
+            spi.init(params, null);
+        }
+        return new DOMTransform(spi);
     }
 
     public CanonicalizationMethod newCanonicalizationMethod(String algorithm,
         C14NMethodParameterSpec params) throws NoSuchAlgorithmException,
         InvalidAlgorithmParameterException {
-	TransformService spi;
-	try {
-	    spi = TransformService.getInstance(algorithm, "DOM");
-	} catch (NoSuchAlgorithmException nsae) {
-	    spi = TransformService.getInstance(algorithm, "DOM", getProvider());
-	}
-	spi.init(params);
-	return new DOMCanonicalizationMethod(spi);
+        TransformService spi;
+        try {
+            spi = TransformService.getInstance(algorithm, "DOM");
+        } catch (NoSuchAlgorithmException nsae) {
+            spi = TransformService.getInstance(algorithm, "DOM", getProvider());
+        }
+        spi.init(params);
+        return new DOMCanonicalizationMethod(spi);
     }
 
     public CanonicalizationMethod newCanonicalizationMethod(String algorithm,
         XMLStructure params) throws NoSuchAlgorithmException,
         InvalidAlgorithmParameterException {
-	TransformService spi; 
-	try {
-	    spi = TransformService.getInstance(algorithm, "DOM");
-	} catch (NoSuchAlgorithmException nsae) {
-	    spi = TransformService.getInstance(algorithm, "DOM", getProvider());
-	}
-	if (params == null) {
-	    spi.init(null);
-	} else {
-	    spi.init(params, null);
-	}
-	return new DOMCanonicalizationMethod(spi);
+        TransformService spi; 
+        try {
+            spi = TransformService.getInstance(algorithm, "DOM");
+        } catch (NoSuchAlgorithmException nsae) {
+            spi = TransformService.getInstance(algorithm, "DOM", getProvider());
+        }
+        if (params == null) {
+            spi.init(null);
+        } else {
+            spi.init(params, null);
+        }
+        return new DOMCanonicalizationMethod(spi);
     }
 
     public URIDereferencer getURIDereferencer() {
-	return DOMURIDereferencer.INSTANCE;
+        return DOMURIDereferencer.INSTANCE;
     }
 }

Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java?rev=1064079&r1=1064078&r2=1064079&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Thu Jan 27 11:11:33 2011
@@ -56,36 +56,36 @@ public final class DOMXPathFilter2Transf
         throws InvalidAlgorithmParameterException
     {
         if (params == null) {
-	    throw new InvalidAlgorithmParameterException("params are required");
-	} else if (!(params instanceof XPathFilter2ParameterSpec)) {
-	    throw new InvalidAlgorithmParameterException
-		("params must be of type XPathFilter2ParameterSpec");
+            throw new InvalidAlgorithmParameterException("params are required");
+        } else if (!(params instanceof XPathFilter2ParameterSpec)) {
+            throw new InvalidAlgorithmParameterException
+                ("params must be of type XPathFilter2ParameterSpec");
         }
-	this.params = params;
+        this.params = params;
     }
 
     public void init(XMLStructure parent, XMLCryptoContext context)
         throws InvalidAlgorithmParameterException
     {
-	super.init(parent, context);
-	try {
-	    unmarshalParams(DOMUtils.getFirstChildElement(transformElem));
-	} catch (MarshalException me) {
-	    throw new InvalidAlgorithmParameterException(me);
-	}
+        super.init(parent, context);
+        try {
+            unmarshalParams(DOMUtils.getFirstChildElement(transformElem));
+        } catch (MarshalException me) {
+            throw new InvalidAlgorithmParameterException(me);
+        }
     }
 
     private void unmarshalParams(Element curXPathElem) throws MarshalException
     {
         List<XPathType> list = new ArrayList<XPathType>();
-	while (curXPathElem != null) {
-	    String xPath = curXPathElem.getFirstChild().getNodeValue();
-	    String filterVal = DOMUtils.getAttributeValue(curXPathElem,
+        while (curXPathElem != null) {
+            String xPath = curXPathElem.getFirstChild().getNodeValue();
+            String filterVal = DOMUtils.getAttributeValue(curXPathElem,
                                                           "Filter");
-	    if (filterVal == null) {
-		throw new MarshalException("filter cannot be null");
-	    }
-	    XPathType.Filter filter = null;
+            if (filterVal == null) {
+                throw new MarshalException("filter cannot be null");
+            }
+            XPathType.Filter filter = null;
             if (filterVal.equals("intersect")) {
                 filter = XPathType.Filter.INTERSECT;
             } else if (filterVal.equals("subtract")) {   
@@ -96,48 +96,48 @@ public final class DOMXPathFilter2Transf
                 throw new MarshalException("Unknown XPathType filter type" +
                                            filterVal);
             }
-	    NamedNodeMap attributes = curXPathElem.getAttributes();
-	    if (attributes != null) {
-		int length = attributes.getLength();
-	        Map<String, String> namespaceMap =
+            NamedNodeMap attributes = curXPathElem.getAttributes();
+            if (attributes != null) {
+                int length = attributes.getLength();
+                Map<String, String> namespaceMap =
                     new HashMap<String, String>(length);
-	        for (int i = 0; i < length; i++) {
-	    	    Attr attr = (Attr)attributes.item(i);
-	    	    String prefix = attr.getPrefix();
-	    	    if (prefix != null && prefix.equals("xmlns")) {
-	                namespaceMap.put(attr.getLocalName(), attr.getValue());
-            	    }
+                for (int i = 0; i < length; i++) {
+                    Attr attr = (Attr)attributes.item(i);
+                    String prefix = attr.getPrefix();
+                    if (prefix != null && prefix.equals("xmlns")) {
+                        namespaceMap.put(attr.getLocalName(), attr.getValue());
+                    }
                 }
-	        list.add(new XPathType(xPath, filter, namespaceMap));
-	    } else {
-	        list.add(new XPathType(xPath, filter));
-	    }
+                list.add(new XPathType(xPath, filter, namespaceMap));
+            } else {
+                list.add(new XPathType(xPath, filter));
+            }
 
-	    curXPathElem = DOMUtils.getNextSiblingElement(curXPathElem);
-	}
+            curXPathElem = DOMUtils.getNextSiblingElement(curXPathElem);
+        }
         this.params = new XPathFilter2ParameterSpec(list);
     }
 
     public void marshalParams(XMLStructure parent, XMLCryptoContext context)
         throws MarshalException
     {
-	super.marshalParams(parent, context);
-	XPathFilter2ParameterSpec xp = 
-	    (XPathFilter2ParameterSpec)getParameterSpec();
+        super.marshalParams(parent, context);
+        XPathFilter2ParameterSpec xp = 
+            (XPathFilter2ParameterSpec)getParameterSpec();
         String prefix = DOMUtils.getNSPrefix(context, Transform.XPATH2);
-	String qname = (prefix == null || prefix.length() == 0) 
-		       ? "xmlns" : "xmlns:" + prefix;
+        String qname = (prefix == null || prefix.length() == 0) 
+                       ? "xmlns" : "xmlns:" + prefix;
         @SuppressWarnings("unchecked")
         List<XPathType> xpathList = xp.getXPathList();
         for (XPathType xpathType : xpathList) {
             Element elem = DOMUtils.createElement(ownerDoc, "XPath",
                                                   Transform.XPATH2, prefix);
             elem.appendChild
-		(ownerDoc.createTextNode(xpathType.getExpression()));
-	    DOMUtils.setAttribute(elem, "Filter",
+                (ownerDoc.createTextNode(xpathType.getExpression()));
+            DOMUtils.setAttribute(elem, "Filter",
                                   xpathType.getFilter().toString());
             elem.setAttributeNS("http://www.w3.org/2000/xmlns/", qname,
-	                        Transform.XPATH2);
+                                Transform.XPATH2);
 
             // add namespace attributes, if necessary
             @SuppressWarnings("unchecked")

Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java?rev=1064079&r1=1064078&r2=1064079&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Thu Jan 27 11:11:33 2011
@@ -46,19 +46,19 @@ public final class DOMXPathTransform ext
         throws InvalidAlgorithmParameterException
     {
         if (params == null) {
-	    throw new InvalidAlgorithmParameterException("params are required");
-	} else if (!(params instanceof XPathFilterParameterSpec)) {
-	    throw new InvalidAlgorithmParameterException
-		("params must be of type XPathFilterParameterSpec");
+            throw new InvalidAlgorithmParameterException("params are required");
+        } else if (!(params instanceof XPathFilterParameterSpec)) {
+            throw new InvalidAlgorithmParameterException
+                ("params must be of type XPathFilterParameterSpec");
         }
-	this.params = params;
+        this.params = params;
     }
 
     public void init(XMLStructure parent, XMLCryptoContext context)
         throws InvalidAlgorithmParameterException
     {
-	super.init(parent, context);
-	unmarshalParams(DOMUtils.getFirstChildElement(transformElem));
+        super.init(parent, context);
+        unmarshalParams(DOMUtils.getFirstChildElement(transformElem));
     }
 
     private void unmarshalParams(Element paramsElem) {
@@ -66,42 +66,42 @@ public final class DOMXPathTransform ext
         // create a Map of namespace prefixes
         NamedNodeMap attributes = paramsElem.getAttributes();
         if (attributes != null) {
-	    int length = attributes.getLength();
+            int length = attributes.getLength();
             Map<String, String> namespaceMap =
                 new HashMap<String, String>(length);
-	    for (int i = 0; i < length; i++) {
-	        Attr attr = (Attr)attributes.item(i);
-	        String prefix = attr.getPrefix();
-	        if (prefix != null && prefix.equals("xmlns")) {
-	            namespaceMap.put(attr.getLocalName(), attr.getValue());
-	        }
-	    }
-	    this.params = new XPathFilterParameterSpec(xPath, namespaceMap);
-	} else {
-	    this.params = new XPathFilterParameterSpec(xPath);
-	}
+            for (int i = 0; i < length; i++) {
+                Attr attr = (Attr)attributes.item(i);
+                String prefix = attr.getPrefix();
+                if (prefix != null && prefix.equals("xmlns")) {
+                    namespaceMap.put(attr.getLocalName(), attr.getValue());
+                }
+            }
+            this.params = new XPathFilterParameterSpec(xPath, namespaceMap);
+        } else {
+            this.params = new XPathFilterParameterSpec(xPath);
+        }
     }
 
     public void marshalParams(XMLStructure parent, XMLCryptoContext context)
         throws MarshalException
     {
-	super.marshalParams(parent, context);
-	XPathFilterParameterSpec xp = 
-	    (XPathFilterParameterSpec)getParameterSpec();
-	Element xpathElem = DOMUtils.createElement(ownerDoc, "XPath",
+        super.marshalParams(parent, context);
+        XPathFilterParameterSpec xp = 
+            (XPathFilterParameterSpec)getParameterSpec();
+        Element xpathElem = DOMUtils.createElement(ownerDoc, "XPath",
              XMLSignature.XMLNS, DOMUtils.getSignaturePrefix(context));
-	xpathElem.appendChild(ownerDoc.createTextNode(xp.getXPath()));
+        xpathElem.appendChild(ownerDoc.createTextNode(xp.getXPath()));
 
-	// add namespace attributes, if necessary
+        // add namespace attributes, if necessary
         @SuppressWarnings("unchecked")
-	Iterator<Map.Entry> i = xp.getNamespaceMap().entrySet().iterator();
-	while (i.hasNext()) {
-	    Map.Entry entry = i.next();
-	    xpathElem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" +
+        Iterator<Map.Entry> i = xp.getNamespaceMap().entrySet().iterator();
+        while (i.hasNext()) {
+            Map.Entry entry = i.next();
+            xpathElem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" +
                                      (String)entry.getKey(),
                                      (String)entry.getValue());
-	}
-	    
-	transformElem.appendChild(xpathElem);
+        }
+            
+        transformElem.appendChild(xpathElem);
     }
 }

Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java?rev=1064079&r1=1064078&r2=1064079&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java Thu Jan 27 11:11:33 2011
@@ -40,34 +40,34 @@ public final class DOMXSLTTransform exte
  
     public void init(TransformParameterSpec params)
         throws InvalidAlgorithmParameterException {
-	if (params == null) {
-	    throw new InvalidAlgorithmParameterException("params are required");
-	}
-	if (!(params instanceof XSLTTransformParameterSpec)) {
-	    throw new InvalidAlgorithmParameterException("unrecognized params");
-	}
-	this.params = params;
+        if (params == null) {
+            throw new InvalidAlgorithmParameterException("params are required");
+        }
+        if (!(params instanceof XSLTTransformParameterSpec)) {
+            throw new InvalidAlgorithmParameterException("unrecognized params");
+        }
+        this.params = params;
     }
 
     public void init(XMLStructure parent, XMLCryptoContext context)
         throws InvalidAlgorithmParameterException {
 
-	super.init(parent, context);
-	unmarshalParams(DOMUtils.getFirstChildElement(transformElem));
+        super.init(parent, context);
+        unmarshalParams(DOMUtils.getFirstChildElement(transformElem));
     }
 
     private void unmarshalParams(Element sheet) {
-	this.params = new XSLTTransformParameterSpec
-	    (new javax.xml.crypto.dom.DOMStructure(sheet));
+        this.params = new XSLTTransformParameterSpec
+            (new javax.xml.crypto.dom.DOMStructure(sheet));
     }
 
     public void marshalParams(XMLStructure parent, XMLCryptoContext context)
         throws MarshalException {
-	super.marshalParams(parent, context);
-	XSLTTransformParameterSpec xp = 
-	    (XSLTTransformParameterSpec) getParameterSpec();
-	Node xsltElem = 
-	    ((javax.xml.crypto.dom.DOMStructure) xp.getStylesheet()).getNode();
-	DOMUtils.appendChild(transformElem, xsltElem);
+        super.marshalParams(parent, context);
+        XSLTTransformParameterSpec xp = 
+            (XSLTTransformParameterSpec) getParameterSpec();
+        Node xsltElem = 
+            ((javax.xml.crypto.dom.DOMStructure) xp.getStylesheet()).getNode();
+        DOMUtils.appendChild(transformElem, xsltElem);
     }
 }

Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/Utils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/Utils.java?rev=1064079&r1=1064078&r2=1064079&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/Utils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/Utils.java Thu Jan 27 11:11:33 2011
@@ -39,15 +39,15 @@ public final class Utils {
     private Utils() {}
 
     public static byte[] readBytesFromStream(InputStream is)
-	throws IOException
+        throws IOException
     {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         byte[] buf = new byte[1024];
         while (true) {
             int read = is.read(buf);
-	    if (read == -1) { // EOF
-		break;
-	    }
+            if (read == -1) { // EOF
+                break;
+            }
             baos.write(buf, 0, read);
             if (read < 1024) {
                 break;
@@ -64,41 +64,41 @@ public final class Utils {
      * @return the Set of Nodes
      */
     static Set<Node> toNodeSet(Iterator<Node> i) {
-	Set<Node> nodeSet = new HashSet<Node>();
-	while (i.hasNext()) {
-	    Node n = i.next();
-	    nodeSet.add(n);
-	    // insert attributes nodes to comply with XPath
-	    if (n.getNodeType() == Node.ELEMENT_NODE) {
-	        NamedNodeMap nnm = n.getAttributes();
-		for (int j = 0, length = nnm.getLength(); j < length; j++) {
-		    nodeSet.add(nnm.item(j));
-		}
-	    }
-	}
-	return nodeSet;
+        Set<Node> nodeSet = new HashSet<Node>();
+        while (i.hasNext()) {
+            Node n = i.next();
+            nodeSet.add(n);
+            // insert attributes nodes to comply with XPath
+            if (n.getNodeType() == Node.ELEMENT_NODE) {
+                NamedNodeMap nnm = n.getAttributes();
+                for (int j = 0, length = nnm.getLength(); j < length; j++) {
+                    nodeSet.add(nnm.item(j));
+                }
+            }
+        }
+        return nodeSet;
     }
 
     /**
      * Returns the ID from a same-document URI (ex: "#id")
      */
     public static String parseIdFromSameDocumentURI(String uri) {
-	if (uri.length() == 0) {
-	    return null;
-	}
-	String id = uri.substring(1);
-	if (id != null && id.startsWith("xpointer(id(")) {
+        if (uri.length() == 0) {
+            return null;
+        }
+        String id = uri.substring(1);
+        if (id != null && id.startsWith("xpointer(id(")) {
             int i1 = id.indexOf('\'');
             int i2 = id.indexOf('\'', i1+1);
             id = id.substring(i1+1, i2);
-	}
-	return id;
+        }
+        return id;
     }
 
     /**
      * Returns true if uri is a same-document URI, false otherwise.
      */
     public static boolean sameDocumentURI(String uri) {
-	return (uri != null && (uri.length() == 0 || uri.charAt(0) == '#'));
+        return (uri != null && (uri.length() == 0 || uri.charAt(0) == '#'));
     }
 }

Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java?rev=1064079&r1=1064078&r2=1064079&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java Thu Jan 27 11:11:33 2011
@@ -54,103 +54,103 @@ public final class XMLDSigRI extends Pro
         "XPath2, XSLT TransformServices)";
 
     public XMLDSigRI() {
-	/* We are the XMLDSig provider */
-	super("XMLDSig", 1.50, INFO);
-	
-	final Map<Object, Object> map = new HashMap<Object, Object>();
+        /* We are the XMLDSig provider */
+        super("XMLDSig", 1.50, INFO);
+        
+        final Map<Object, Object> map = new HashMap<Object, Object>();
         map.put("XMLSignatureFactory.DOM",
-	        "org.jcp.xml.dsig.internal.dom.DOMXMLSignatureFactory");
+                "org.jcp.xml.dsig.internal.dom.DOMXMLSignatureFactory");
         map.put("KeyInfoFactory.DOM",
-	        "org.jcp.xml.dsig.internal.dom.DOMKeyInfoFactory");
+                "org.jcp.xml.dsig.internal.dom.DOMKeyInfoFactory");
 
 
-	// Inclusive C14N
-	map.put("TransformService." + CanonicalizationMethod.INCLUSIVE,
-		"org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14NMethod");
-	map.put("Alg.Alias.TransformService.INCLUSIVE",
-		CanonicalizationMethod.INCLUSIVE);
-	map.put("TransformService." + CanonicalizationMethod.INCLUSIVE +
-		" MechanismType", "DOM");
-
-	// InclusiveWithComments C14N
-	map.put("TransformService." +
-		CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS,
-		"org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14NMethod");
-	map.put("Alg.Alias.TransformService.INCLUSIVE_WITH_COMMENTS",
-		CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS);
-	map.put("TransformService." +
-		CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS +
-		" MechanismType", "DOM");
-
-	// Inclusive C14N 1.1
-	map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11",
-		"org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14N11Method");
-	map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11" +
-		" MechanismType", "DOM");
-
-	// InclusiveWithComments C14N 1.1 
-	map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11#WithComments",
-		"org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14N11Method");
-	map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11#WithComments" +
-		" MechanismType", "DOM");
-
-	// Exclusive C14N
-	map.put("TransformService." + CanonicalizationMethod.EXCLUSIVE,
-		"org.jcp.xml.dsig.internal.dom.DOMExcC14NMethod");
-	map.put("Alg.Alias.TransformService.EXCLUSIVE",
-		CanonicalizationMethod.EXCLUSIVE);
-	map.put("TransformService." + CanonicalizationMethod.EXCLUSIVE +
-		" MechanismType", "DOM");
-
-	// ExclusiveWithComments C14N
-	map.put("TransformService." +
-		CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS,
-		"org.jcp.xml.dsig.internal.dom.DOMExcC14NMethod");
-	map.put("Alg.Alias.TransformService.EXCLUSIVE_WITH_COMMENTS",
-		CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS);
-	map.put("TransformService." +
-		CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS +
-		" MechanismType", "DOM");
-
-	// Base64 Transform
-	map.put("TransformService." + Transform.BASE64,
-		"org.jcp.xml.dsig.internal.dom.DOMBase64Transform");
-	map.put("Alg.Alias.TransformService.BASE64", Transform.BASE64);
-	map.put("TransformService." + Transform.BASE64 +
-		" MechanismType", "DOM");
-
-	// Enveloped Transform
-	map.put("TransformService." + Transform.ENVELOPED,
-		"org.jcp.xml.dsig.internal.dom.DOMEnvelopedTransform");
-	map.put("Alg.Alias.TransformService.ENVELOPED", Transform.ENVELOPED);
-	map.put("TransformService." + Transform.ENVELOPED +
-		" MechanismType", "DOM");
-
-	// XPath2 Transform
-	map.put("TransformService." + Transform.XPATH2,
-		"org.jcp.xml.dsig.internal.dom.DOMXPathFilter2Transform");
-	map.put("Alg.Alias.TransformService.XPATH2", Transform.XPATH2);
-	map.put("TransformService." + Transform.XPATH2 +
-		" MechanismType", "DOM");
-
-	// XPath Transform
-	map.put("TransformService." + Transform.XPATH,
-		"org.jcp.xml.dsig.internal.dom.DOMXPathTransform");
-	map.put("Alg.Alias.TransformService.XPATH", Transform.XPATH);
-	map.put("TransformService." + Transform.XPATH +
-		" MechanismType", "DOM");
-
-	// XSLT Transform
-	map.put("TransformService." + Transform.XSLT,
-		"org.jcp.xml.dsig.internal.dom.DOMXSLTTransform");
-	map.put("Alg.Alias.TransformService.XSLT", Transform.XSLT);
-	map.put("TransformService." + Transform.XSLT + " MechanismType", "DOM");
-
-	AccessController.doPrivileged(new PrivilegedAction<Void>() {
-	    public Void run() {
-		putAll(map);
-		return null;
-	    }
-	});
+        // Inclusive C14N
+        map.put("TransformService." + CanonicalizationMethod.INCLUSIVE,
+                "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14NMethod");
+        map.put("Alg.Alias.TransformService.INCLUSIVE",
+                CanonicalizationMethod.INCLUSIVE);
+        map.put("TransformService." + CanonicalizationMethod.INCLUSIVE +
+                " MechanismType", "DOM");
+
+        // InclusiveWithComments C14N
+        map.put("TransformService." +
+                CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS,
+                "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14NMethod");
+        map.put("Alg.Alias.TransformService.INCLUSIVE_WITH_COMMENTS",
+                CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS);
+        map.put("TransformService." +
+                CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS +
+                " MechanismType", "DOM");
+
+        // Inclusive C14N 1.1
+        map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11",
+                "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14N11Method");
+        map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11" +
+                " MechanismType", "DOM");
+
+        // InclusiveWithComments C14N 1.1 
+        map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11#WithComments",
+                "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14N11Method");
+        map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11#WithComments" +
+                " MechanismType", "DOM");
+
+        // Exclusive C14N
+        map.put("TransformService." + CanonicalizationMethod.EXCLUSIVE,
+                "org.jcp.xml.dsig.internal.dom.DOMExcC14NMethod");
+        map.put("Alg.Alias.TransformService.EXCLUSIVE",
+                CanonicalizationMethod.EXCLUSIVE);
+        map.put("TransformService." + CanonicalizationMethod.EXCLUSIVE +
+                " MechanismType", "DOM");
+
+        // ExclusiveWithComments C14N
+        map.put("TransformService." +
+                CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS,
+                "org.jcp.xml.dsig.internal.dom.DOMExcC14NMethod");
+        map.put("Alg.Alias.TransformService.EXCLUSIVE_WITH_COMMENTS",
+                CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS);
+        map.put("TransformService." +
+                CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS +
+                " MechanismType", "DOM");
+
+        // Base64 Transform
+        map.put("TransformService." + Transform.BASE64,
+                "org.jcp.xml.dsig.internal.dom.DOMBase64Transform");
+        map.put("Alg.Alias.TransformService.BASE64", Transform.BASE64);
+        map.put("TransformService." + Transform.BASE64 +
+                " MechanismType", "DOM");
+
+        // Enveloped Transform
+        map.put("TransformService." + Transform.ENVELOPED,
+                "org.jcp.xml.dsig.internal.dom.DOMEnvelopedTransform");
+        map.put("Alg.Alias.TransformService.ENVELOPED", Transform.ENVELOPED);
+        map.put("TransformService." + Transform.ENVELOPED +
+                " MechanismType", "DOM");
+
+        // XPath2 Transform
+        map.put("TransformService." + Transform.XPATH2,
+                "org.jcp.xml.dsig.internal.dom.DOMXPathFilter2Transform");
+        map.put("Alg.Alias.TransformService.XPATH2", Transform.XPATH2);
+        map.put("TransformService." + Transform.XPATH2 +
+                " MechanismType", "DOM");
+
+        // XPath Transform
+        map.put("TransformService." + Transform.XPATH,
+                "org.jcp.xml.dsig.internal.dom.DOMXPathTransform");
+        map.put("Alg.Alias.TransformService.XPATH", Transform.XPATH);
+        map.put("TransformService." + Transform.XPATH +
+                " MechanismType", "DOM");
+
+        // XSLT Transform
+        map.put("TransformService." + Transform.XSLT,
+                "org.jcp.xml.dsig.internal.dom.DOMXSLTTransform");
+        map.put("Alg.Alias.TransformService.XSLT", Transform.XSLT);
+        map.put("TransformService." + Transform.XSLT + " MechanismType", "DOM");
+
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            public Void run() {
+                putAll(map);
+                return null;
+            }
+        });
     }
 }

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java?rev=1064079&r1=1064078&r2=1064079&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorExceptionTest.java Thu Jan 27 11:11:33 2011
@@ -54,7 +54,7 @@ public class KeySelectorExceptionTest ex
         assertEquals(iae.toString(), kse.getMessage());
         assertTrue(compareThrowable(iae, kse.getCause()));
     }
-	
+        
     private static boolean compareThrowable(Throwable t1, Throwable t2) {
         boolean result = false;
         // first compare their toString presentation