[Neuclear-develop] neuclear-signer/src/java/org/neuclear/signers/standalone StandaloneSigner.java,1.8,1.9

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-signer/src/java/org/neuclear/signers/standalone
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6026/src/java/org/neuclear/signers/standalone

Modified Files:
	StandaloneSigner.java 
Log Message:
Added HTMLSignature with tests and associated changes in StandaloneSigner

Index: StandaloneSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/src/java/org/neuclear/signers/standalone/StandaloneSigner.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StandaloneSigner.java	15 Apr 2004 23:58:54 -0000	1.8
--- StandaloneSigner.java	16 Apr 2004 23:53:52 -0000	1.9
***************
*** 3,7 ****
  import com.jgoodies.plaf.Options;
  import org.dom4j.Document;
- import org.dom4j.io.DOMReader;
  import org.mortbay.http.HttpContext;
  import org.mortbay.jetty.Server;
--- 3,6 ----
***************
*** 16,21 ****
  import org.neuclear.xml.XMLTools;
  import org.neuclear.xml.xmlsec.EnvelopedSignature;
  import org.neuclear.xml.xmlsec.XMLSignature;
- import org.w3c.tidy.Tidy;
  
  import javax.jnlp.BasicService;
--- 15,20 ----
  import org.neuclear.xml.XMLTools;
  import org.neuclear.xml.xmlsec.EnvelopedSignature;
+ import org.neuclear.xml.xmlsec.HTMLSignature;
  import org.neuclear.xml.xmlsec.XMLSignature;
  
  import javax.jnlp.BasicService;
***************
*** 223,236 ****
                  Document doc;
                  if (file.getName().endsWith(".html") || file.getName().endsWith(".html")) {
-                     Tidy tidy = new Tidy();
-                     tidy.setXmlOut(true);
                      InputStream is = new BufferedInputStream(new FileInputStream(file));
!                     org.w3c.dom.Document dom = tidy.parseDOM(is, null);
!                     DOMReader reader = new DOMReader();
!                     doc = reader.read(dom);
!                 } else
                      doc = XMLTools.loadDocument(file);
!                 message.info("Signing " + chooser.getSelectedFile().getName());
!                 XMLSignature sig = new EnvelopedSignature(signer, doc.getRootElement());
                  chooser.setDialogTitle("Save signed XML Document");
                  result = chooser.showSaveDialog(frame);
--- 222,234 ----
                  Document doc;
                  if (file.getName().endsWith(".html") || file.getName().endsWith(".html")) {
                      InputStream is = new BufferedInputStream(new FileInputStream(file));
!                     message.info("Signing " + chooser.getSelectedFile().getName());
!                     XMLSignature sig = new HTMLSignature(signer, is);
!                     doc = sig.getElement().getDocument();
!                 } else {
                      doc = XMLTools.loadDocument(file);
!                     message.info("Signing " + chooser.getSelectedFile().getName());
!                     new EnvelopedSignature(signer, doc.getRootElement());
!                 }
                  chooser.setDialogTitle("Save signed XML Document");
                  result = chooser.showSaveDialog(frame);