[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/resolver NSResolver.java,1.2,1.3

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

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

Modified Files:
	NSResolver.java 
Log Message:
Changed NameSpace to Identity.
To cause less confusion in the future.


Index: NSResolver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver/NSResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NSResolver.java	22 Sep 2003 19:24:01 -0000	1.2
--- NSResolver.java	23 Sep 2003 19:16:27 -0000	1.3
***************
*** 1,7 ****
  package org.neuclear.id.resolver;
  
! import org.neuclear.id.InvalidNameSpaceException;
  import org.neuclear.id.NSTools;
! import org.neuclear.id.NameSpace;
  import org.neuclear.id.cache.NSCache;
  import org.neuclear.id.verifier.NSVerifier;
--- 1,7 ----
  package org.neuclear.id.resolver;
  
! import org.neuclear.id.InvalidIdentityException;
  import org.neuclear.id.NSTools;
! import org.neuclear.id.Identity;
  import org.neuclear.id.cache.NSCache;
  import org.neuclear.id.verifier.NSVerifier;
***************
*** 12,16 ****
  
  /**
!  * Secure NameSpace resolver
   */
  public final class NSResolver {
--- 12,16 ----
  
  /**
!  * Secure Identity resolver
   */
  public final class NSResolver {
***************
*** 21,25 ****
  
      /**
!      * Retrieves the NameSpace object of the given name
       * defaultstore for the given namespace.
       *  This is guaranteed to be valid as it checks the signatures on each level.
--- 21,25 ----
  
      /**
!      * Retrieves the Identity object of the given name
       * defaultstore for the given namespace.
       *  This is guaranteed to be valid as it checks the signatures on each level.
***************
*** 27,32 ****
       * @return
       */
!     public final static NameSpace resolveNameSpace(String name) throws NeudistException, InvalidNameSpaceException {
!         NameSpace ns = NSCACHE.fetchCached(name);
          if (ns != null)
              return ns;
--- 27,32 ----
       * @return
       */
!     public final static Identity resolveNameSpace(String name) throws NeudistException, InvalidIdentityException {
!         Identity ns = NSCACHE.fetchCached(name);
          if (ns != null)
              return ns;
***************
*** 35,50 ****
          String store = NSROOTSTORE;
          boolean isRootlevel = parentname == null || parentname.equals("neu://");
!         NameSpace parent = null;
          if (!isRootlevel) {
              parent = resolveNameSpace(parentname);
              store = parent.getRepository();
          }
!         // fetches NameSpace from parent NameSpace's Default Store
!         ns = (NameSpace) Source.getInstance().fetch(store, name);
          if (ns == null)
!             throw new NeudistException("NameSpace: " + name + " was not resolved");
          PublicKey parentkey = (isRootlevel) ? NSVerifier.getRootPK() : parent.getAllowed();
          if (!ns.verifySignature(parentkey))
!             throw new InvalidNameSpaceException("NameSpace: " + name + " not allowed in " + parentname);
          NSCACHE.cache(ns);
          return ns; //This may not be null
--- 35,50 ----
          String store = NSROOTSTORE;
          boolean isRootlevel = parentname == null || parentname.equals("neu://");
!         Identity parent = null;
          if (!isRootlevel) {
              parent = resolveNameSpace(parentname);
              store = parent.getRepository();
          }
!         // fetches Identity from parent Identity's Default Store
!         ns = (Identity) Source.getInstance().fetch(store, name);
          if (ns == null)
!             throw new NeudistException("Identity: " + name + " was not resolved");
          PublicKey parentkey = (isRootlevel) ? NSVerifier.getRootPK() : parent.getAllowed();
          if (!ns.verifySignature(parentkey))
!             throw new InvalidIdentityException("Identity: " + name + " not allowed in " + parentname);
          NSCACHE.cache(ns);
          return ns; //This may not be null