refactored org to uk

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

diff --git a/src/org/vamsas/test/simpleclient/ArchiveClient.java b/src/org/vamsas/test/simpleclient/ArchiveClient.java
index c681fe0..fdc6898 100644 (file)
--- a/src/org/vamsas/test/simpleclient/ArchiveClient.java
+++ b/src/org/vamsas/test/simpleclient/ArchiveClient.java
@@ -13,21 +13,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
-import org.vamsas.client.ClientHandle;
-import org.vamsas.client.IVorbaIdFactory;
-import org.vamsas.client.SessionHandle;
-import org.vamsas.client.UserHandle;
-import org.vamsas.client.Vobject;
-import org.vamsas.client.VorbaId;
-import org.vamsas.client.simpleclient.AppDataOutputStream;
-import org.vamsas.client.simpleclient.FileWatcher;
-import org.vamsas.client.simpleclient.IdFactory;
-import org.vamsas.client.simpleclient.SessionFile;
-import org.vamsas.client.simpleclient.SimpleDocBinding;
-import org.vamsas.client.simpleclient.SimpleDocument;
-import org.vamsas.client.simpleclient.VamsasArchive;
-import org.vamsas.client.simpleclient.VamsasArchiveReader;
-import org.vamsas.client.simpleclient.VamsasFile;
 import org.vamsas.objects.core.AppData;
 import org.vamsas.objects.core.ApplicationData;
 import org.vamsas.objects.core.User;
@@ -39,6 +24,22 @@ import org.vamsas.objects.utils.SeqSet;
 import org.vamsas.objects.utils.document.VersionEntries;
 import org.vamsas.test.objects.Core;
 
+import uk.ac.vamsas.client.ClientHandle;
+import uk.ac.vamsas.client.IVorbaIdFactory;
+import uk.ac.vamsas.client.SessionHandle;
+import uk.ac.vamsas.client.UserHandle;
+import uk.ac.vamsas.client.Vobject;
+import uk.ac.vamsas.client.VorbaId;
+import uk.ac.vamsas.client.simpleclient.AppDataOutputStream;
+import uk.ac.vamsas.client.simpleclient.FileWatcher;
+import uk.ac.vamsas.client.simpleclient.IdFactory;
+import uk.ac.vamsas.client.simpleclient.SessionFile;
+import uk.ac.vamsas.client.simpleclient.SimpleDocBinding;
+import uk.ac.vamsas.client.simpleclient.SimpleDocument;
+import uk.ac.vamsas.client.simpleclient.VamsasArchive;
+import uk.ac.vamsas.client.simpleclient.VamsasArchiveReader;
+import uk.ac.vamsas.client.simpleclient.VamsasFile;
+
 /**
  * @author jimp
  *  test the VamsasFile routines for watching, reading and updating a vamsas document jar file.
@@ -101,7 +102,7 @@ public class ArchiveClient extends IdFactory {
     watchForChange=true;
     long endtime=System.currentTimeMillis()+time;
     try {
-      org.vamsas.client.simpleclient.Lock doclock;
+      uk.ac.vamsas.client.simpleclient.Lock doclock;
       do {
         doclock=watcher.getChangedState();
         if (doclock==null)
@@ -177,7 +178,7 @@ public class ArchiveClient extends IdFactory {
   public ClientDoc getUpdateable() {
     return getUpdateable(null);
   }
-  public ClientDoc getUpdateable(org.vamsas.client.simpleclient.Lock lock) {
+  public ClientDoc getUpdateable(uk.ac.vamsas.client.simpleclient.Lock lock) {
     getVorbaIdHash().clear();
     valid();
     try {
@@ -283,7 +284,7 @@ public class ArchiveClient extends IdFactory {
     }
     System.out.println("Finished at "+new Date());
   }
-  public org.vamsas.client.Vobject getObject(VorbaId id) {
+  public uk.ac.vamsas.client.Vobject getObject(VorbaId id) {
     Hashtable idhash = this.getVorbaIdHash();
     if (idhash!=null && idhash.containsKey(id))
       return (Vobject) idhash.get(id);