Merge branch 'revert-48949ba7' into 'develop'

Revert "make changes due to moving to home machine"

See merge request !1

gradlew

@@ -28,16 +28,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 APP_BASE_NAME=`basename "$0"`
 
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS=""
 
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 MAX_FD="maximum"
 
 
-warn () {
+warn ( ) {
     echo "$*"
     echo "$*"
 }
 }
 
 
-die () {
+die ( ) {
     echo
     echo
     echo "$*"
     echo "$*"
     echo
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 fi
 
 
 # Escape application args
 # Escape application args
-save () {
+save ( ) {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
     echo " "
 }
 }

gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 set APP_HOME=%DIRNAME%
 
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS=
 
 
 @rem Find java.exe
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 if defined JAVA_HOME goto findJavaFromJavaHome

src/main/java/common/Log4jFileChangeListener.java

@@ -77,10 +77,10 @@ public class Log4jFileChangeListener{
 
 
 		}
 		}
 
 
-//		@Override
-//		public void destroy()
-//		{
-//		}
+		@Override
+		public void destroy()
+		{
+		}
 
 
 
 
 
 
@@ -128,7 +128,7 @@ public class Log4jFileChangeListener{
 		{
 		{
 			System.out.println("stopping Log4jFileChangeListener thread...");
 			System.out.println("stopping Log4jFileChangeListener thread...");
 //			logger.info("stopping Log4jFileChangeListener thread...");
 //			logger.info("stopping Log4jFileChangeListener thread...");
-			listenThread.stop();
+			listenThread.destroy();
 			listenThread = null;
 			listenThread = null;
 		}
 		}
 	}
 	}

src/main/java/common/configuration/ConfigProperties.java

@@ -106,19 +106,19 @@ public class ConfigProperties
 //			}
 //			}
 		}
 		}
 
 
-//		@Override
-//		public void destroy()
-//		{
-//			try
-//			{
-//				System.out.println("Stopping monitor...");
-//				monitor.stop();
-//			} catch (Exception e)
-//			{
-//				// TODO Auto-generated catch block
-//				e.printStackTrace();
-//			}
-//		}
+		@Override
+		public void destroy()
+		{
+			try
+			{
+				System.out.println("Stopping monitor...");
+				monitor.stop();
+			} catch (Exception e)
+			{
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
 
 
 
 
 
 
@@ -141,7 +141,7 @@ public class ConfigProperties
 	protected void finalize() throws Throwable
 	protected void finalize() throws Throwable
 	{
 	{
 		// TODO Auto-generated method stub
 		// TODO Auto-generated method stub
-		listenThread.stop();
+		listenThread.destroy();
 		listenThread.join(2000);
 		listenThread.join(2000);
 		listenThread = null;
 		listenThread = null;
 		super.finalize();
 		super.finalize();
@@ -165,7 +165,7 @@ public class ConfigProperties
 	{ 
 	{ 
 		try
 		try
 		{
 		{
-			listenThread.stop();
+			listenThread.destroy();
 			listenThread.join(2000);
 			listenThread.join(2000);
 		} catch (InterruptedException e)
 		} catch (InterruptedException e)
 		{
 		{

src/main/java/itm/ITMThread.java

@@ -52,10 +52,12 @@ public abstract class ITMThread extends Thread
 		}
 		}
 	}
 	}
 
 
-//	@Override
-//	public void destroy()
-//	{
-//	}
+	@Override
+	public void destroy()
+	{	
+	}
+	
+	
 
 
 	public void stopRunning()
 	public void stopRunning()
 	{
 	{

src/main/java/mtqm/MultiThreadQueueManager.java

@@ -89,12 +89,12 @@ public class MultiThreadQueueManager
 			
 			
 		}
 		}
 
 
-//		@Override
-//		public void destroy()
-//		{
-//			// TODO Auto-generated method stub
-//
-//		}
+		@Override
+		public void destroy()
+		{
+			// TODO Auto-generated method stub
+			
+		}
 
 
 		public void stopRunning()
 		public void stopRunning()
 		{
 		{