[Neuclear-develop] neuclear-id/src/java/org/neuclear/store EncryptedFileStore.java,1.2,1.3 FileStore.java,1.2,1.3 Store.java,1.2,1.3 StoreFactory.java,1.1.1.1,1.2

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

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

Modified Files:
	EncryptedFileStore.java FileStore.java Store.java 
	StoreFactory.java 
Log Message:
Changed NameSpace to Identity.
To cause less confusion in the future.


Index: EncryptedFileStore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/EncryptedFileStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EncryptedFileStore.java	22 Sep 2003 19:24:02 -0000	1.2
--- EncryptedFileStore.java	23 Sep 2003 19:16:29 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.3  2003/09/23 19:16:29  pelle
+  * Changed NameSpace to Identity.
+  * To cause less confusion in the future.
+  *
   * Revision 1.2  2003/09/22 19:24:02  pelle
   * More fixes throughout to problems caused by renaming.
***************
*** 64,68 ****
   * Also first public release.
   * This implemnts simple named objects.
!  * - NameSpace Objects
   * - NSAuth Objects
   *
--- 68,72 ----
   * Also first public release.
   * This implemnts simple named objects.
!  * - Identity Objects
   * - NSAuth Objects
   *

Index: FileStore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/FileStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileStore.java	22 Sep 2003 19:24:02 -0000	1.2
--- FileStore.java	23 Sep 2003 19:16:29 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.3  2003/09/23 19:16:29  pelle
+  * Changed NameSpace to Identity.
+  * To cause less confusion in the future.
+  *
   * Revision 1.2  2003/09/22 19:24:02  pelle
   * More fixes throughout to problems caused by renaming.
***************
*** 49,53 ****
   * Also first public release.
   * This implemnts simple named objects.
!  * - NameSpace Objects
   * - NSAuth Objects
   *
--- 53,57 ----
   * Also first public release.
   * This implemnts simple named objects.
!  * - Identity Objects
   * - NSAuth Objects
   *
***************
*** 135,139 ****
      }
  
! //    public void store(Document doc) throws InvalidNameSpaceException,IOException {
  //        store(new NSDLObject(doc));
  //    }
--- 139,143 ----
      }
  
! //    public void store(Document doc) throws InvalidIdentityException,IOException {
  //        store(new NSDLObject(doc));
  //    }
***************
*** 173,177 ****
      protected static String getFileName(NamedObject obj) throws NeudistException {
          return getFileName(obj.getName());
! //        if (! (obj instanceof NameSpace))
  //            return obj.getName();
  //        else if (obj.getName().equals("/")||obj.getName().equals(""))
--- 177,181 ----
      protected static String getFileName(NamedObject obj) throws NeudistException {
          return getFileName(obj.getName());
! //        if (! (obj instanceof Identity))
  //            return obj.getName();
  //        else if (obj.getName().equals("/")||obj.getName().equals(""))

Index: Store.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/Store.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Store.java	22 Sep 2003 19:24:02 -0000	1.2
--- Store.java	23 Sep 2003 19:16:29 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.3  2003/09/23 19:16:29  pelle
+  * Changed NameSpace to Identity.
+  * To cause less confusion in the future.
+  *
   * Revision 1.2  2003/09/22 19:24:02  pelle
   * More fixes throughout to problems caused by renaming.
***************
*** 74,78 ****
   * Also first public release.
   * This implemnts simple named objects.
!  * - NameSpace Objects
   * - NSAuth Objects
   *
--- 78,82 ----
   * Also first public release.
   * This implemnts simple named objects.
!  * - Identity Objects
   * - NSAuth Objects
   *
***************
*** 114,118 ****
  package org.neuclear.store;
  
! import org.neuclear.id.InvalidNameSpaceException;
  import org.neuclear.id.NamedObject;
  import org.neuclear.id.verifier.NSVerifier;
--- 118,122 ----
  package org.neuclear.store;
  
! import org.neuclear.id.InvalidIdentityException;
  import org.neuclear.id.NamedObject;
  import org.neuclear.id.verifier.NSVerifier;
***************
*** 127,141 ****
  
      /**
!      *  This handles the NameSpace checking on the object.
       */
!     public final void receive(NamedObject obj) throws InvalidNameSpaceException, NeudistException {
          try {
              // Dont allow overwrites
              //TODO: Implement versioning
  //            if (fetch(obj.getName())!=null)
! //                throw new InvalidNameSpaceException("The name: "+obj.getName()+" already exists");
  
              if (!NSVerifier.isNameValid(obj))
!                 throw new InvalidNameSpaceException("The name: " + obj.getName() + " is not allowed");
              rawStore(obj);
              if (next != null)
--- 131,145 ----
  
      /**
!      *  This handles the Identity checking on the object.
       */
!     public final void receive(NamedObject obj) throws InvalidIdentityException, NeudistException {
          try {
              // Dont allow overwrites
              //TODO: Implement versioning
  //            if (fetch(obj.getName())!=null)
! //                throw new InvalidIdentityException("The name: "+obj.getName()+" already exists");
  
              if (!NSVerifier.isNameValid(obj))
!                 throw new InvalidIdentityException("The name: " + obj.getName() + " is not allowed");
              rawStore(obj);
              if (next != null)
***************
*** 145,150 ****
              e.printStackTrace();
          }
! //            if (e instanceof InvalidNameSpaceException)
! //                throw (InvalidNameSpaceException)e;
  //            else if(e instanceof NeudistException)
  //                throw (NeudistException)e;
--- 149,154 ----
              e.printStackTrace();
          }
! //            if (e instanceof InvalidIdentityException)
! //                throw (InvalidIdentityException)e;
  //            else if(e instanceof NeudistException)
  //                throw (NeudistException)e;

Index: StoreFactory.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/StoreFactory.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** StoreFactory.java	19 Sep 2003 14:41:22 -0000	1.1.1.1
--- StoreFactory.java	23 Sep 2003 19:16:29 -0000	1.2
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.2  2003/09/23 19:16:29  pelle
+  * Changed NameSpace to Identity.
+  * To cause less confusion in the future.
+  *
   * Revision 1.1.1.1  2003/09/19 14:41:22  pelle
   * First import into the neuclear project. This was originally under the SF neudist
***************
*** 24,28 ****
   * Also first public release.
   * This implemnts simple named objects.
!  * - NameSpace Objects
   * - NSAuth Objects
   *
--- 28,32 ----
   * Also first public release.
   * This implemnts simple named objects.
!  * - Identity Objects
   * - NSAuth Objects
   *