[dcm4che-commits] CVS: dcm4jboss-ejb/test/java/org/dcm4chex/archive/ejb/session StorageBeanTest.java,1.3,1.4

[gunter z. <gun...@us...>]

Update of /cvsroot/dcm4che/dcm4jboss-ejb/test/java/org/dcm4chex/archive/ejb/session
In directory sc8-pr-cvs1:/tmp/cvs-serv5565/test/java/org/dcm4chex/archive/ejb/session

Modified Files:
	StorageBeanTest.java 
Log Message:
add NodeBean

Index: StorageBeanTest.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/test/java/org/dcm4chex/archive/ejb/session/StorageBeanTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StorageBeanTest.java	16 Sep 2003 21:53:57 -0000	1.3
--- StorageBeanTest.java	24 Sep 2003 21:50:21 -0000	1.4
***************
*** 34,41 ****
  import java.io.IOException;
  import java.io.InputStream;
! import java.net.InetAddress;
  import java.security.DigestInputStream;
  import java.security.MessageDigest;
  
  import javax.naming.Context;
  import javax.naming.InitialContext;
--- 34,42 ----
  import java.io.IOException;
  import java.io.InputStream;
! import java.net.URI;
  import java.security.DigestInputStream;
  import java.security.MessageDigest;
  
+ import javax.ejb.ObjectNotFoundException;
  import javax.naming.Context;
  import javax.naming.InitialContext;
***************
*** 47,50 ****
--- 48,52 ----
  import org.dcm4che.data.FileFormat;
  import org.dcm4che.dict.Tags;
+ import org.dcm4che.util.HostNameUtils;
  import org.dcm4chex.archive.ejb.interfaces.Storage;
  import org.dcm4chex.archive.ejb.interfaces.StorageHome;
***************
*** 58,64 ****
  
      public static final String DIR = "storage";
  
      private Storage storage;
-     private String host;
  
      public static void main(String[] args)
--- 60,66 ----
  
      public static final String DIR = "storage";
+     public static final String AET = "StorageBeanTest";
  
      private Storage storage;
  
      public static void main(String[] args)
***************
*** 76,81 ****
          ctx.close();
          storage = home.create();
!         String tmp = InetAddress.getLocalHost().getHostName();
!         host = tmp.substring(tmp.lastIndexOf(".")+1);
      }
  
--- 78,89 ----
          ctx.close();
          storage = home.create();
!         try {
!             storage.getNodeURI(AET);
!         } catch (ObjectNotFoundException e) {
!             String host = HostNameUtils.getLocalHostName();
!             URI tmp = new File(AET).toURI();
!             String uri = "file://" + host + tmp.getPath();
!             storage.createNode(uri, AET, AET);
!         }
      }
  
***************
*** 115,119 ****
          MessageDigest md = MessageDigest.getInstance("MD5");
          Dataset ds = loadDataset(file, md);
!         storage.store(ds, host, "/", path.substring(1), file.length(), md.digest());
      }
  
--- 123,127 ----
          MessageDigest md = MessageDigest.getInstance("MD5");
          Dataset ds = loadDataset(file, md);
!         storage.store(ds, AET, path.substring(1), file.length(), md.digest());
      }