refactoring org to uk

git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@291 be28352e-c001-0410-b1a7-c7978e42abec

diff --git a/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java b/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
index b38b64a..bc7a7e9 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
+++ b/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
@@ -8,7 +8,6 @@ import java.util.Vector;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.vamsas.test.objects.Core;
 
 import uk.ac.vamsas.client.ClientHandle;
 import uk.ac.vamsas.client.IClientAppdata;
@@ -21,6 +20,7 @@ import uk.ac.vamsas.objects.core.User;
 import uk.ac.vamsas.objects.core.VAMSAS;
 import uk.ac.vamsas.objects.core.VamsasDocument;
 import uk.ac.vamsas.objects.utils.AppDataReference;
+import uk.ac.vamsas.test.objects.Core;
 
 /**
  * Maintains a collection of vamsas objects, appdatas and states, and provides api for a SimpleClient's client.

diff --git a/src/uk/ac/vamsas/test/simpleclient/ArchiveClient.java b/src/uk/ac/vamsas/test/simpleclient/ArchiveClient.java
index 4e0e68b..f484a7f 100644 (file)
--- a/src/uk/ac/vamsas/test/simpleclient/ArchiveClient.java
+++ b/src/uk/ac/vamsas/test/simpleclient/ArchiveClient.java
@@ -13,7 +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.test.objects.Core;
 
 import uk.ac.vamsas.client.ClientHandle;
 import uk.ac.vamsas.client.IVorbaIdFactory;
@@ -39,6 +38,7 @@ import uk.ac.vamsas.objects.utils.DocumentStuff;
 import uk.ac.vamsas.objects.utils.ProvenanceStuff;
 import uk.ac.vamsas.objects.utils.SeqSet;
 import uk.ac.vamsas.objects.utils.document.VersionEntries;
+import uk.ac.vamsas.test.objects.Core;
 
 /**
  * @author jimp

diff --git a/src/uk/ac/vamsas/test/simpleclient/VamsasArchive.java b/src/uk/ac/vamsas/test/simpleclient/VamsasArchive.java
index d682f10..7154361 100644 (file)
--- a/src/uk/ac/vamsas/test/simpleclient/VamsasArchive.java
+++ b/src/uk/ac/vamsas/test/simpleclient/VamsasArchive.java
@@ -5,7 +5,6 @@ import java.io.ObjectOutputStream;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.vamsas.test.objects.Core;
 
 import uk.ac.vamsas.client.simpleclient.Lock;
 import uk.ac.vamsas.client.simpleclient.SessionFile;
@@ -16,6 +15,7 @@ import uk.ac.vamsas.objects.core.ApplicationData;
 import uk.ac.vamsas.objects.core.User;
 import uk.ac.vamsas.objects.core.VAMSAS;
 import uk.ac.vamsas.objects.core.VamsasDocument;
+import uk.ac.vamsas.test.objects.Core;
 
 public class VamsasArchive {
   /**