Merge pull request #46 from EMResearch/specify-thrift

change back to general

Author: arcuri82

jdk_8_maven/em/embedded/thrift/ncs/src/main/java/em/embedded/org/thriftncs/EmbeddedEvoMasterController.java

@@ -76,7 +76,7 @@ public ProblemInfo getProblemInfo() {
 
         return new RPCProblem(new HashMap<String, Object>() {{
             put(NcsService.Iface.class.getName(), client);
-        }}, RPCType.THRIFT);
+        }});
     }
 
     @Override

jdk_8_maven/em/embedded/thrift/scs/src/main/java/em/embedded/org/thriftscs/EmbeddedEvoMasterController.java

@@ -75,7 +75,7 @@ public ProblemInfo getProblemInfo() {
 
         return new RPCProblem(new HashMap<String, Object>() {{
             put(ScsService.Iface.class.getName(), client);
-        }}, RPCType.THRIFT);
+        }});
     }
 
     @Override

jdk_8_maven/em/external/thrift/ncs/src/main/java/em/external/org/rpc/thriftncs/ExternalEvoMasterController.java

@@ -75,6 +75,9 @@ public ExternalEvoMasterController(int controllerPort, String jarLocation, int s
         setJavaCommand(command);
     }
 
+    public ExternalEvoMasterController(String jarLocation){
+        this(40100, jarLocation, 12345, 120, "java");
+    }
 
     @Override
     public String[] getInputParameters() {
@@ -155,7 +158,7 @@ public ProblemInfo getProblemInfo() {
 
         return new RPCProblem(new HashMap<String, Object>() {{
             put(NcsService.Iface.class.getName(), client);
-        }}, RPCType.THRIFT);
+        }});
     }
 
     @Override

jdk_8_maven/em/external/thrift/scs/src/main/java/em/external/org/rpc/thriftscs/ExternalEvoMasterController.java

@@ -67,6 +67,10 @@ public ExternalEvoMasterController() {
         this(40100, "cs/rpc/thrift/artificial/thrift-scs/target/rpc-thrift-scs-sut.jar", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation){
+        this(40100, jarLocation, 12345, 120, "java");
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.jarLocation = jarLocation;
@@ -154,7 +158,7 @@ public ProblemInfo getProblemInfo() {
 
         return new RPCProblem(new HashMap<String, Object>() {{
             put(ScsService.Iface.class.getName(), client);
-        }}, RPCType.THRIFT);
+        }});
     }
 
     @Override