j62
/
ctbrec
2
2
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases 3 Wiki Activity

Add the logback config to the root directory of the assembly

This commit is contained in:
0xb00bface 2020-12-20 17:07:05 +01:00
parent cf165b7fc0
commit a5834e3533
14 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/pom.xml
View File

@ -124,7 +124,7 @@
<classPath> <classPath>
<mainClass>ctbrec.ui.Launcher</mainClass> <mainClass>ctbrec.ui.Launcher</mainClass>
<addDependencies>false</addDependencies> <addDependencies>false</addDependencies>
<preCp>anything</preCp> <preCp>.</preCp>
</classPath> </classPath>
<downloadUrl>https://jdk.java.net/</downloadUrl> <downloadUrl>https://jdk.java.net/</downloadUrl>
<jre> <jre>

5
client/src/assembly/ctbrec-linux-jre.sh
View File

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
pushd $(dirname $0) DIR="$(dirname "$0")"
pushd "${DIR}"
JAVA=./jre/bin/java JAVA=./jre/bin/java
$JAVA -version $JAVA -version
$JAVA -Djdk.gtk.version=3 -cp ${name.final}.jar ctbrec.ui.Launcher $JAVA -Djdk.gtk.version=3 -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
popd popd

5
client/src/assembly/ctbrec-linux.sh
View File

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
pushd $(dirname $0) DIR="$(dirname "$0")"
pushd "${DIR}"
JAVA=java JAVA=java
$JAVA -version $JAVA -version
$JAVA -Djdk.gtk.version=3 -cp ${name.final}.jar ctbrec.ui.Launcher $JAVA -Djdk.gtk.version=3 -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
popd popd

4
client/src/assembly/ctbrec-macos-jre.sh
View File

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
DIR=$(dirname $0) DIR=$(dirname $0)
pushd $DIR pushd "$DIR"
JAVA_HOME="$DIR/jre/Contents/Home" JAVA_HOME="$DIR/jre/Contents/Home"
JAVA="$JAVA_HOME/bin/java" JAVA="$JAVA_HOME/bin/java"
$JAVA -version $JAVA -version
$JAVA -cp ${name.final}.jar ctbrec.ui.Launcher $JAVA -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
popd popd

4
client/src/assembly/ctbrec-macos.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
DIR=$(dirname $0) DIR=$(dirname $0)
pushd $DIR pushd "$DIR"
JAVA=java JAVA=java
$JAVA -version $JAVA -version
$JAVA -cp ${name.final}.jar ctbrec.ui.Launcher $JAVA -cp "${DIR}:${name.final}.jar" ctbrec.ui.Launcher
popd popd

1
client/src/assembly/ctbrec.bat Normal file
View File

@ -0,0 +1 @@
jre\bin\java -Xmx512m -cp ".;${name.final}.jar" ctbrec.ui.Launcher

4
client/src/assembly/linux-jre.xml
View File

@ -24,6 +24,10 @@
<source>${project.basedir}/README.md</source> <source>${project.basedir}/README.md</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
</file> </file>
<file>
<source>${project.basedir}/src/main/resources/logback.xml</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file> <file>
<source>${project.basedir}/ffmpeg/ffmpeg-linux64</source> <source>${project.basedir}/ffmpeg/ffmpeg-linux64</source>
<outputDirectory>ctbrec/ffmpeg</outputDirectory> <outputDirectory>ctbrec/ffmpeg</outputDirectory>

4
client/src/assembly/macos-jre.xml
View File

@ -24,6 +24,10 @@
<source>${project.basedir}/README.md</source> <source>${project.basedir}/README.md</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
</file> </file>
<file>
<source>${project.basedir}/src/main/resources/logback.xml</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file> <file>
<source>${project.basedir}/ffmpeg/ffmpeg-macos64</source> <source>${project.basedir}/ffmpeg/ffmpeg-macos64</source>
<outputDirectory>ctbrec/ffmpeg</outputDirectory> <outputDirectory>ctbrec/ffmpeg</outputDirectory>

9
client/src/assembly/win64-jre.xml
View File

@ -22,6 +22,15 @@
<source>${project.basedir}/README.md</source> <source>${project.basedir}/README.md</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
</file> </file>
<file>
<source>${project.basedir}/src/main/resources/logback.xml</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/src/assembly/ctbrec.bat</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
</file>
<file> <file>
<source>${project.basedir}/ffmpeg/ffmpeg-win64.exe</source> <source>${project.basedir}/ffmpeg/ffmpeg-win64.exe</source>
<outputDirectory>ctbrec/ffmpeg</outputDirectory> <outputDirectory>ctbrec/ffmpeg</outputDirectory>

2
server/src/assembly/server-linux.sh
View File

@ -18,7 +18,7 @@ start() {
# start ctbrec # start ctbrec
$JAVA -version $JAVA -version
$JAVA -Xmx256m -cp "${DIR}/${name.final}.jar" -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer & $JAVA -Xmx256m -cp "${DIR}:${DIR}/${name.final}.jar" -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer &
# write a pid file # write a pid file
echo $! > "${PIDFILE}" echo $! > "${PIDFILE}"

2
server/src/assembly/server-macos.sh
View File

@ -4,5 +4,5 @@ DIR=$(dirname $0)
pushd $DIR pushd $DIR
JAVA=java JAVA=java
$JAVA -version $JAVA -version
$JAVA -Xmx192m -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer $JAVA -Xmx192m -cp "${DIR}:${name.final}.jar" -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
popd popd

2
server/src/assembly/server.bat
View File

@ -1 +1 @@
java -Xmx192m -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer java -Xmx192m -cp .;${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer

4
server/src/assembly/server.xml
View File

@ -38,6 +38,10 @@
<source>${project.basedir}/src/assembly/ffmpeg.txt</source> <source>${project.basedir}/src/assembly/ffmpeg.txt</source>
<outputDirectory>ctbrec/ffmpeg</outputDirectory> <outputDirectory>ctbrec/ffmpeg</outputDirectory>
</file> </file>
<file>
<source>${project.basedir}/src/main/resources/logback.xml</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file> <file>
<source>${project.build.directory}/${name.final}.jar</source> <source>${project.build.directory}/${name.final}.jar</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>

2
server/src/main/resources/logback.xml
View File

@ -1,4 +1,4 @@
<configuration scan="true" scanPeriod="30 seconds"> <configuration scan="true" scanPeriod="10 seconds">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder