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

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

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

Modified Files:
	NSResolver.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: NSResolver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver/NSResolver.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NSResolver.java	8 Dec 2003 19:32:31 -0000	1.13
--- NSResolver.java	10 Dec 2003 23:58:51 -0000	1.14
***************
*** 2,6 ****
  
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.Utility;
  import org.neuclear.id.Identity;
  import org.neuclear.id.InvalidNamedObject;
--- 2,5 ----
***************
*** 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:
--- 9,12 ----
***************
*** 56,70 ****
              return obj;
  
!         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)
              throw new NeuClearException("Identity: " + name + " was not resolved");
--- 52,66 ----
              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();
          }
!         obj = Source.getInstance().fetch(store, name);
          if (obj == null)
              throw new NeuClearException("Identity: " + name + " was not resolved");