diff --git a/.gitignore b/.gitignore index 811f8fa7..cb7d7046 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ bin/run.sh bin/start.sh bin/stop.sh bin/test.sh +/.project diff --git a/container_files/tomee/bin/setenv.sh b/container_files/tomee/bin/setenv.sh index 5245f238..603fc570 100755 --- a/container_files/tomee/bin/setenv.sh +++ b/container_files/tomee/bin/setenv.sh @@ -1,4 +1,4 @@ CLASSPATH=/opt/tomee/bin/* #JAVA_OPTS="-Dlog4j.configurationFile=/opt/tomee/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN" -CATALINA_OPTS="-Xmx$GROUPER_MAX_MEMORY -XX:+UseG1GC -XX:+UseStringDeduplication -Dlog4j.configurationFile=/opt/tomee/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN $GROUPER_EXTRA_CATALINA_OPTS" +CATALINA_OPTS="-Xmx$GROUPER_MAX_MEMORY -XX:+UseG1GC -XX:+UseStringDeduplication -Dlog4j.configurationFile=/opt/tomee/conf/log4j2.xml -DENV=$ENV -DUSERTOKEN=$USERTOKEN -Dfile.encoding=UTF-8 $GROUPER_EXTRA_CATALINA_OPTS" LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager