Merge github.com:elnrnag/titan.core

diff --git a/Makefile.cfg b/Makefile.cfg
index f4c5fb92b057e76e3c9037586036303d4ea450b7..9d7fb0e38bc2e84380a39948967b7fa8c046d09f 100644 (file)
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -67,7 +67,7 @@ JNI := yes
 
 # Path of the Java Developement Kit installation
 # (must be at least version  1.5.0_10)
-JDKDIR := /mnt/TTCN/Tools/jdk1.5.0_11
+JDKDIR := /usr/lib/jvm/default-java 
 
 # Path of OpenSSL installation: (always required)
 OPENSSL_DIR := default

diff --git a/titan_executor_api/TITAN_Executor_API/src/org/eclipse/titan/executorapi/JniExecutor.java b/titan_executor_api/TITAN_Executor_API/src/org/eclipse/titan/executorapi/JniExecutor.java
index 1a974ae5e607509cd3d46f45c66e0f286f9fd1d8..f0f942087189cfc40f07bfbd798e863aae2eecc4 100644 (file)
--- a/titan_executor_api/TITAN_Executor_API/src/org/eclipse/titan/executorapi/JniExecutor.java
+++ b/titan_executor_api/TITAN_Executor_API/src/org/eclipse/titan/executorapi/JniExecutor.java
@@ -37,7 +37,7 @@ import org.eclipse.titan.executorapi.util.Log;
  * SINGLETON
  * <p>
  * This executor handles the execution of tests compiled in a parallel mode, via directly connecting to the MainController (MC) written in C++.
- * It controls MC with commands, most of methods in this class represents one or more MC commands.
+ * It controls MC with commands, most methods in this class represents one or more MC commands.
  * These methods can be called in certain states.
  * They can be synchronous or asynchronous.
  * <p>