| commit | 441508ac3b675b0e02acfd13ec5436d17d059b51 | [log] [tgz] |
|---|---|---|
| author | Haoran Meng <menghaoranss@gmail.com> | Thu Jul 30 19:40:16 2020 +0800 |
| committer | GitHub <noreply@github.com> | Thu Jul 30 19:40:16 2020 +0800 |
| tree | 2c2515b028c2c3e303bbf403c08d88cd51b815ff | |
| parent | 1c926671c7c1fd10d045439de97c4d7b339c16a7 [diff] | |
| parent | a29a61160a952075d3b6cfb8edf2071728c35109 [diff] |
Merge pull request #30 from menghaoranss/modify-path Revise Bootstrap path
diff --git a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/assembly/shardingsphere-elasticjob-cloud-ui-bin-distribution.xml b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/assembly/shardingsphere-elasticjob-cloud-ui-bin-distribution.xml index f307832..509c39f 100644 --- a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/assembly/shardingsphere-elasticjob-cloud-ui-bin-distribution.xml +++ b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/assembly/shardingsphere-elasticjob-cloud-ui-bin-distribution.xml
@@ -34,6 +34,7 @@ <directory>src/main/resources</directory> <includes> <include>application.properties</include> + <include>elasticjob-cloud-scheduler.properties</include> <include>logback.xml</include> </includes> <outputDirectory>conf</outputDirectory>
diff --git a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/bin/start.bat b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/bin/start.bat index 20d4e79..752d976 100644 --- a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/bin/start.bat +++ b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/bin/start.bat
@@ -25,7 +25,7 @@ set JAVA_OPTS=-server -Xmx1g -Xms1g -Xmn512m -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -set MAIN_CLASS=org.apache.shardingsphere.elasticjob.ui.Bootstrap +set MAIN_CLASS=org.apache.shardingsphere.elasticjob.cloud.ui.Bootstrap echo Starting the %SERVER_NAME% ...
diff --git a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/bin/start.sh b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/bin/start.sh index 829c488..c2d464c 100644 --- a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/bin/start.sh +++ b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/bin/start.sh
@@ -39,7 +39,7 @@ CLASS_PATH=.:${DEPLOY_DIR}/conf:${DEPLOY_DIR}/lib/* JAVA_OPTS=" -server -Xmx1g -Xms1g -Xmn512m -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 " -MAIN_CLASS=org.apache.shardingsphere.elasticjob.ui.Bootstrap +MAIN_CLASS=org.apache.shardingsphere.elasticjob.cloud.ui.Bootstrap echo "Starting the $SERVER_NAME ..." nohup java ${JAVA_OPTS} -classpath ${CLASS_PATH} ${MAIN_CLASS} > ${STDOUT_FILE} 2>&1 &
diff --git a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/conf/elasticjob-cloud-scheduler.properties b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/elasticjob-cloud-scheduler.properties similarity index 100% rename from shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/conf/elasticjob-cloud-scheduler.properties rename to shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/src/main/resources/elasticjob-cloud-scheduler.properties