Skip to content

Commit 3a3399d

Browse files
eleftheriaseleftherias
committed
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
1 parent 0e06882 commit 3a3399d

File tree

30 files changed

+146
-0
lines changed

30 files changed

+146
-0
lines changed

‎samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ dependencies {
1818
runtime 'ch.qos.logback:logback-classic'
1919
runtime 'opensymphony:sitemesh'
2020
}
21+
22+
gretty {
23+
logbackConfigFile = "src/main/resources/logback.xml"
24+
}

‎samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ dependencies {
3838

3939
integrationTestCompile seleniumDependencies
4040
}
41+
42+
gretty {
43+
logbackConfigFile = "src/main/resources/logback.xml"
44+
}

‎samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ dependencies {
1818

1919
runtime 'opensymphony:sitemesh'
2020
}
21+
22+
gretty {
23+
logbackConfigFile = "src/main/resources/logback.xml"
24+
}

‎samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ dependencies {
2020

2121
testCompile project(':spring-security-test')
2222
}
23+
24+
gretty {
25+
logbackConfigFile = "src/main/resources/logback.xml"
26+
}

‎samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,7 @@ dependencies {
2727

2828
integrationTestCompile seleniumDependencies
2929
}
30+
31+
gretty {
32+
logbackConfigFile = "src/main/resources/logback.xml"
33+
}

‎samples/javaconfig/inmemory/spring-security-samples-javaconfig-inmemory.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ dependencies {
2020

2121
testCompile project(':spring-security-test')
2222
}
23+
24+
gretty {
25+
logbackConfigFile = "src/main/resources/logback.xml"
26+
}

‎samples/javaconfig/jdbc/spring-security-samples-javaconfig-jdbc.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@ dependencies {
3939

4040
integrationTestCompile seleniumDependencies
4141
}
42+
43+
gretty {
44+
logbackConfigFile = "src/main/resources/logback.xml"
45+
}

‎samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ dependencies {
3737

3838
integrationTestCompile seleniumDependencies
3939
}
40+
41+
gretty {
42+
logbackConfigFile = "src/main/resources/logback.xml"
43+
}

‎samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ dependencies {
2929

3030
providedCompile 'javax.servlet:javax.servlet-api'
3131
}
32+
33+
gretty {
34+
logbackConfigFile = "src/main/resources/logback.xml"
35+
}

‎samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ dependencies {
2020
runtime 'net.sourceforge.nekohtml:nekohtml'
2121
runtime 'opensymphony:sitemesh'
2222
}
23+
24+
gretty {
25+
logbackConfigFile = "src/main/resources/logback.xml"
26+
}

‎samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ dependencies {
1717

1818
runtime 'opensymphony:sitemesh'
1919
}
20+
21+
gretty {
22+
logbackConfigFile = "src/main/resources/logback.xml"
23+
}

‎samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ dependencies {
1717

1818
runtime 'opensymphony:sitemesh'
1919
}
20+
21+
gretty {
22+
logbackConfigFile = "src/main/resources/logback.xml"
23+
}

‎samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2-login.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ dependencies {
99

1010
testCompile project(':spring-security-test')
1111
}
12+
13+
gretty {
14+
logbackConfigFile = "src/main/resources/logback.xml"
15+
}

‎samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ dependencies {
1717

1818
runtime 'opensymphony:sitemesh'
1919
}
20+
21+
gretty {
22+
logbackConfigFile = "src/main/resources/logback.xml"
23+
}

‎samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ gretty {
6565
sslKeyStorePath = keystore
6666
sslKeyStorePassword = password
6767
jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
68+
logbackConfigFile = "src/main/resources/logback.xml"
6869
}
6970

7071
def casServer() {

‎samples/xml/cas/cassample/src/main/resources/logback.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<root level="WARN">
9+
<appender-ref ref="STDOUT" />
10+
</root>
11+
12+
</configuration>

‎samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,5 @@ gretty {
5353
sslKeyStorePath = keystore
5454
sslKeyStorePassword = password
5555
jvmArgs = ["-Djavax.net.ssl.trustStore=${keystore}", "-Djavax.net.ssl.trustStorePassword=${password}"]
56+
logbackConfigFile = "src/main/resources/logback.xml"
5657
}

‎samples/xml/cas/casserver/src/main/resources/logback.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<root level="WARN">
9+
<appender-ref ref="STDOUT" />
10+
</root>
11+
12+
</configuration>

‎samples/xml/contacts/spring-security-samples-xml-contacts.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ dependencies {
4141

4242
integrationTestCompile seleniumDependencies
4343
}
44+
45+
gretty {
46+
logbackConfigFile = "src/main/resources/logback.xml"
47+
}

‎samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ dependencies {
3131

3232
integrationTestCompile seleniumDependencies
3333
}
34+
35+
gretty {
36+
logbackConfigFile = "src/main/resources/logback.xml"
37+
}

‎samples/xml/insecure/spring-security-samples-xml-insecure.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ dependencies {
2626

2727
integrationTestCompile seleniumDependencies
2828
}
29+
30+
gretty {
31+
logbackConfigFile = "src/main/resources/logback.xml"
32+
}

‎samples/xml/insecure/src/main/resources/logback.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<root level="WARN">
9+
<appender-ref ref="STDOUT" />
10+
</root>
11+
12+
</configuration>

‎samples/xml/insecuremvc/spring-security-samples-xml-insecuremvc.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ dependencies {
1515

1616
runtime 'opensymphony:sitemesh'
1717
}
18+
19+
gretty {
20+
logbackConfigFile = "src/main/resources/logback.xml"
21+
}

‎samples/xml/insecuremvc/src/main/resources/logback.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<root level="WARN">
9+
<appender-ref ref="STDOUT" />
10+
</root>
11+
12+
</configuration>

‎samples/xml/jaas/spring-security-samples-xml-jaas.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ dependencies {
3131

3232
integrationTestCompile seleniumDependencies
3333
}
34+
35+
gretty {
36+
logbackConfigFile = "src/main/resources/logback.xml"
37+
}

‎samples/xml/ldap/spring-security-samples-xml-ldap.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ dependencies {
2929

3030
integrationTestCompile seleniumDependencies
3131
}
32+
33+
gretty {
34+
logbackConfigFile = "src/main/resources/logback.xml"
35+
}

‎samples/xml/openid/spring-security-samples-xml-openid.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ dependencies {
1212
runtime jstlDependencies
1313
runtime slf4jDependencies
1414
}
15+
16+
gretty {
17+
logbackConfigFile = "src/main/resources/logback.xml"
18+
}

‎samples/xml/preauth/spring-security-samples-xml-preauth.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ dependencies {
1414
//jettyRun {
1515
// userRealms = [jettyRun.class.classLoader.loadClass('org.mortbay.jetty.security.HashUserRealm').newInstance('Preauth Realm' '$projectDir/realm.properties')]
1616
//}
17+
18+
gretty {
19+
logbackConfigFile = "src/main/resources/logback.xml"
20+
}

‎samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ dependencies {
1919
}
2020

2121
eclipse.wtp.component.contextPath = 'servletapi'
22+
23+
gretty {
24+
logbackConfigFile = "src/main/resources/logback.xml"
25+
}

‎samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ dependencies {
1414
runtime project(':spring-security-web')
1515
runtime jstlDependencies
1616
}
17+
18+
gretty {
19+
logbackConfigFile = "src/main/resources/logback.xml"
20+
}

0 commit comments

Comments
 (0)