Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove debug code 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1866406 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2019-09-04 17:01:15 +00:00
parent d51ca537ed
commit f31281f18f
3 changed files with 2 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ooxml/java/org/apache/poi/ooxml/util/DocumentHelper.java
View File

@ -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);

25
src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
View File

@ -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);

3
src/testcases/org/apache/poi/POIDataSamples.java
View File

@ -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;
}