Make gretty samples compatible with logback 1.2.9

Explicitly reference the logback.xml file to prevent gretty from configuring the defaults using groovy. Issue gh-10642
2021-12-20 19:06:45 +02:00 · 2021-12-20 19:06:45 +02:00 · 3a3399d388
parent 0e06882b3f
commit 3a3399d388
30 changed files with 146 additions and 0 deletions
--- a/samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle
+++ b/samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle
@ -18,3 +18,7 @@ dependencies {
 	runtime 'ch.qos.logback:logback-classic'
 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle
+++ b/samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle
@ -38,3 +38,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle
+++ b/samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle
@ -18,3 +18,7 @@ dependencies {

 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle
+++ b/samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle
@ -20,3 +20,7 @@ dependencies {

 	testCompile project(':spring-security-test')
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle
+++ b/samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle
@ -27,3 +27,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/inmemory/spring-security-samples-javaconfig-inmemory.gradle
+++ b/samples/javaconfig/inmemory/spring-security-samples-javaconfig-inmemory.gradle
@ -20,3 +20,7 @@ dependencies {

 	testCompile project(':spring-security-test')
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/jdbc/spring-security-samples-javaconfig-jdbc.gradle
+++ b/samples/javaconfig/jdbc/spring-security-samples-javaconfig-jdbc.gradle
@ -39,3 +39,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle
+++ b/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle
@ -37,3 +37,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle
+++ b/samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle
@ -29,3 +29,7 @@ dependencies {

 	providedCompile 'javax.servlet:javax.servlet-api'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle
+++ b/samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle
@ -20,3 +20,7 @@ dependencies {
 	runtime 'net.sourceforge.nekohtml:nekohtml'
 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle
+++ b/samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle
@ -17,3 +17,7 @@ dependencies {

 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle
+++ b/samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle
@ -17,3 +17,7 @@ dependencies {

 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2-login.gradle
+++ b/samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2-login.gradle
@ -9,3 +9,7 @@ dependencies {

 	testCompile project(':spring-security-test')
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle
+++ b/samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle
@ -17,3 +17,7 @@ dependencies {

 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle
+++ b/samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle
@ -65,6 +65,7 @@ gretty {
 	sslKeyStorePath = keystore
 	sslKeyStorePassword = password
 	jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
+	logbackConfigFile = "src/main/resources/logback.xml"
 }

 def casServer() {
--- a/samples/xml/cas/cassample/src/main/resources/logback.xml
+++ b/samples/xml/cas/cassample/src/main/resources/logback.xml
@ -0,0 +1,12 @@
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+	<encoder>
+		<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+	</encoder>
+	</appender>
+
+	<root level="WARN">
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>
--- a/samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle
+++ b/samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle
@ -53,4 +53,5 @@ gretty {
 	sslKeyStorePath = keystore
 	sslKeyStorePassword = password
 	jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
+	logbackConfigFile = "src/main/resources/logback.xml"
 }
--- a/samples/xml/cas/casserver/src/main/resources/logback.xml
+++ b/samples/xml/cas/casserver/src/main/resources/logback.xml
@ -0,0 +1,12 @@
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+	<encoder>
+		<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+	</encoder>
+	</appender>
+
+	<root level="WARN">
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>
--- a/samples/xml/contacts/spring-security-samples-xml-contacts.gradle
+++ b/samples/xml/contacts/spring-security-samples-xml-contacts.gradle
@ -41,3 +41,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle
+++ b/samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle
@ -31,3 +31,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/insecure/spring-security-samples-xml-insecure.gradle
+++ b/samples/xml/insecure/spring-security-samples-xml-insecure.gradle
@ -26,3 +26,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/insecure/src/main/resources/logback.xml
+++ b/samples/xml/insecure/src/main/resources/logback.xml
@ -0,0 +1,12 @@
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+	<encoder>
+		<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+	</encoder>
+	</appender>
+
+	<root level="WARN">
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>
--- a/samples/xml/insecuremvc/spring-security-samples-xml-insecuremvc.gradle
+++ b/samples/xml/insecuremvc/spring-security-samples-xml-insecuremvc.gradle
@ -15,3 +15,7 @@ dependencies {

 	runtime 'opensymphony:sitemesh'
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/insecuremvc/src/main/resources/logback.xml
+++ b/samples/xml/insecuremvc/src/main/resources/logback.xml
@ -0,0 +1,12 @@
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+	<encoder>
+		<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+	</encoder>
+	</appender>
+
+	<root level="WARN">
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>
--- a/samples/xml/jaas/spring-security-samples-xml-jaas.gradle
+++ b/samples/xml/jaas/spring-security-samples-xml-jaas.gradle
@ -31,3 +31,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/ldap/spring-security-samples-xml-ldap.gradle
+++ b/samples/xml/ldap/spring-security-samples-xml-ldap.gradle
@ -29,3 +29,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/openid/spring-security-samples-xml-openid.gradle
+++ b/samples/xml/openid/spring-security-samples-xml-openid.gradle
@ -12,3 +12,7 @@ dependencies {
 	runtime jstlDependencies
 	runtime slf4jDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/preauth/spring-security-samples-xml-preauth.gradle
+++ b/samples/xml/preauth/spring-security-samples-xml-preauth.gradle
@ -14,3 +14,7 @@ dependencies {
 //jettyRun {
 //	userRealms = [jettyRun.class.classLoader.loadClass('org.mortbay.jetty.security.HashUserRealm').newInstance('Preauth Realm' '$projectDir/realm.properties')]
 //}
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle
+++ b/samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle
@ -19,3 +19,7 @@ dependencies {
 }

 eclipse.wtp.component.contextPath = 'servletapi'
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}
--- a/samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle
+++ b/samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle
@ -14,3 +14,7 @@ dependencies {
 	runtime project(':spring-security-web')
 	runtime jstlDependencies
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}