SHA256
refactor: перенос серверных модулей в папку SHiNE-server
This commit is contained in:
+21
-4
@@ -19,6 +19,18 @@ allprojects {
|
||||
|
||||
group = 'shine'
|
||||
version = serverVersionFromFile
|
||||
layout.buildDirectory.set(file('SHiNE-server/build'))
|
||||
|
||||
sourceSets {
|
||||
main {
|
||||
java.srcDirs = ['SHiNE-server/src/main/java']
|
||||
resources.srcDirs = ['SHiNE-server/src/main/resources']
|
||||
}
|
||||
test {
|
||||
java.srcDirs = ['SHiNE-server/src/test/java']
|
||||
resources.srcDirs = ['SHiNE-server/src/test/resources']
|
||||
}
|
||||
}
|
||||
|
||||
tasks.jar {
|
||||
enabled = false // это что бы не создавала обычный джар, а будет только толстый джар
|
||||
@@ -131,7 +143,7 @@ tasks.register('cleanServerLogs') {
|
||||
description = "Clear server logs/app.log and remove rolled log files"
|
||||
|
||||
doLast {
|
||||
File logsDir = file('logs')
|
||||
File logsDir = file('SHiNE-server/logs')
|
||||
if (!logsDir.exists()) {
|
||||
logsDir.mkdirs()
|
||||
}
|
||||
@@ -160,6 +172,7 @@ tasks.register('integrationTest', JavaExec) {
|
||||
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "test.it.IT_RunAllCleanStartWsMain"
|
||||
workingDir = file('SHiNE-server')
|
||||
|
||||
// пробрасываем системные флаги (по желанию)
|
||||
systemProperty "it.debug", System.getProperty("it.debug", "true")
|
||||
@@ -178,6 +191,7 @@ tasks.register('deployServer', JavaExec) {
|
||||
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "test.it.IT_DeployRestartNoCleanNoTestsMain"
|
||||
workingDir = file('SHiNE-server')
|
||||
|
||||
// можно переопределить при запуске:
|
||||
// ./gradlew deployServer -Dit.remoteHost=... -Dit.wsUri=...
|
||||
@@ -186,7 +200,7 @@ tasks.register('deployServer', JavaExec) {
|
||||
systemProperty "it.remoteUser", System.getProperty("it.remoteUser", "player")
|
||||
systemProperty "it.remoteDir", System.getProperty("it.remoteDir", "/home/player/SHiNE/shine-server")
|
||||
systemProperty "it.service", System.getProperty("it.service", "shine-server")
|
||||
systemProperty "it.localJar", System.getProperty("it.localJar", "build/libs/shine-server.jar")
|
||||
systemProperty "it.localJar", System.getProperty("it.localJar", "SHiNE-server/build/libs/shine-server.jar")
|
||||
|
||||
dependsOn testClasses
|
||||
}
|
||||
@@ -211,7 +225,7 @@ tasks.register('startLocal', Exec) {
|
||||
|
||||
commandLine 'bash', '-lc', """
|
||||
set -euo pipefail
|
||||
JAR_PATH="${file('build/libs/shine-server.jar').absolutePath}"
|
||||
JAR_PATH="${file('SHiNE-server/build/libs/shine-server.jar').absolutePath}"
|
||||
UI_DIR="${file('shine-UI').absolutePath}"
|
||||
WS_PORT="${wsPort}"
|
||||
WEB_PORT="${webPort}"
|
||||
@@ -243,7 +257,10 @@ tasks.register('startLocal', Exec) {
|
||||
echo "UI HTTP port: \$WEB_PORT"
|
||||
echo "Client URL: http://localhost:\$WEB_PORT/?localWsPort=\$WS_PORT"
|
||||
|
||||
java -Dserver.port="\$WS_PORT" -jar "\$JAR_PATH" &
|
||||
(
|
||||
cd "${file('SHiNE-server').absolutePath}"
|
||||
java -Dserver.port="\$WS_PORT" -jar "\$JAR_PATH"
|
||||
) &
|
||||
SERVER_PID=\$!
|
||||
trap 'kill \$SERVER_PID 2>/dev/null || true' EXIT INT TERM
|
||||
|
||||
|
||||
Reference in New Issue
Block a user