mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-06-30 15:52:15 +00:00
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
This commit is contained in:
parent
0be66d2cc0
commit
3d4ad5fe50
@ -18,3 +18,7 @@ dependencies {
|
|||||||
runtime 'ch.qos.logback:logback-classic'
|
runtime 'ch.qos.logback:logback-classic'
|
||||||
runtime 'opensymphony:sitemesh'
|
runtime 'opensymphony:sitemesh'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -38,3 +38,7 @@ dependencies {
|
|||||||
|
|
||||||
integrationTestCompile seleniumDependencies
|
integrationTestCompile seleniumDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -18,3 +18,7 @@ dependencies {
|
|||||||
|
|
||||||
runtime 'opensymphony:sitemesh'
|
runtime 'opensymphony:sitemesh'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -20,3 +20,7 @@ dependencies {
|
|||||||
|
|
||||||
testCompile project(':spring-security-test')
|
testCompile project(':spring-security-test')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -27,3 +27,7 @@ dependencies {
|
|||||||
|
|
||||||
integrationTestCompile seleniumDependencies
|
integrationTestCompile seleniumDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -20,3 +20,7 @@ dependencies {
|
|||||||
|
|
||||||
testCompile project(':spring-security-test')
|
testCompile project(':spring-security-test')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -39,3 +39,7 @@ dependencies {
|
|||||||
|
|
||||||
integrationTestCompile seleniumDependencies
|
integrationTestCompile seleniumDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -37,3 +37,7 @@ dependencies {
|
|||||||
|
|
||||||
integrationTestCompile seleniumDependencies
|
integrationTestCompile seleniumDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -29,3 +29,7 @@ dependencies {
|
|||||||
|
|
||||||
providedCompile 'javax.servlet:javax.servlet-api'
|
providedCompile 'javax.servlet:javax.servlet-api'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -20,3 +20,7 @@ dependencies {
|
|||||||
runtime 'net.sourceforge.nekohtml:nekohtml'
|
runtime 'net.sourceforge.nekohtml:nekohtml'
|
||||||
runtime 'opensymphony:sitemesh'
|
runtime 'opensymphony:sitemesh'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -17,3 +17,7 @@ dependencies {
|
|||||||
|
|
||||||
runtime 'opensymphony:sitemesh'
|
runtime 'opensymphony:sitemesh'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -17,3 +17,7 @@ dependencies {
|
|||||||
|
|
||||||
runtime 'opensymphony:sitemesh'
|
runtime 'opensymphony:sitemesh'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -7,3 +7,7 @@ dependencies {
|
|||||||
|
|
||||||
testCompile 'org.springframework:spring-test'
|
testCompile 'org.springframework:spring-test'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -17,3 +17,7 @@ dependencies {
|
|||||||
|
|
||||||
runtime 'opensymphony:sitemesh'
|
runtime 'opensymphony:sitemesh'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -54,6 +54,7 @@ gretty {
|
|||||||
sslKeyStorePath = keystore
|
sslKeyStorePath = keystore
|
||||||
sslKeyStorePassword = password
|
sslKeyStorePassword = password
|
||||||
jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
|
jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
}
|
}
|
||||||
|
|
||||||
def casServer() {
|
def casServer() {
|
||||||
|
12
samples/xml/cas/cassample/src/main/resources/logback.xml
Normal file
12
samples/xml/cas/cassample/src/main/resources/logback.xml
Normal file
@ -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>
|
@ -53,4 +53,5 @@ gretty {
|
|||||||
sslKeyStorePath = keystore
|
sslKeyStorePath = keystore
|
||||||
sslKeyStorePassword = password
|
sslKeyStorePassword = password
|
||||||
jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
|
jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
}
|
}
|
||||||
|
12
samples/xml/cas/casserver/src/main/resources/logback.xml
Normal file
12
samples/xml/cas/casserver/src/main/resources/logback.xml
Normal file
@ -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>
|
@ -41,3 +41,7 @@ dependencies {
|
|||||||
|
|
||||||
integrationTestCompile seleniumDependencies
|
integrationTestCompile seleniumDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -31,3 +31,7 @@ dependencies {
|
|||||||
|
|
||||||
integrationTestCompile seleniumDependencies
|
integrationTestCompile seleniumDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -26,3 +26,7 @@ dependencies {
|
|||||||
|
|
||||||
integrationTestCompile seleniumDependencies
|
integrationTestCompile seleniumDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
12
samples/xml/insecure/src/main/resources/logback.xml
Normal file
12
samples/xml/insecure/src/main/resources/logback.xml
Normal file
@ -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>
|
@ -15,3 +15,7 @@ dependencies {
|
|||||||
|
|
||||||
runtime 'opensymphony:sitemesh'
|
runtime 'opensymphony:sitemesh'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
12
samples/xml/insecuremvc/src/main/resources/logback.xml
Normal file
12
samples/xml/insecuremvc/src/main/resources/logback.xml
Normal file
@ -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>
|
@ -31,3 +31,7 @@ dependencies {
|
|||||||
|
|
||||||
integrationTestCompile seleniumDependencies
|
integrationTestCompile seleniumDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -29,3 +29,7 @@ dependencies {
|
|||||||
|
|
||||||
integrationTestCompile seleniumDependencies
|
integrationTestCompile seleniumDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -12,3 +12,7 @@ dependencies {
|
|||||||
runtime jstlDependencies
|
runtime jstlDependencies
|
||||||
runtime slf4jDependencies
|
runtime slf4jDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -14,3 +14,7 @@ dependencies {
|
|||||||
//jettyRun {
|
//jettyRun {
|
||||||
// userRealms = [jettyRun.class.classLoader.loadClass('org.mortbay.jetty.security.HashUserRealm').newInstance('Preauth Realm' '$projectDir/realm.properties')]
|
// userRealms = [jettyRun.class.classLoader.loadClass('org.mortbay.jetty.security.HashUserRealm').newInstance('Preauth Realm' '$projectDir/realm.properties')]
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -19,3 +19,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
eclipse.wtp.component.contextPath = 'servletapi'
|
eclipse.wtp.component.contextPath = 'servletapi'
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
@ -14,3 +14,7 @@ dependencies {
|
|||||||
runtime project(':spring-security-web')
|
runtime project(':spring-security-web')
|
||||||
runtime jstlDependencies
|
runtime jstlDependencies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gretty {
|
||||||
|
logbackConfigFile = "src/main/resources/logback.xml"
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user