1 files changed, 24 insertions, 3 deletions
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
index 9e6ed6d..9dc45fc 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/xml/XSLTTransformationImpl.java
@@ -205,10 +205,31 @@ public class XSLTTransformationImpl extends TransformationImpl implements XSLTTr
 	  
     //CanonicalizationAlgorithm c14n =
      // new CanonicalizationAlgorithmImplExclusiveCanonicalXML();
-	Traverser traverser = new Traverser(element, true, true); 
-	Canonicalizer canonicalizer = new Canonicalizer(traverser, false, true, null); 
+	//Traverser traverser = new Traverser(element, true, true); 
+	//Canonicalizer canonicalizer = new Canonicalizer(traverser, false, true, null); 
 	
-	return new CanonInputStream(canonicalizer); 
+	//return new CanonInputStream(canonicalizer);
+	  
+	  CanonicalizationMethod canonicalizationMethod =
+			  MOAXSecProvider.getXMLSignatureFactory().newCanonicalizationMethod(
+			                CanonicalizationMethod.EXCLUSIVE, new ExcC14NParameterSpec());
+			      
+			       //CanonicalizationAlgorithm c14n =
+			        // new CanonicalizationAlgorithmImplExclusiveCanonicalXML();
+			       NodeList nodeList;
+
+			       try {
+			         nodeList = XPathUtils.selectNodeList(element,
+			  XPathUtils.ALL_NODES_XPATH);
+			       } catch (XPathException e) {
+			         nodeList = new NodeListAdapter(Collections.EMPTY_LIST);
+			       }
+			       //c14n.setInput(nodeList);
+			       ByteArrayOutputStream baos = new ByteArrayOutputStream();
+			       canonicalizationMethod.transform(new
+			  NodeListToNodeSetDataAdapter(nodeList), null, baos);
+			       baos.close();
+			       return new ByteArrayInputStream(baos.toByteArray()); 
 	/*
 	NodeList nodeList;