[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders AuthenticationTicketBuilder.java,1.3,1.4 SignatureRequestBuilder.java,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv4604/src/java/org/neuclear/id/builders

Modified Files:
	AuthenticationTicketBuilder.java SignatureRequestBuilder.java 
Log Message:
Updated various areas in NSTools.
Updated URI Validation in particular to support new expanded format
Updated createUniqueID and friends to be a lot more unique and more efficient.
In CryptoTools updated getRandom() to finally use a SecureRandom.
Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is.

Index: AuthenticationTicketBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/AuthenticationTicketBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AuthenticationTicketBuilder.java	21 Nov 2003 04:45:10 -0000	1.3
--- AuthenticationTicketBuilder.java	6 Dec 2003 00:17:03 -0000	1.4
***************
*** 5,10 ****
  import org.neuclear.auth.AuthenticationTicket;
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.id.NSTools;
  import org.neuclear.commons.time.TimeTools;
  
  import java.sql.Timestamp;
--- 5,10 ----
  import org.neuclear.auth.AuthenticationTicket;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.time.TimeTools;
+ import org.neuclear.id.NSTools;
  
  import java.sql.Timestamp;
***************
*** 31,34 ****
--- 31,41 ----
  $Id$
  $Log$
+ Revision 1.4  2003/12/06 00:17:03  pelle
+ Updated various areas in NSTools.
+ Updated URI Validation in particular to support new expanded format
+ Updated createUniqueID and friends to be a lot more unique and more efficient.
+ In CryptoTools updated getRandom() to finally use a SecureRandom.
+ Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is.
+ 
  Revision 1.3  2003/11/21 04:45:10  pelle
  EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 60,64 ****
  
      public AuthenticationTicketBuilder(final String user, final String requester, final Date validto, final String site) throws NeuClearException {
!         super(NSTools.createUniqueNamedID(user, requester), AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH);
          getElement().addAttribute(createQName("requester"), NSTools.normalizeNameURI(requester));
          getElement().addAttribute(createQName("validto"), TimeTools.formatTimeStamp(validto));
--- 67,71 ----
  
      public AuthenticationTicketBuilder(final String user, final String requester, final Date validto, final String site) throws NeuClearException {
!         super(NSTools.createUniqueTransactionID(user, requester), AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH);
          getElement().addAttribute(createQName("requester"), NSTools.normalizeNameURI(requester));
          getElement().addAttribute(createQName("validto"), TimeTools.formatTimeStamp(validto));

Index: SignatureRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/SignatureRequestBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SignatureRequestBuilder.java	21 Nov 2003 04:45:10 -0000	1.3
--- SignatureRequestBuilder.java	6 Dec 2003 00:17:03 -0000	1.4
***************
*** 3,10 ****
  import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
  import org.neuclear.id.NSTools;
  import org.neuclear.id.SignatureRequest;
- import org.neuclear.commons.Utility;
- import org.neuclear.commons.NeuClearException;
  
  /*
--- 3,10 ----
  import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
+ import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.Utility;
  import org.neuclear.id.NSTools;
  import org.neuclear.id.SignatureRequest;
  
  /*
***************
*** 28,31 ****
--- 28,38 ----
  $Id$
  $Log$
+ Revision 1.4  2003/12/06 00:17:03  pelle
+ Updated various areas in NSTools.
+ Updated URI Validation in particular to support new expanded format
+ Updated createUniqueID and friends to be a lot more unique and more efficient.
+ In CryptoTools updated getRandom() to finally use a SecureRandom.
+ Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is.
+ 
  Revision 1.3  2003/11/21 04:45:10  pelle
  EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 53,57 ****
  public final class SignatureRequestBuilder extends NamedObjectBuilder {
      public SignatureRequestBuilder(final String requestor, final String userid, final NamedObjectBuilder unsigned, final String description) throws NeuClearException {
!         super(NSTools.createUniqueNamedID(requestor, userid), SignatureRequest.SIGREQUEST_TAG);
          final Element unsignedElem = getElement().addElement(DocumentHelper.createQName("Unsigned", NSTools.NS_NEUID));
          unsignedElem.add(unsigned.getElement());
--- 60,64 ----
  public final class SignatureRequestBuilder extends NamedObjectBuilder {
      public SignatureRequestBuilder(final String requestor, final String userid, final NamedObjectBuilder unsigned, final String description) throws NeuClearException {
!         super(NSTools.createUniqueTransactionID(requestor, userid), SignatureRequest.SIGREQUEST_TAG);
          final Element unsignedElem = getElement().addElement(DocumentHelper.createQName("Unsigned", NSTools.NS_NEUID));
          unsignedElem.add(unsigned.getElement());