svn commit: r570783 - /xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java

[mu...@apache.org]

Author: mullan
Date: Wed Aug 29 05:39:46 2007
New Revision: 570783

URL: http://svn.apache.org/viewvc?rev=570783&view=rev
Log:
Use new StaxTransform class to parse Transforms.

Modified:
    xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java

Modified: xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java
URL: http://svn.apache.org/viewvc/xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java?rev=570783&r1=570782&r2=570783&view=diff
==============================================================================
--- xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java (original)
+++ xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java Wed Aug 29 05:39:46 2007
@@ -36,9 +36,9 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
+import com.r_bg.stax.transforms.StaxTransform;
+
 import org.apache.xml.security.algorithms.JCEMapper;
-import org.apache.xml.security.algorithms.MessageDigestAlgorithm;
-import org.apache.xml.security.algorithms.SignatureAlgorithm;
 import org.apache.xml.security.exceptions.Base64DecodingException;
 import org.apache.xml.security.utils.Base64;
 import org.apache.xml.security.utils.DigesterOutputStream;
@@ -47,45 +47,6 @@
 	public static final String DS_URI="http://www.w3.org/2000/09/xmldsig#";
 }
 
-
-class TransformWorker implements StaxWorker, Transform {
-    private String algorithm;
-    public StaxWorker read(XMLStreamReader reader) {
-	switch (reader.getEventType()) {
-	    case XMLStreamReader.START_ELEMENT: 
-		if (Constants.DS_URI.equals(reader.getNamespaceURI())) {
-		    String name=reader.getLocalName();
-		    if (name.equals("Transform") ) {
-			algorithm=reader.getAttributeValue(null,"Algorithm");
-		    }
-		}
-	    break;
-	}
-	return null;
-    }
-    public StaxWatcher remove() {
-	return null;
-    }
-    public String getAlgorithm() {
-	return algorithm;
-    }
-    public AlgorithmParameterSpec getParameterSpec() {
-	return null;
-    }
-    public boolean isFeatureSupported(String feature) {
-	return false;
-    }
-    public Data transform(Data data, XMLCryptoContext context) 
-	throws TransformException {
-	throw new UnsupportedOperationException();
-    }
-    public Data transform(Data data, XMLCryptoContext context, OutputStream os) 
-	throws TransformException {
-	throw new UnsupportedOperationException();
-    }
-}
-
-
 class ReferenceWorker implements StaxWorker, Reference, DigestResultListener {	
 	boolean readDigestValue=false;
 	String uri;
@@ -97,7 +58,7 @@
 	DigesterOutputStream os;
 	private String id;
 	private String type;
-	List<TransformWorker> transforms=new ArrayList<TransformWorker>();
+	List<Transform> transforms = new ArrayList<Transform>();
 	public StaxWorker read(XMLStreamReader reader) {
 		switch (reader.getEventType()) {
 		
@@ -124,7 +85,7 @@
 				readDigestValue=true;
 			  }			
 			  if (name.equals("Transform")) {
-				TransformWorker t=new TransformWorker();
+				StaxTransform t = new StaxTransform();
 				transforms.add(t);
 				return t;			
 			  }
@@ -151,8 +112,8 @@
 	}
 	public StaxWatcher remove() {		
 	    if (uri != null && uri.startsWith("#")) {
-		return new IdWatcher(uri.substring(1),this,os);
-//		return new IdWatcher(uri.substring(1),this,System.out);
+		return new IdWatcher(uri.substring(1), this, transforms, os);
+//		return new IdWatcher(uri.substring(1),this,transforms,System.out);
 	    } else {
 		return null;
 	    }