[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/resolver NSResolver.java,1.12,1.13

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

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

Modified Files:
	NSResolver.java 
Log Message:
Added support for the http scheme into ID. See http://neuclear.org/archives/000195.html

Index: NSResolver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver/NSResolver.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NSResolver.java	4 Dec 2003 21:50:36 -0000	1.12
--- NSResolver.java	8 Dec 2003 19:32:31 -0000	1.13
***************
*** 2,5 ****
--- 2,6 ----
  
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.Utility;
  import org.neuclear.id.Identity;
  import org.neuclear.id.InvalidNamedObject;
***************
*** 9,12 ****
--- 10,16 ----
  import org.neuclear.source.Source;
  
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+ 
  /**
   * Secure Identity resolver. To get an Identity object simply do:
***************
*** 53,64 ****
  
          final String parentname = NSTools.getParentNSURI(name);
-         String store = NSROOTSTORE;
  
          if (parentname == null || name.equals("neu://"))
              return Identity.NEUROOT;
  
!         final Identity parent = resolveIdentity(parentname);
!         store = parent.getRepository();
!         // fetches Identity from parent Identity's Default Store
          obj = (Identity) Source.getInstance().fetch(store, name);
          if (obj == null)
--- 57,69 ----
  
          final String parentname = NSTools.getParentNSURI(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();
!         }
          obj = (Identity) Source.getInstance().fetch(store, name);
          if (obj == null)
***************
*** 67,70 ****
--- 72,76 ----
          return obj; //This may not be null
      }
+ 
  
  }