svn commit: r1205486 - /santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/

[mu...@apache.org]

Author: mullan
Date: Wed Nov 23 16:33:25 2011
New Revision: 1205486

URL: http://svn.apache.org/viewvc?rev=1205486&view=rev
Log:
Use IdResolver to statically register Ids so that they can be remembered
when signing signature templates.

Modified:
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java?rev=1205486&r1=1205485&r2=1205486&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Wed Nov 23 16:33:25 2011
@@ -36,6 +36,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.apache.xml.security.utils.IdResolver;
+
 /**
  * DOM-based implementation of KeyInfo.
  *
@@ -88,8 +90,7 @@ public final class DOMKeyInfo extends DO
         // get Id attribute, if specified
         id = DOMUtils.getAttributeValue(kiElem, "Id");
         if (id != null) {
-            DOMCryptoContext dcc = (DOMCryptoContext)context;
-            dcc.setIdAttributeNS(kiElem, null, "Id");
+            IdResolver.registerElementById(kiElem, id);
         }
 
         // get all children nodes

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java?rev=1205486&r1=1205485&r2=1205486&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java Wed Nov 23 16:33:25 2011
@@ -34,6 +34,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import org.apache.xml.security.utils.IdResolver;
+
 /**
  * DOM-based implementation of Manifest.
  *
@@ -87,8 +89,7 @@ public final class DOMManifest extends D
     {
         this.id = DOMUtils.getAttributeValue(manElem, "Id");
         if (this.id != null) {
-            DOMCryptoContext dcc = (DOMCryptoContext)context;
-            dcc.setIdAttributeNS(manElem, null, "Id");
+            IdResolver.registerElementById(manElem, this.id);
         }
         Element refElem = DOMUtils.getFirstChildElement(manElem);
         List<Reference> refs = new ArrayList<Reference>();

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java?rev=1205486&r1=1205485&r2=1205486&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java Wed Nov 23 16:33:25 2011
@@ -50,6 +50,7 @@ import org.apache.jcp.xml.dsig.internal.
 import org.apache.xml.security.exceptions.Base64DecodingException;
 import org.apache.xml.security.signature.XMLSignatureInput;
 import org.apache.xml.security.utils.Base64;
+import org.apache.xml.security.utils.IdResolver;
 import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
 
 /**
@@ -217,8 +218,7 @@ public final class DOMReference extends 
         this.uri = DOMUtils.getAttributeValue(refElem, "URI");
         this.id = DOMUtils.getAttributeValue(refElem, "Id");
         if (this.id != null) {
-            DOMCryptoContext dcc = (DOMCryptoContext)context;
-            dcc.setIdAttributeNS(refElem, null, "Id");
+            IdResolver.registerElementById(refElem, this.id);
         }
 
         this.type = DOMUtils.getAttributeValue(refElem, "Type");

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java?rev=1205486&r1=1205485&r2=1205486&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Wed Nov 23 16:33:25 2011
@@ -34,6 +34,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.apache.xml.security.utils.IdResolver;
+
 /**
  * DOM-based implementation of SignatureProperties.
  *
@@ -90,8 +92,7 @@ public final class DOMSignaturePropertie
         // unmarshal attributes
         id = DOMUtils.getAttributeValue(propsElem, "Id");
         if (id != null) {
-            DOMCryptoContext dcc = (DOMCryptoContext)context;
-            dcc.setIdAttributeNS(propsElem, null, "Id");
+            IdResolver.registerElementById(propsElem, id);
         }
 
         NodeList nodes = propsElem.getChildNodes();

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java?rev=1205486&r1=1205485&r2=1205486&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Wed Nov 23 16:33:25 2011
@@ -34,6 +34,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.apache.xml.security.utils.IdResolver;
+
 /**
  * DOM-based implementation of SignatureProperty.
  *
@@ -98,8 +100,7 @@ public final class DOMSignatureProperty 
         }
         id = DOMUtils.getAttributeValue(propElem, "Id");
         if (id != null) {
-            DOMCryptoContext dcc = (DOMCryptoContext)context;
-            dcc.setIdAttributeNS(propElem, null, "Id");
+            IdResolver.registerElementById(propElem, id);
         }
 
         NodeList nodes = propElem.getChildNodes();

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java?rev=1205486&r1=1205485&r2=1205486&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java Wed Nov 23 16:33:25 2011
@@ -35,6 +35,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.apache.xml.security.utils.IdResolver;
+
 /**
  * DOM-based implementation of XMLObject.
  *
@@ -95,8 +97,7 @@ public final class DOMXMLObject extends 
         this.encoding = DOMUtils.getAttributeValue(objElem, "Encoding");
         this.id = DOMUtils.getAttributeValue(objElem, "Id");
         if (this.id != null) {
-            DOMCryptoContext dcc = (DOMCryptoContext)context;
-            dcc.setIdAttributeNS(objElem, null, "Id");
+            IdResolver.registerElementById(objElem, this.id);
         }
         this.mimeType = DOMUtils.getAttributeValue(objElem, "MimeType");
 

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1205486&r1=1205485&r2=1205486&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Wed Nov 23 16:33:25 2011
@@ -51,6 +51,7 @@ import org.w3c.dom.Node;
 
 import org.apache.xml.security.exceptions.Base64DecodingException;
 import org.apache.xml.security.utils.Base64;
+import org.apache.xml.security.utils.IdResolver;
 
 /**
  * DOM-based implementation of XMLSignature.
@@ -495,8 +496,7 @@ public final class DOMXMLSignature exten
 
             id = DOMUtils.getAttributeValue(sigValueElem, "Id");
             if (id != null) {
-                DOMCryptoContext dcc = (DOMCryptoContext)context;
-                dcc.setIdAttributeNS(sigValueElem, null, "Id");
+                IdResolver.registerElementById(sigValueElem, id);
             }
             this.sigValueElem = sigValueElem;
         }