From 1c008cd56eb726535c37ed24a6bb4c2c76006ec6 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 14 Mar 2016 21:53:07 -0500 Subject: [PATCH] Disable DEBUG logs Fixes gh-3757 --- gradle/javaprojects.gradle | 2 +- gradlew.bat | 2 +- .../src/main/webapp/WEB-INF/classes/logback.xml | 12 ++++++------ samples/form-jc/src/main/resources/logback.xml | 12 ++++++++++++ .../helloworld-jc/src/main/resources/logback.xml | 12 ++++++++++++ .../helloworld-xml/src/main/resources/logback.xml | 12 ++++++++++++ samples/jaas-xml/src/main/resources/logback.xml | 12 ++++++++++++ samples/jdbc-jc/src/main/resources/logback.xml | 12 ++++++++++++ samples/ldap-jc/src/main/resources/logback.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/classes/logback.xml | 14 ++++++-------- samples/openid-jc/src/main/resources/logback.xml | 12 ++++++++++++ samples/openid-xml/src/main/resources/logback.xml | 12 ++++++++++++ samples/preauth-jc/src/main/resources/logback.xml | 12 ++++++++++++ samples/preauth-xml/src/main/resources/logback.xml | 12 ++++++++++++ .../rememberme-jc/src/main/resources/logback.xml | 12 ++++++++++++ .../servletapi-xml/src/main/resources/logback.xml | 12 ++++++++++++ .../tutorial-xml/src/main/resources/logback.xml | 12 ++++++++++++ .../src/main/webapp/WEB-INF/classes/logback.xml | 14 -------------- samples/x509-jc/src/main/resources/logback.xml | 12 ++++++++++++ 19 files changed, 182 insertions(+), 30 deletions(-) create mode 100644 samples/form-jc/src/main/resources/logback.xml create mode 100644 samples/helloworld-jc/src/main/resources/logback.xml create mode 100644 samples/helloworld-xml/src/main/resources/logback.xml create mode 100644 samples/jaas-xml/src/main/resources/logback.xml create mode 100644 samples/jdbc-jc/src/main/resources/logback.xml create mode 100644 samples/ldap-jc/src/main/resources/logback.xml create mode 100644 samples/openid-jc/src/main/resources/logback.xml create mode 100644 samples/openid-xml/src/main/resources/logback.xml create mode 100644 samples/preauth-jc/src/main/resources/logback.xml create mode 100644 samples/preauth-xml/src/main/resources/logback.xml create mode 100644 samples/rememberme-jc/src/main/resources/logback.xml create mode 100644 samples/servletapi-xml/src/main/resources/logback.xml create mode 100644 samples/tutorial-xml/src/main/resources/logback.xml delete mode 100644 samples/tutorial-xml/src/main/webapp/WEB-INF/classes/logback.xml create mode 100644 samples/x509-jc/src/main/resources/logback.xml diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index ebc01501da..87c69ea3b9 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -162,7 +162,7 @@ configurations.all { [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' project.tasks.matching { it instanceof Test && it.name != 'integrationTest' }.all { - jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=256M'] + jvmArgs = ['-ea', '-Xmx500m'] maxParallelForks = guessMaxForks() logging.captureStandardOutput(LogLevel.INFO) } diff --git a/gradlew.bat b/gradlew.bat index bbc4099e94..5b99491df5 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -9,7 +9,7 @@ if "%OS%"=="Windows_NT" setlocal @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS=-Xmx1024M -XX:MaxPermSize=256M +set DEFAULT_JVM_OPTS=-Xmx1024M set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/classes/logback.xml b/samples/contacts-xml/src/main/webapp/WEB-INF/classes/logback.xml index a4392fd3e2..b0b65dbb15 100644 --- a/samples/contacts-xml/src/main/webapp/WEB-INF/classes/logback.xml +++ b/samples/contacts-xml/src/main/webapp/WEB-INF/classes/logback.xml @@ -1,14 +1,14 @@ - + - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + - + - + - + diff --git a/samples/form-jc/src/main/resources/logback.xml b/samples/form-jc/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/form-jc/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/helloworld-jc/src/main/resources/logback.xml b/samples/helloworld-jc/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/helloworld-jc/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/helloworld-xml/src/main/resources/logback.xml b/samples/helloworld-xml/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/helloworld-xml/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/jaas-xml/src/main/resources/logback.xml b/samples/jaas-xml/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/jaas-xml/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/jdbc-jc/src/main/resources/logback.xml b/samples/jdbc-jc/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/jdbc-jc/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/ldap-jc/src/main/resources/logback.xml b/samples/ldap-jc/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/ldap-jc/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/ldap-xml/src/main/webapp/WEB-INF/classes/logback.xml b/samples/ldap-xml/src/main/webapp/WEB-INF/classes/logback.xml index 1f4d925e4c..3ebbcc0ddd 100644 --- a/samples/ldap-xml/src/main/webapp/WEB-INF/classes/logback.xml +++ b/samples/ldap-xml/src/main/webapp/WEB-INF/classes/logback.xml @@ -1,14 +1,12 @@ - + - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + - - - - - + + + diff --git a/samples/openid-jc/src/main/resources/logback.xml b/samples/openid-jc/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/openid-jc/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/openid-xml/src/main/resources/logback.xml b/samples/openid-xml/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/openid-xml/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/preauth-jc/src/main/resources/logback.xml b/samples/preauth-jc/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/preauth-jc/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/preauth-xml/src/main/resources/logback.xml b/samples/preauth-xml/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/preauth-xml/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/rememberme-jc/src/main/resources/logback.xml b/samples/rememberme-jc/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/rememberme-jc/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/servletapi-xml/src/main/resources/logback.xml b/samples/servletapi-xml/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/servletapi-xml/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/tutorial-xml/src/main/resources/logback.xml b/samples/tutorial-xml/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/tutorial-xml/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/samples/tutorial-xml/src/main/webapp/WEB-INF/classes/logback.xml b/samples/tutorial-xml/src/main/webapp/WEB-INF/classes/logback.xml deleted file mode 100644 index a4392fd3e2..0000000000 --- a/samples/tutorial-xml/src/main/webapp/WEB-INF/classes/logback.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - diff --git a/samples/x509-jc/src/main/resources/logback.xml b/samples/x509-jc/src/main/resources/logback.xml new file mode 100644 index 0000000000..3ebbcc0ddd --- /dev/null +++ b/samples/x509-jc/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + +