Merge pull request #170 from experdb/development

[no issue]
experdb · Dec 27, 2021 · 48d2638 · 48d2638
2 parents c0f5e12 + 6eddff2
commit 48d2638
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 4 deletions.
diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent/ant_build/build.xml b/eXperDB_Server/eXperDB_Monitoring_Agent/ant_build/build.xml
@@ -78,7 +78,7 @@
 	</target>
 
 	<target name="compile" >
-		<javac target="1.6" destdir="${output.dir}" debug="yes" includeantruntime="true" encoding="utf-8" deprecation="true">
+		<javac target="1.8" destdir="${output.dir}" debug="yes" includeantruntime="true" encoding="utf-8" deprecation="true">
 	  		<classpath refid="classpath" />
 			<src path="${src.dir}"/>
 	  	</javac>

diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent/lib/log4j-1.2.17.jar b/eXperDB_Server/eXperDB_Monitoring_Agent/lib/log4j-1.2.17.jar
diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent/lib/log4j-api-2.12.2.jar b/eXperDB_Server/eXperDB_Monitoring_Agent/lib/log4j-api-2.12.2.jar
diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent/lib/log4j-core-2.12.2.jar b/eXperDB_Server/eXperDB_Monitoring_Agent/lib/log4j-core-2.12.2.jar
diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent/shell/experdbma.sh b/eXperDB_Server/eXperDB_Monitoring_Agent/shell/experdbma.sh
@@ -46,7 +46,7 @@ boot()
 		    PRINT_LOGO
 		    echo "   [`date`] eXperDBMA Server Starting..."
 		    cd ${eXperDBMA_HOME}/bin
-		    java -Djava.rmi.server.hostname=${SERVER_HOSTNAME} -Dcom.sun.management.jmxremote.port=${JMXREMOTE_PORT} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -D${DNAME} -Xmx3072m -DeXperDBMA.config=eXperDBMA.config -DeXperDBMA_HOME=${eXperDBMA_HOME}/ -DCONFIG_DIR=config -classpath ../:../lib/commons-collections-3.1.jar:../lib/commons-dbcp-1.4.jar:../lib/commons-pool-1.6.jar:../lib/log4j-1.2.17.jar:../lib/mybatis-3.2.5.jar:../lib/postgresql-42.2.22.jar:../lib/commons-codec-1.9.jar:../lib/json-simple-1.1.1.jar:../lib/sqljdbc41-1.jar:../lib/ojdbc-6.jar:../lib/orai18n-1.jar:../lib/mysql-connector-java-8.0.25.jar experdb.mnt.Server &
+		    java -Djava.rmi.server.hostname=${SERVER_HOSTNAME} -Dcom.sun.management.jmxremote.port=${JMXREMOTE_PORT} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -D${DNAME} -Xmx3072m -DeXperDBMA.config=eXperDBMA.config -DeXperDBMA_HOME=${eXperDBMA_HOME}/ -DCONFIG_DIR=config -classpath ../:../lib/commons-collections-3.1.jar:../lib/commons-dbcp-1.4.jar:../lib/commons-pool-1.6.jar:../lib/log4j-api-2.17.0.jar:../lib/log4j-core-2.17.0.jar:../lib/mybatis-3.2.5.jar:../lib/postgresql-42.2.22.jar:../lib/commons-codec-1.9.jar:../lib/json-simple-1.1.1.jar:../lib/sqljdbc41-1.jar:../lib/ojdbc-6.jar:../lib/orai18n-1.jar:../lib/mysql-connector-java-8.0.25.jar experdb.mnt.Server &
 		    sleep 1
 		    IS_eXperDBMA_PID
 		    echo "   [`date`] Booting SUCCESS!!! (PID : $PID)"

diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/ant_build/build.xml b/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/ant_build/build.xml
@@ -78,7 +78,7 @@
 	</target>
 
 	<target name="compile" >
-		<javac target="1.6" destdir="${output.dir}" debug="yes" includeantruntime="true" encoding="utf-8" deprecation="true">
+		<javac target="1.8" destdir="${output.dir}" debug="yes" includeantruntime="true" encoding="utf-8" deprecation="true">
 	  		<classpath refid="classpath" />
 			<src path="${src.dir}"/>
 	  	</javac>

diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/lib/log4j-1.2.17.jar b/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/lib/log4j-1.2.17.jar
diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/lib/log4j-api-2.12.2.jar b/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/lib/log4j-api-2.12.2.jar
diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/lib/log4j-core-2.12.2.jar b/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/lib/log4j-core-2.12.2.jar
diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/shell/experdbma.sh b/eXperDB_Server/eXperDB_Monitoring_Agent_Manager/shell/experdbma.sh
@@ -49,7 +49,7 @@ boot()
 		    PRINT_LOGO
 		    echo "   [`date`] eXperDBMA_Manager Server Starting..."
 		    cd ${eXperDBMA_HOME}/bin
-		    java -Djava.rmi.server.hostname=${SERVER_HOSTNAME} -Dcom.sun.management.jmxremote.port=${JMXREMOTE_PORT} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -D${DNAME} -Xmx2048m -DeXperDBMA.config=eXperDBMA.config -DeXperDBMA_HOME=${eXperDBMA_HOME}/ -DAGENT_HOME=${AGENT_HOME}/ -DCONFIG_DIR=config -classpath ../:../lib/commons-collections-3.1.jar:../lib/commons-dbcp-1.2.1.jar:../lib/commons-pool-1.2.jar:../lib/log4j-1.2.17.jar:../lib/mybatis-3.2.5.jar:../lib/postgresql-42.2.22.jar:../lib/commons-codec-1.9.jar:../lib/json-simple-1.1.1.jar:../lib/quartz-2.3.0-SNAPSHOT.jar:../lib/quartz-jobs-2.3.0-SNAPSHOT.jar:../lib/slf4j-log4j12-1.7.7.jar:../lib/slf4j-api-1.7.7.jar experdb.mnt.Server &
+		    java -Djava.rmi.server.hostname=${SERVER_HOSTNAME} -Dcom.sun.management.jmxremote.port=${JMXREMOTE_PORT} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -D${DNAME} -Xmx2048m -DeXperDBMA.config=eXperDBMA.config -DeXperDBMA_HOME=${eXperDBMA_HOME}/ -DAGENT_HOME=${AGENT_HOME}/ -DCONFIG_DIR=config -classpath ../:../lib/commons-collections-3.1.jar:../lib/commons-dbcp-1.2.1.jar:../lib/commons-pool-1.2.jar:../lib/log4j-api-2.17.0.jar:../lib/log4j-core-2.17.0.jar:../lib/mybatis-3.2.5.jar:../lib/postgresql-42.2.22.jar:../lib/commons-codec-1.9.jar:../lib/json-simple-1.1.1.jar:../lib/quartz-2.3.0-SNAPSHOT.jar:../lib/quartz-jobs-2.3.0-SNAPSHOT.jar:../lib/slf4j-log4j12-1.7.25.jar:../lib/slf4j-api-1.7.25.jar:../lib/slf4j-api-1.7.25.jar:../lib/log4j-slf4j-impl-2.17.0.jar experdb.mnt.Server &
 		    sleep 1
 		    IS_eXperDBMA_PID
 		    echo "   [`date`] Booting SUCCESS!!! (PID : $PID)"