9 files changed, 126 insertions, 8 deletions
diff --git a/src/main/java/models/Ability.java b/src/main/java/models/Ability.java
index e6a00d1..1a174cf 100644
--- a/src/main/java/models/Ability.java
+++ b/src/main/java/models/Ability.java
@@ -1,8 +1,10 @@
 package models;
 
-public class Ability {
+import java.io.Serializable;
+
+public class Ability implements Serializable {
 	public long id;
-	public int monsterId;
+	public long monsterId;
 	public String Name;
 	public String description;
 	public AbilityType type;
@@ -20,10 +22,10 @@ public class Ability {
 	public void setId(long id) {
 		this.id = id;
 	}
-	public int getMonsterId() {
+	public long getMonsterId() {
 		return monsterId;
 	}
-	public void setMonsterId(int monsterId) {
+	public void setMonsterId(long monsterId) {
 		this.monsterId = monsterId;
 	}
 	public String getName() {
diff --git a/src/main/java/models/AbilityType.java b/src/main/java/models/AbilityType.java
index 5b4e1eb..43dd3dc 100644
--- a/src/main/java/models/AbilityType.java
+++ b/src/main/java/models/AbilityType.java
@@ -1,6 +1,8 @@
 package models;
 
-public enum AbilityType {
+import java.io.Serializable;
+
+public enum AbilityType implements Serializable{
 	ATTACK,
 	SPECIAL,
 	HEAL,
diff --git a/src/main/java/models/CONSTS.java b/src/main/java/models/CONSTS.java
new file mode 100644
index 0000000..3e66a69
--- /dev/null
+++ b/src/main/java/models/CONSTS.java
@@ -0,0 +1,6 @@
+package models;
+
+public class CONSTS {
+	public static final String rmiUrl="rmi://localhost:5555/rmi";
+
+}
diff --git a/src/main/java/models/Monster.java b/src/main/java/models/Monster.java
index dc16205..a4b40e8 100644
--- a/src/main/java/models/Monster.java
+++ b/src/main/java/models/Monster.java
@@ -1,6 +1,8 @@
 package models;
 
-public class Monster {
+import java.io.Serializable;
+
+public class Monster implements Serializable{
 	public long id;
 	public String name;
 	public String description;
diff --git a/src/main/java/models/MonsterViewModel.java b/src/main/java/models/MonsterViewModel.java
index fed9152..b10cd34 100644
--- a/src/main/java/models/MonsterViewModel.java
+++ b/src/main/java/models/MonsterViewModel.java
@@ -1,8 +1,9 @@
 package models;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 
-public class MonsterViewModel {
+public class MonsterViewModel implements Serializable{
 	public long id;
 	public String name;
 	public String description;
diff --git a/src/main/java/models/User.java b/src/main/java/models/User.java
index 08e4ab0..3c341a2 100644
--- a/src/main/java/models/User.java
+++ b/src/main/java/models/User.java
@@ -1,11 +1,22 @@
 package models;
 
-public class User {
+import java.io.Serializable;
+
+public class User implements Serializable{
 	public long id;
 	public String username;
 	public String password;
 	public boolean admin;
+	public long monsterId;
 	
+	public long getmonsterId() {
+		return monsterId;
+	}
+
+	public void setmonsterId(long monsterId) {
+		this.monsterId = monsterId;
+	}
+
 	public long getId() {
 		return id;
 	}
diff --git a/src/main/java/pokemon/IService.java b/src/main/java/pokemon/IService.java
new file mode 100644
index 0000000..c99271c
--- /dev/null
+++ b/src/main/java/pokemon/IService.java
@@ -0,0 +1,18 @@
+package pokemon;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+
+import models.Ability;
+import models.Monster;
+import models.User;
+
+public interface IService extends Remote {
+	public boolean addUser(User user)throws RemoteException;
+	public User login(User user)throws RemoteException;
+	public long addMonster(Monster monster)throws RemoteException;
+	public boolean addAbility(Ability ability)throws RemoteException;
+	public ArrayList<Monster> getMonsters()throws RemoteException;
+
+}
diff --git a/src/main/java/pokemon/Server.java b/src/main/java/pokemon/Server.java
new file mode 100644
index 0000000..695fafb
--- /dev/null
+++ b/src/main/java/pokemon/Server.java
@@ -0,0 +1,27 @@
+package pokemon;
+
+import java.net.MalformedURLException;
+import java.rmi.Naming;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+
+import models.CONSTS;
+
+public class Server {
+
+	public static void main(String[] args) {
+		try {
+			IService s=new Service();
+			System.out.println("created registry at 5555");
+			LocateRegistry.createRegistry(5555);
+			Naming.rebind(CONSTS.rmiUrl, s);
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+
+	}
+
+}
diff --git a/src/main/java/pokemon/Service.java b/src/main/java/pokemon/Service.java
new file mode 100644
index 0000000..0931a0f
--- /dev/null
+++ b/src/main/java/pokemon/Service.java
@@ -0,0 +1,49 @@
+package pokemon;
+
+import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
+import java.util.ArrayList;
+
+import database.Database;
+import models.Ability;
+import models.Monster;
+import models.User;
+
+public class Service extends UnicastRemoteObject implements IService  {
+
+	protected Service() throws RemoteException {
+		super();
+	}
+
+	@Override
+	public boolean addUser(User user) throws RemoteException{
+		Database db=Database.getInstance();
+		return db.addUser(user);
+	}
+
+	@Override
+	public User login(User user) throws RemoteException{
+		Database db=Database.getInstance();
+		return db.login(user);
+	}
+
+	@Override
+	public long addMonster(Monster monster)throws RemoteException {
+		Database db=Database.getInstance();
+		return db.addMonster(monster);
+	}
+
+	@Override
+	public boolean addAbility(Ability ability) throws RemoteException{
+		Database db=Database.getInstance();
+		return db.addAbility(ability);
+	}
+
+	@Override
+	public ArrayList<Monster> getMonsters()throws RemoteException {
+		Database db=Database.getInstance();
+		return db.getMonsters();
+	}
+	
+
+}