removed subprojects

client/client.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="common" />
-  </component>
-</module>

client/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>java-rmi</artifactId>
-        <groupId>com.uqac.rthoni</groupId>
-        <version>0.1</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>client</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>com.uqac.rthoni</groupId>
-            <artifactId>common</artifactId>
-            <version>0.1</version>
-        </dependency>
-    </dependencies>
-
-
-</project>

common/common.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-</module>

common/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>java-rmi</artifactId>
-        <groupId>com.uqac.rthoni</groupId>
-        <version>0.1</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>common</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-
-</project>

pom.xml

     <artifactId>java-rmi</artifactId>
     <packaging>pom</packaging>
     <version>0.1</version>
-    <modules>
-        <module>server</module>
-        <module>client</module>
-        <module>common</module>
-    </modules>
     <dependencies>
         <dependency>
-            <groupId>com.uqac.rthoni</groupId>
-            <artifactId>client</artifactId>
-            <version>0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.uqac.rthoni</groupId>
-            <artifactId>server</artifactId>
-            <version>0.1</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

server/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>java-rmi</artifactId>
-        <groupId>com.uqac.rthoni</groupId>
-        <version>0.1</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>server</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-
-</project>

server/server.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="module" module-name="common" />
-  </component>
-</module>

src/main/java/com/uqac/rthoni/java_rmi/Main.java

             usage(name, true);
         }
         String mode = args[0];
-        if (mode.equals("server")) {
+        if (mode.equals("com/uqac/rthoni/java_rmi/server")) {
             int port = getPort(name, args[1]);
             String sourceDir = args[2];
             String classDir = args[3];

common/src/main/java/com/uqac/rthoni/java_rmi/common/Command.java → src/main/java/com/uqac/rthoni/java_rmi/common/Command.java

 
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Vector;
 import java.util.stream.Collectors;
 

server/src/main/java/com/uqac/rthoni/java_rmi/server/ServerApplication.java → src/main/java/com/uqac/rthoni/java_rmi/server/ServerApplication.java

 
 import com.uqac.rthoni.java_rmi.server.executors.AbstractCommandExecutor;
 import com.uqac.rthoni.java_rmi.common.Command;
-import javafx.beans.binding.ObjectExpression;
 
 import java.io.BufferedReader;
 import java.io.IOException;

server/src/main/java/com/uqac/rthoni/java_rmi/server/executors/ClassBuilderExecutor.java → src/main/java/com/uqac/rthoni/java_rmi/server/executors/ClassBuilderExecutor.java

 import javax.tools.ToolProvider;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.List;
 import java.util.Vector;
 import java.util.stream.Collectors;

common/src/test/java/com/uqac/rthoni/java_rmi/common/CommandTest.java → src/test/java/com/uqac/rthoni/java_rmi/common/CommandTest.java

 package com.uqac.rthoni.java_rmi.common;
 
-import com.sun.corba.se.impl.orbutil.ObjectWriter;
+import com.uqac.rthoni.java_rmi.common.Command;
+import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-
-import static org.junit.Assert.*;
 
 /**
  * Created by robin on 9/15/16.
     {
         Command c = new Command(null);
         String result = commandToString(c);
-        assertEquals(result, "Unknown");
+        Assert.assertEquals(result, "Unknown");
     }
 
     @Test
     {
         Command c = new Command("");
         String result = commandToString(c);
-        assertEquals(result, "Unknown");
+        Assert.assertEquals(result, "Unknown");
     }
 
     @Test
     {
         Command c = new Command("Test");
         String result = commandToString(c);
-        assertEquals(result, "Test");
+        Assert.assertEquals(result, "Test");
     }
 
     @Test
         Command c = new Command("Test");
         c.addArgument("an_argument");
         String result = commandToString(c);
-        assertEquals(result, "Test#an_argument");
+        Assert.assertEquals(result, "Test#an_argument");
     }
 
     @Test
         c.addArgument("an_argument");
         c.addArgument("an_argument2");
         String result = commandToString(c);
-        assertEquals(result, "Test#an_argument#an_argument2");
+        Assert.assertEquals(result, "Test#an_argument#an_argument2");
     }
 
     @Test
     public void testCommandDeserializeNull() throws Exception
     {
         Command c = Command.fromString(null);
-        assertNull(c);
+        Assert.assertNull(c);
     }
 
     @Test
     public void testCommandDeserializeEmpty() throws Exception
     {
         Command c = Command.fromString("");
-        assertNull(c);
+        Assert.assertNull(c);
     }
 
     @Test
     public void testCommandDeserializeName() throws Exception
     {
         Command c = Command.fromString("Test");
-        assertNotNull(c);
-        assertEquals(c.getCommandName(), "Test");
-        assertEquals(c.getArgumentCount(), 0);
+        Assert.assertNotNull(c);
+        Assert.assertEquals(c.getCommandName(), "Test");
+        Assert.assertEquals(c.getArgumentCount(), 0);
     }
 
     @Test
     public void testCommandDeserializeArgument() throws Exception
     {
         Command c = Command.fromString("Test#an_argument");
-        assertNotNull(c);
-        assertEquals(c.getCommandName(), "Test");
-        assertEquals(c.getArgumentCount(), 1);
-        assertEquals(c.getArgument(0, false), "an_argument");
+        Assert.assertNotNull(c);
+        Assert.assertEquals(c.getCommandName(), "Test");
+        Assert.assertEquals(c.getArgumentCount(), 1);
+        Assert.assertEquals(c.getArgument(0, false), "an_argument");
     }
 
     @Test
     public void testCommandDeserializeArguments() throws Exception
     {
         Command c = Command.fromString("Test#an_argument#an_argument2");
-        assertNotNull(c);
-        assertEquals(c.getCommandName(), "Test");
-        assertEquals(c.getArgumentCount(), 2);
-        assertEquals(c.getArgument(0, false), "an_argument");
-        assertEquals(c.getArgument(1, false), "an_argument2");
+        Assert.assertNotNull(c);
+        Assert.assertEquals(c.getCommandName(), "Test");
+        Assert.assertEquals(c.getArgumentCount(), 2);
+        Assert.assertEquals(c.getArgument(0, false), "an_argument");
+        Assert.assertEquals(c.getArgument(1, false), "an_argument2");
     }
 }

server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/MethodExecutorTest.java → src/test/java/com/uqac/rthoni/java_rmi/server/executors/MethodExecutorTest.java

 package com.uqac.rthoni.java_rmi.server.executors;
 
 import com.uqac.rthoni.java_rmi.server.ServerApplication;
+import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by robin on 9/16/16.
  */
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "fonction#test#getMyself#java.lang.String:a_value");
-        assertEquals("a_value", res);
+        Assert.assertEquals("a_value", res);
     }
 
     @Test
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "fonction#test#uselessMethod#int:42,int:24,java.lang.String:a_value");
-        assertEquals("NULL", res);
+        Assert.assertEquals("NULL", res);
     }
 
     @Test
                 "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
                 "ecriture#test2#privateString#some_value",
                 "fonction#test#getMyString#com.uqac.rthoni.java_rmi.server.executors.TestDbo:ID(test2)");
-        assertEquals("some_value", res);
+        Assert.assertEquals("some_value", res);
     }
 
     @Test
                 "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
                 "fonction#test2#setPrivateString#java.lang.String:some_value",
                 "fonction#test#getMyString#com.uqac.rthoni.java_rmi.server.executors.TestDbo:ID(test2)");
-        assertEquals("NULL\nsome_value", res);
+        Assert.assertEquals("NULL\nsome_value", res);
     }
 
     @Test
                 "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
                 "fonction#test#setPrivateString#java.lang.String:some_value",
                 "fonction#test#getPrivateString");
-        assertEquals("NULL\nsome_value", res);
+        Assert.assertEquals("NULL\nsome_value", res);
     }
 }

server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/NewInstanceExecutorTest.java → src/test/java/com/uqac/rthoni/java_rmi/server/executors/NewInstanceExecutorTest.java

 package com.uqac.rthoni.java_rmi.server.executors;
 
-import com.uqac.rthoni.java_rmi.common.Command;
 import com.uqac.rthoni.java_rmi.server.ServerApplication;
+import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Arrays;
-
-import static org.junit.Assert.*;
-
 /**
  * Created by robin on 9/16/16.
  */
     {
         ServerApplication app = getServer();
         String res = runCommand(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test");
-        assertNull(res);
+        Assert.assertNull(res);
         Object obj = app.getObject("test");
-        assertNotNull(obj);
-        assertEquals(obj.toString(), "privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true");
+        Assert.assertNotNull(obj);
+        Assert.assertEquals(obj.toString(), "privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true");
     }
 
     @Test
     {
         ServerApplication app = getServer();
         String res = runCommand(app, "creation#java.lang.String#mystr");
-        assertNull(res);
+        Assert.assertNull(res);
         Object obj = app.getObject("mystr");
-        assertNotNull(obj);
-        assertEquals(obj.toString(), "");
+        Assert.assertNotNull(obj);
+        Assert.assertEquals(obj.toString(), "");
     }
 
     @Test(expected = ClassNotFoundException.class)

server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/ReadExecutorTest.java → src/test/java/com/uqac/rthoni/java_rmi/server/executors/ReadExecutorTest.java

 package com.uqac.rthoni.java_rmi.server.executors;
 
 import com.uqac.rthoni.java_rmi.server.ServerApplication;
+import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by robin on 9/16/16.
  */
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#publicInt");
-        assertEquals("42", res);
+        Assert.assertEquals("42", res);
     }
 
     @Test
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#privateInt");
-        assertEquals("24", res);
+        Assert.assertEquals("24", res);
     }
 
     @Test
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#privateString");
-        assertEquals("default_value", res);
+        Assert.assertEquals("default_value", res);
     }
 
     @Test(expected = NoSuchMethodException.class)
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#publicFloat");
-        assertEquals("0.42", res);
+        Assert.assertEquals("0.42", res);
     }
 
     @Test
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#publicDouble");
-        assertEquals("0.125", res);
+        Assert.assertEquals("0.125", res);
     }
 
     @Test
         ServerApplication app = getServer();
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "lecture#test#publicBool");
-        assertEquals("true", res);
+        Assert.assertEquals("true", res);
     }
 }

server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/WriteExecutorTest.java → src/test/java/com/uqac/rthoni/java_rmi/server/executors/WriteExecutorTest.java

 package com.uqac.rthoni.java_rmi.server.executors;
 
 import com.uqac.rthoni.java_rmi.server.ServerApplication;
+import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by robin on 9/16/16.
  */
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "ecriture#test#publicInt#24",
                 "lecture#test#publicInt");
-        assertEquals(res, "24");
+        Assert.assertEquals(res, "24");
         Object obj = app.getObject("test");
-        assertNotNull(obj);
-        assertEquals("privateString=default_value, privateInt=24, publicInt=24, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true", obj.toString());
+        Assert.assertNotNull(obj);
+        Assert.assertEquals("privateString=default_value, privateInt=24, publicInt=24, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true", obj.toString());
     }
 
     @Test
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "ecriture#test#privateInt#42",
                 "lecture#test#privateInt");
-        assertEquals(res, "42");
+        Assert.assertEquals(res, "42");
         Object obj = app.getObject("test");
-        assertNotNull(obj);
-        assertEquals("privateString=default_value, privateInt=42, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true", obj.toString());
+        Assert.assertNotNull(obj);
+        Assert.assertEquals("privateString=default_value, privateInt=42, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true", obj.toString());
     }
 
     @Test
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "ecriture#test#privateString#a_value",
                 "lecture#test#privateString");
-        assertEquals(res, "a_value");
+        Assert.assertEquals(res, "a_value");
         Object obj = app.getObject("test");
-        assertNotNull(obj);
-        assertEquals("privateString=a_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true", obj.toString());
+        Assert.assertNotNull(obj);
+        Assert.assertEquals("privateString=a_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=true", obj.toString());
     }
 
     @Test
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "ecriture#test#publicFloat#4242.5",
                 "lecture#test#publicFloat");
-        assertEquals(res, "4242.5");
+        Assert.assertEquals(res, "4242.5");
         Object obj = app.getObject("test");
-        assertNotNull(obj);
-        assertEquals("privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=4242.500000, publicDouble=0.125000, publicBool=true", obj.toString());
+        Assert.assertNotNull(obj);
+        Assert.assertEquals("privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=4242.500000, publicDouble=0.125000, publicBool=true", obj.toString());
     }
 
     @Test
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
                 "ecriture#test#publicBool#false",
                 "lecture#test#publicBool");
-        assertEquals(res, "false");
+        Assert.assertEquals(res, "false");
         Object obj = app.getObject("test");
-        assertNotNull(obj);
-        assertEquals("privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=false", obj.toString());
+        Assert.assertNotNull(obj);
+        Assert.assertEquals("privateString=default_value, privateInt=24, publicInt=42, aPrivateField=0, publicFloat=0.420000, publicDouble=0.125000, publicBool=false", obj.toString());
     }
 }

uqac-java-rmi.iml

     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" />
-    <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="server" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>