refactored org to uk

[vamsas.git] / src / org / vamsas / test / simpleclient / VamsasArchive.java

diff --git a/src/org/vamsas/test/simpleclient/VamsasArchive.java b/src/org/vamsas/test/simpleclient/VamsasArchive.java
index 09ddf34..651979c 100644 (file)
--- a/src/org/vamsas/test/simpleclient/VamsasArchive.java
+++ b/src/org/vamsas/test/simpleclient/VamsasArchive.java
@@ -5,23 +5,24 @@ import java.io.ObjectOutputStream;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.vamsas.client.simpleclient.Lock;
-import org.vamsas.client.simpleclient.SessionFile;
-import org.vamsas.client.simpleclient.SimpleDocument;
-import org.vamsas.client.simpleclient.VamsasArchiveReader;
-import org.vamsas.client.simpleclient.VamsasFile;
 import org.vamsas.objects.core.ApplicationData;
 import org.vamsas.objects.core.User;
 import org.vamsas.objects.core.VAMSAS;
 import org.vamsas.objects.core.VamsasDocument;
 import org.vamsas.test.objects.Core;
 
+import uk.ac.vamsas.client.simpleclient.Lock;
+import uk.ac.vamsas.client.simpleclient.SessionFile;
+import uk.ac.vamsas.client.simpleclient.SimpleDocument;
+import uk.ac.vamsas.client.simpleclient.VamsasArchiveReader;
+import uk.ac.vamsas.client.simpleclient.VamsasFile;
+
 public class VamsasArchive {
   /**
    * test the org.vamsas.simpleclient.vamsasArchive class
    */
   static Log log = LogFactory.getLog(VamsasArchive.class);
-  public static ApplicationData makeDemoAppdata(org.vamsas.client.simpleclient.VamsasArchive va, String apname, String userName, String userOrg) {
+  public static ApplicationData makeDemoAppdata(uk.ac.vamsas.client.simpleclient.VamsasArchive va, String apname, String userName, String userOrg) {
     if (va==null)
       return null;
     VamsasArchiveReader vread=null;
@@ -98,7 +99,7 @@ public class VamsasArchive {
       else
         av = new File("test/vamsas.zip");
       log.info("Opening archive "+av);
-      org.vamsas.client.simpleclient.VamsasArchive varchive = new org.vamsas.client.simpleclient.VamsasArchive(av, true);
+      uk.ac.vamsas.client.simpleclient.VamsasArchive varchive = new uk.ac.vamsas.client.simpleclient.VamsasArchive(av, true);
       
       VAMSAS[] roots = (VAMSAS[]) varchive.getOriginalRoots();
       
@@ -131,12 +132,12 @@ public class VamsasArchive {
       }
         
       log.info("Now writing new Archive into "+newf.getAbsolutePath());
-      org.vamsas.client.simpleclient.VamsasArchive va=null;
+      uk.ac.vamsas.client.simpleclient.VamsasArchive va=null;
       { // hold lock over deletion and write of new archive.
         //Lock wlock = sfile.getLock();
         //newf.delete(); // clear out old file.
         sfile.getLock();
-        va = new org.vamsas.client.simpleclient.VamsasArchive(newf, true, true, sfile);
+        va = new uk.ac.vamsas.client.simpleclient.VamsasArchive(newf, true, true, sfile);
         // open another and...
         ApplicationData appdata = makeDemoAppdata(va, 
             "org.vamsas.test.simpleclient.VamsasArchive", "arnold Bugger esq", "disOrganised");
@@ -170,7 +171,7 @@ public class VamsasArchive {
         log.info("Didn't cancel.");
       long t=System.currentTimeMillis()+200; while (t>System.currentTimeMillis());
       log.info("Now testing archive update.");
-      va = new org.vamsas.client.simpleclient.VamsasArchive(newf, false, true, sfile);
+      va = new uk.ac.vamsas.client.simpleclient.VamsasArchive(newf, false, true, sfile);
       doc = va.getVamsasDocument();
       doc.addVAMSAS(Core.getDemoVamsas());
       doc.addApplicationData(makeDemoAppdata(va,