setup server names

Author: Neil DEVAS

code/.gitignore

@@ -0,0 +1,2 @@
+*.class
+*.jar

code/Client/Client/RMIClient.java

@@ -17,10 +17,10 @@ public class RMIClient extends Client
 	private static String s_serverName = "Server";
 
 	//TODO: REPLACE 'ALEX' WITH YOUR GROUP NUMBER TO COMPILE
-	// private static String s_rmiPrefix = "groupAlex_";
+	private static String s_rmiPrefix = "group25_";
 
 	public static void main(String args[])
-	{	
+	{
 		if (args.length > 0)
 		{
 			s_serverHost = args[0];
@@ -46,8 +46,8 @@ public static void main(String args[])
 			RMIClient client = new RMIClient();
 			client.connectServer();
 			client.start();
-		} 
-		catch (Exception e) {    
+		}
+		catch (Exception e) {
 			System.err.println((char)27 + "[31;1mClient exception: " + (char)27 + "[0mUncaught exception");
 			e.printStackTrace();
 			System.exit(1);
@@ -91,4 +91,3 @@ public void connectServer(String server, int port, String name)
 		}
 	}
 }
-

code/Client/java.policy

@@ -0,0 +1,3 @@
+grant codebase "file:/home/2016/ndevas/comp512/Project1/DistributedSystemsProject/code/Client/" {
+permission java.security.AllPermission;
+};

code/Server/Server/RMI/RMIResourceManager.java

@@ -16,19 +16,25 @@
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;
 
-public class RMIResourceManager extends ResourceManager 
+// RMIResourceManager is a whole class containing a registry and references to objects
+// These objects can be created through "creators", i.e. addFlight, addCars, addRooms
+// After creation or updates, through creators/setters, the object is written to RNHashMap
+// RNHashMap takes a key and stores the object as the value
+// Read data simply pulls object values from this RNHashMap
+
+public class RMIResourceManager extends ResourceManager
 {
 	private static String s_serverName = "Server";
 	//TODO: REPLACE 'ALEX' WITH YOUR GROUP NUMBER TO COMPILE
-	// private static String s_rmiPrefix = "groupAlex_";
+	private static String s_rmiPrefix = "group25_";
 
 	public static void main(String args[])
 	{
 		if (args.length > 0)
 		{
 			s_serverName = args[0];
 		}
-			
+
 		// Create the RMI server entry
 		try {
 			// Create a new Server object
@@ -58,7 +64,7 @@ public void run() {
 						e.printStackTrace();
 					}
 				}
-			});                                       
+			});
 			System.out.println("'" + s_serverName + "' resource manager server ready and bound to '" + s_rmiPrefix + s_serverName + "'");
 		}
 		catch (Exception e) {

code/Server/java.policy

@@ -0,0 +1,3 @@
+grant codebase "file:/home/2016/ndevas/comp512/Project1/DistributedSystemsProject/code/Server/" {
+permission java.security.AllPermission;
+};