[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/c14 Canonicalizer.java,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/c14
In directory sc8-pr-cvs1:/tmp/cvs-serv1773/src/java/org/neuclear/xml/c14

Modified Files:
	Canonicalizer.java 
Log Message:
Did some cleaning up in the builders
Fixed some stuff in IdentityCreator
New maven goal to create executable jarapp
We are close to 0.8 final of ID, 0.11 final of XMLSIG and 0.5 of commons.
Will release shortly.

Index: Canonicalizer.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/c14/Canonicalizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Canonicalizer.java	21 Nov 2003 04:44:30 -0000	1.3
--- Canonicalizer.java	10 Dec 2003 23:57:04 -0000	1.4
***************
*** 8,11 ****
--- 8,18 ----
   * $Id$
   * $Log$
+  * Revision 1.4  2003/12/10 23:57:04  pelle
+  * Did some cleaning up in the builders
+  * Fixed some stuff in IdentityCreator
+  * New maven goal to create executable jarapp
+  * We are close to 0.8 final of ID, 0.11 final of XMLSIG and 0.5 of commons.
+  * Will release shortly.
+  *
   * Revision 1.3  2003/11/21 04:44:30  pelle
   * EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 109,114 ****
  
  import java.io.*;
- import java.util.*;
  import java.nio.charset.Charset;
  
  /**
--- 116,121 ----
  
  import java.io.*;
  import java.nio.charset.Charset;
+ import java.util.*;
  
  /**
***************
*** 128,132 ****
      }
  
!     protected Canonicalizer( final String xpath) {
          super(xpath);
  
--- 135,139 ----
      }
  
!     protected Canonicalizer(final String xpath) {
          super(xpath);
  
***************
*** 136,140 ****
          try {
              bos = new ByteArrayOutputStream();
!             writer = new BufferedWriter(new OutputStreamWriter(bos,"UTF-8"));
          } catch (UnsupportedEncodingException e) {
              System.out.println("Strange... we do not have UTF-8");
--- 143,147 ----
          try {
              bos = new ByteArrayOutputStream();
!             writer = new BufferedWriter(new OutputStreamWriter(bos, "UTF-8"));
          } catch (UnsupportedEncodingException e) {
              System.out.println("Strange... we do not have UTF-8");
***************
*** 153,157 ****
       * @throws IOException 
       */
!     public final byte [] canonicalize(final Object node) throws IOException {
          init();
          write(node);
--- 160,164 ----
       * @throws IOException 
       */
!     public final byte[] canonicalize(final Object node) throws IOException {
          init();
          write(node);
***************
*** 335,339 ****
          }
  
! //        if (element.getParent()==null)
  //           writer.write(LF);
      }
--- 342,346 ----
          }
  
! //        if (element.getSignatory()==null)
  //           writer.write(LF);
      }
***************
*** 424,428 ****
                      break;
                  case '&':
!                       writer.write("&");
                      break;
                  case 0x0d:
--- 431,435 ----
                      break;
                  case '&':
!                     writer.write("&");
                      break;
                  case 0x0d:
***************
*** 431,435 ****
                  default :
  
!                     writer.write(text.charAt(i) );
  
              }
--- 438,442 ----
                  default :
  
!                     writer.write(text.charAt(i));
  
              }
***************
*** 486,490 ****
      public final static int C14NTYPE_NORMAL = 0;
      public final static int C14NTYPE_WITH_COMMENTS = 1;
!     private final static Charset utf8=Charset.forName("UTF-8");
  
      public static final String ALGORITHM = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
--- 493,497 ----
      public final static int C14NTYPE_NORMAL = 0;
      public final static int C14NTYPE_WITH_COMMENTS = 1;
!     private final static Charset utf8 = Charset.forName("UTF-8");
  
      public static final String ALGORITHM = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";