move replica2 to top level

28 files changed, 28 insertions, 28 deletions

diff --git a/src/main/java/derms/replica/replica2/AlreadyBorrowedException.java b/src/main/java/derms/replica2/AlreadyBorrowedException.java
index f8c01c6..e1146e7 100644
--- a/src/main/java/derms/replica/replica2/AlreadyBorrowedException.java
+++ b/src/main/java/derms/replica2/AlreadyBorrowedException.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 class AlreadyBorrowedException extends Exception {
   AlreadyBorrowedException(String message) {
diff --git a/src/main/java/derms/replica/replica2/AnnounceListener.java b/src/main/java/derms/replica2/AnnounceListener.java
index ee43662..dd21b8d 100644
--- a/src/main/java/derms/replica/replica2/AnnounceListener.java
+++ b/src/main/java/derms/replica2/AnnounceListener.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/src/main/java/derms/replica/replica2/Announcer.java b/src/main/java/derms/replica2/Announcer.java
index 436d06d..508349e 100644
--- a/src/main/java/derms/replica/replica2/Announcer.java
+++ b/src/main/java/derms/replica2/Announcer.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.net.*;
diff --git a/src/main/java/derms/replica/replica2/City.java b/src/main/java/derms/replica2/City.java
index 63aa2cd..74535ae 100644
--- a/src/main/java/derms/replica/replica2/City.java
+++ b/src/main/java/derms/replica2/City.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/derms/replica/replica2/CoordinatorID.java b/src/main/java/derms/replica2/CoordinatorID.java
index 79b292f..523ebcf 100644
--- a/src/main/java/derms/replica/replica2/CoordinatorID.java
+++ b/src/main/java/derms/replica2/CoordinatorID.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/derms/replica/replica2/CoordinatorServer.java b/src/main/java/derms/replica2/CoordinatorServer.java
index dbfcacb..0683638 100644
--- a/src/main/java/derms/replica/replica2/CoordinatorServer.java
+++ b/src/main/java/derms/replica2/CoordinatorServer.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/src/main/java/derms/replica/replica2/DermsLogger.java b/src/main/java/derms/replica2/DermsLogger.java
index 82642e4..3e031f7 100644
--- a/src/main/java/derms/replica/replica2/DermsLogger.java
+++ b/src/main/java/derms/replica2/DermsLogger.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;
diff --git a/src/main/java/derms/replica/replica2/FindResource.java b/src/main/java/derms/replica2/FindResource.java
index ca47f4c..8ba642f 100644
--- a/src/main/java/derms/replica/replica2/FindResource.java
+++ b/src/main/java/derms/replica2/FindResource.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/main/java/derms/replica/replica2/Hosts.java b/src/main/java/derms/replica2/Hosts.java
index 6217ca2..1392b15 100644
--- a/src/main/java/derms/replica/replica2/Hosts.java
+++ b/src/main/java/derms/replica2/Hosts.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.net.UnknownHostException;
 import java.util.HashMap;
diff --git a/src/main/java/derms/replica/replica2/ID.java b/src/main/java/derms/replica2/ID.java
index b0caebd..a61888b 100644
--- a/src/main/java/derms/replica/replica2/ID.java
+++ b/src/main/java/derms/replica2/ID.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 class ID {
 	static final int nDigits = 4;
diff --git a/src/main/java/derms/replica/replica2/InvalidDurationException.java b/src/main/java/derms/replica2/InvalidDurationException.java
index 4db2bbb..2596cb9 100644
--- a/src/main/java/derms/replica/replica2/InvalidDurationException.java
+++ b/src/main/java/derms/replica2/InvalidDurationException.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 class InvalidDurationException extends Exception {
   InvalidDurationException (String message) {
diff --git a/src/main/java/derms/replica/replica2/NoSuchResourceException.java b/src/main/java/derms/replica2/NoSuchResourceException.java
index 3548d32..c1eb8c8 100644
--- a/src/main/java/derms/replica/replica2/NoSuchResourceException.java
+++ b/src/main/java/derms/replica2/NoSuchResourceException.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 class NoSuchResourceException extends Exception {
   NoSuchResourceException(String message) {
diff --git a/src/main/java/derms/replica/replica2/NotBorrowedException.java b/src/main/java/derms/replica2/NotBorrowedException.java
index e077e4c..aff0661 100644
--- a/src/main/java/derms/replica/replica2/NotBorrowedException.java
+++ b/src/main/java/derms/replica2/NotBorrowedException.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 class NotBorrowedException extends Exception {
   NotBorrowedException (String message) {
diff --git a/src/main/java/derms/replica/replica2/ObjectPacket.java b/src/main/java/derms/replica2/ObjectPacket.java
index bd711db..27852b0 100644
--- a/src/main/java/derms/replica/replica2/ObjectPacket.java
+++ b/src/main/java/derms/replica2/ObjectPacket.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.*;
 import java.net.DatagramPacket;
diff --git a/src/main/java/derms/replica/replica2/Replica2.java b/src/main/java/derms/replica2/Replica2.java
index 2c58d92..25609cc 100644
--- a/src/main/java/derms/replica/replica2/Replica2.java
+++ b/src/main/java/derms/replica2/Replica2.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import derms.Replica;
 import derms.Request;
diff --git a/src/main/java/derms/replica/replica2/RequestResource.java b/src/main/java/derms/replica2/RequestResource.java
index 7388aa8..6a905db 100644
--- a/src/main/java/derms/replica/replica2/RequestResource.java
+++ b/src/main/java/derms/replica2/RequestResource.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/main/java/derms/replica/replica2/Resource.java b/src/main/java/derms/replica2/Resource.java
index fd1b20d..31d40bc 100644
--- a/src/main/java/derms/replica/replica2/Resource.java
+++ b/src/main/java/derms/replica2/Resource.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/derms/replica/replica2/ResourceAvailability.java b/src/main/java/derms/replica2/ResourceAvailability.java
index 8bfa7bb..ce4c698 100644
--- a/src/main/java/derms/replica/replica2/ResourceAvailability.java
+++ b/src/main/java/derms/replica2/ResourceAvailability.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/src/main/java/derms/replica/replica2/ResourceID.java b/src/main/java/derms/replica2/ResourceID.java
index d4cc4cf..24da3d3 100644
--- a/src/main/java/derms/replica/replica2/ResourceID.java
+++ b/src/main/java/derms/replica2/ResourceID.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/derms/replica/replica2/ResourceTransfer.java b/src/main/java/derms/replica2/ResourceTransfer.java
index bb3a907..0ed17c5 100644
--- a/src/main/java/derms/replica/replica2/ResourceTransfer.java
+++ b/src/main/java/derms/replica2/ResourceTransfer.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/main/java/derms/replica/replica2/ResourceType.java b/src/main/java/derms/replica2/ResourceType.java
index 86e35ba..92aba32 100644
--- a/src/main/java/derms/replica/replica2/ResourceType.java
+++ b/src/main/java/derms/replica2/ResourceType.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/derms/replica/replica2/Resources.java b/src/main/java/derms/replica2/Resources.java
index 03bf33f..634e315 100644
--- a/src/main/java/derms/replica/replica2/Resources.java
+++ b/src/main/java/derms/replica2/Resources.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/derms/replica/replica2/ResponderID.java b/src/main/java/derms/replica2/ResponderID.java
index 63bbcb8..480b471 100644
--- a/src/main/java/derms/replica/replica2/ResponderID.java
+++ b/src/main/java/derms/replica2/ResponderID.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 class ResponderID {
 	City city;
diff --git a/src/main/java/derms/replica/replica2/ResponderServer.java b/src/main/java/derms/replica2/ResponderServer.java
index bcd0a92..02ff6b6 100644
--- a/src/main/java/derms/replica/replica2/ResponderServer.java
+++ b/src/main/java/derms/replica2/ResponderServer.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/src/main/java/derms/replica/replica2/ReturnResource.java b/src/main/java/derms/replica2/ReturnResource.java
index 9c8935d..6c42b8a 100644
--- a/src/main/java/derms/replica/replica2/ReturnResource.java
+++ b/src/main/java/derms/replica2/ReturnResource.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/main/java/derms/replica/replica2/ServerCommunicationError.java b/src/main/java/derms/replica2/ServerCommunicationError.java
index bef5d46..2bf4d33 100644
--- a/src/main/java/derms/replica/replica2/ServerCommunicationError.java
+++ b/src/main/java/derms/replica2/ServerCommunicationError.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 class ServerCommunicationError extends Exception {
   ServerCommunicationError(String message) {
diff --git a/src/main/java/derms/replica/replica2/Servers.java b/src/main/java/derms/replica2/Servers.java
index 4728e24..498b7ce 100644
--- a/src/main/java/derms/replica/replica2/Servers.java
+++ b/src/main/java/derms/replica2/Servers.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.net.InetAddress;
 import java.util.Collection;
diff --git a/src/main/java/derms/replica/replica2/SwapResource.java b/src/main/java/derms/replica2/SwapResource.java
index bcdd222..cc65f29 100644
--- a/src/main/java/derms/replica/replica2/SwapResource.java
+++ b/src/main/java/derms/replica2/SwapResource.java
@@ -1,4 +1,4 @@
-package derms.replica.replica2;
+package derms.replica2;
 
 import java.io.IOException;
 import java.io.Serializable;