remove debug code

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1866406 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/DocumentHelper.java b/src/ooxml/java/org/apache/poi/ooxml/util/DocumentHelper.java
index 8fe643d76430856d8232cd0a584d28af22b9a1d6..4e66f46b9caac8a8c5641a426139f8cda1a925f2 100644 (file)
--- a/src/ooxml/java/org/apache/poi/ooxml/util/DocumentHelper.java
+++ b/src/ooxml/java/org/apache/poi/ooxml/util/DocumentHelper.java
@@ -19,7 +19,6 @@ package org.apache.poi.ooxml.util;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 
@@ -28,11 +27,6 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.events.Namespace;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
 
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
@@ -102,33 +96,6 @@ public final class DocumentHelper {
         }
     }
 
-    public static String domToString(Node node) throws Exception {
-        TransformerFactory tf = TransformerFactory.newInstance();
-        Transformer t = tf.newTransformer();
-        t.setOutputProperty(OutputKeys.INDENT, "yes");
-        StringWriter sw = new StringWriter();
-        t.transform(new DOMSource(node), new StreamResult(sw));
-        return sw.toString();
-    }
-
-    public static Attr findIdAttr(Element e, String name) throws Exception {
-        Attr att = e.getAttributeNode("Id");
-        if(att != null && name.equals(att.getValue())) {
-            return att;
-        }
-        NodeList nl = e.getChildNodes();
-        for (int i = 0; i < nl.getLength(); i++) {
-            Node child = nl.item(i);
-            if (child instanceof Element) {
-                Attr x = findIdAttr((Element)child, name);
-                if (x != null) {
-                    return x;
-                }
-            }
-        }
-        return null;
-    }
-
     static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
     static {
         documentBuilderFactory.setNamespaceAware(true);

diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
index d8da2e1f031eb476f671cb58503d252cd5dcee41..c8f04e882407fa3f64a09dddb37a8c10593c6dc3 100644 (file)
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
@@ -70,7 +70,8 @@ import org.etsi.uri.x01903.v13.SignedSignaturePropertiesType;
 import org.etsi.uri.x01903.v13.SignerRoleType;
 import org.w3.x2000.x09.xmldsig.DigestMethodType;
 import org.w3.x2000.x09.xmldsig.X509IssuerSerialType;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
 
 /**
  * XAdES Signature Facet. Implements XAdES v1.4.1 which is compatible with XAdES
@@ -223,32 +224,10 @@ public class XAdESSignatureFacet extends SignatureFacet {
     private XMLObject addXadesObject(Document document, QualifyingPropertiesType qualifyingProperties) {
         Node qualDocElSrc = qualifyingProperties.getDomNode();
         Node qualDocEl = document.importNode(qualDocElSrc, true);
-        markIds(qualDocEl);
         List<XMLStructure> xadesObjectContent = Arrays.asList(new DOMStructure(qualDocEl));
         return getSignatureFactory().newXMLObject(xadesObjectContent, null, null, null);
     }
 
-    private void markIds(Node node) {
-        if (node instanceof Element) {
-            markIds((Element)node);
-        } else if (node instanceof Document) {
-            markIds(((Document)node).getDocumentElement());
-        }
-    }
-
-    private void markIds(Element element) {
-        if (element != null) {
-            Attr att = element.getAttributeNode("Id");
-            if (att != null) {
-                element.setIdAttributeNode(att, true);
-            }
-            NodeList nl = element.getChildNodes();
-            for (int i = 0; i < nl.getLength(); i++) {
-                markIds(nl.item(i));
-            }
-        }
-    }
-
     private Reference addXadesReference() throws XMLSignatureException {
         List<Transform> transforms = singletonList(newTransform(CanonicalizationMethod.INCLUSIVE));
         return newReference("#"+signatureConfig.getXadesSignatureId(), transforms, XADES_TYPE, null, null);

diff --git a/src/testcases/org/apache/poi/POIDataSamples.java b/src/testcases/org/apache/poi/POIDataSamples.java
index c571686f51ec525a5391b28dd787633dd1b6658b..ddf66e25bf21a28feaf94b1beaf1e1e5b71cf59a 100644 (file)
--- a/src/testcases/org/apache/poi/POIDataSamples.java
+++ b/src/testcases/org/apache/poi/POIDataSamples.java
@@ -117,9 +117,6 @@ public final class POIDataSamples {
     }
 
     public static POIDataSamples getXmlDSignInstance() {
-        if (System.getProperty(TEST_PROPERTY) == null) {
-            System.setProperty(TEST_PROPERTY, "../../test-data");
-        }
         if(_instXmlDSign == null) _instXmlDSign = new POIDataSamples("xmldsign");
         return _instXmlDSign;
     }