[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/resolver NSResolver.java,1.18,1.19

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406/src/java/org/neuclear/id/resolver

Modified Files:
	NSResolver.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: NSResolver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver/NSResolver.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** NSResolver.java	3 Jan 2004 20:36:38 -0000	1.18
--- NSResolver.java	18 Feb 2004 00:14:31 -0000	1.19
***************
*** 1,9 ****
  package org.neuclear.id.resolver;
  
! import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.*;
  import org.neuclear.id.cache.NSCache;
! import org.neuclear.source.Source;
! import org.neuclear.source.SourceException;
  
  /**
--- 1,13 ----
  package org.neuclear.id.resolver;
  
! import org.neuclear.id.Identity;
! import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.NameResolutionException;
! import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.cache.NSCache;
! import org.neuclear.id.verifier.VerifyingReader;
! 
! import java.io.IOException;
! import java.net.URL;
  
  /**
***************
*** 23,29 ****
  
      /**
!      * 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.
       * 
       * @param name 
--- 27,31 ----
  
      /**
!      * Given a given URI this resolves the Identity object
       * 
       * @param name 
***************
*** 50,72 ****
              return obj;
  
!         final String parentname = NSTools.getSignatoryURI(name);
  
!         if (parentname == null || name.equals("neu://"))
!             return Identity.NEUROOT;
  
!         String store = NSTools.isHttpScheme(name);
!         if (store == null) {
!             final Identity parent = resolveIdentity(parentname);
!             store = parent.getRepository();
          }
          try {
!             obj = Source.getInstance().fetch(store, name);
!         } catch (SourceException e) {
!             throw new NameResolutionException(name,e.getLocalizedMessage());
          }
-         if (obj == null)
-             throw new NameResolutionException(name);
-         NSCACHE.cache(obj);
-         return obj; //This may not be null
      }
  
--- 52,81 ----
              return obj;
  
! /*
!         if (name.startsWith("neu:")) {
  
!             final String parentname = NSTools.getSignatoryURI(name);
  
!             String store = NSTools.isHttpScheme(name);
!             if (store == null) {
!                 final Identity parent = resolveIdentity(parentname);
!                 store = parent.getRepository();
!             }
!             try {
!                 obj = Source.getInstance().fetch(store, name);
!             } catch (SourceException e) {
!                 throw new NameResolutionException(name,e.getLocalizedMessage());
!             }
!             if (obj == null)
!                 throw new NameResolutionException(name);
!             NSCACHE.cache(obj);
!             return obj; //This may not be null
          }
+ */
          try {
!             return VerifyingReader.getInstance().read(new URL(name).openStream());
!         } catch (IOException e) {
!             throw new InvalidNamedObjectException(name,e);
          }
      }