Browse Source

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
5.2.x
Eleftheria Stein 4 years ago
parent
commit
3a3399d388
  1. 4
      samples/javaconfig/concurrency/spring-security-samples-javaconfig-concurrency.gradle
  2. 4
      samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle
  3. 4
      samples/javaconfig/hellojs/spring-security-samples-javaconfig-hellojs.gradle
  4. 4
      samples/javaconfig/hellomvc/spring-security-samples-javaconfig-hellomvc.gradle
  5. 4
      samples/javaconfig/helloworld/spring-security-samples-javaconfig-helloworld.gradle
  6. 4
      samples/javaconfig/inmemory/spring-security-samples-javaconfig-inmemory.gradle
  7. 4
      samples/javaconfig/jdbc/spring-security-samples-javaconfig-jdbc.gradle
  8. 4
      samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle
  9. 4
      samples/javaconfig/messages/spring-security-samples-javaconfig-messages.gradle
  10. 4
      samples/javaconfig/openid/spring-security-samples-javaconfig-openid.gradle
  11. 4
      samples/javaconfig/preauth/spring-security-samples-javaconfig-preauth.gradle
  12. 4
      samples/javaconfig/rememberme/spring-security-samples-javaconfig-rememberme.gradle
  13. 4
      samples/javaconfig/saml2login/spring-security-samples-javaconfig-saml2-login.gradle
  14. 4
      samples/javaconfig/x509/spring-security-samples-javaconfig-x509.gradle
  15. 1
      samples/xml/cas/cassample/spring-security-samples-xml-cassample.gradle
  16. 12
      samples/xml/cas/cassample/src/main/resources/logback.xml
  17. 1
      samples/xml/cas/casserver/spring-security-samples-xml-casserver.gradle
  18. 12
      samples/xml/cas/casserver/src/main/resources/logback.xml
  19. 4
      samples/xml/contacts/spring-security-samples-xml-contacts.gradle
  20. 4
      samples/xml/helloworld/spring-security-samples-xml-helloworld.gradle
  21. 4
      samples/xml/insecure/spring-security-samples-xml-insecure.gradle
  22. 12
      samples/xml/insecure/src/main/resources/logback.xml
  23. 4
      samples/xml/insecuremvc/spring-security-samples-xml-insecuremvc.gradle
  24. 12
      samples/xml/insecuremvc/src/main/resources/logback.xml
  25. 4
      samples/xml/jaas/spring-security-samples-xml-jaas.gradle
  26. 4
      samples/xml/ldap/spring-security-samples-xml-ldap.gradle
  27. 4
      samples/xml/openid/spring-security-samples-xml-openid.gradle
  28. 4
      samples/xml/preauth/spring-security-samples-xml-preauth.gradle
  29. 4
      samples/xml/servletapi/spring-security-samples-xml-servletapi.gradle
  30. 4
      samples/xml/tutorial/spring-security-samples-xml-tutorial.gradle

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

@ -18,3 +18,7 @@ dependencies { @@ -18,3 +18,7 @@ dependencies {
runtime 'ch.qos.logback:logback-classic'
runtime 'opensymphony:sitemesh'
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -38,3 +38,7 @@ dependencies { @@ -38,3 +38,7 @@ dependencies {
integrationTestCompile seleniumDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -18,3 +18,7 @@ dependencies { @@ -18,3 +18,7 @@ dependencies {
runtime 'opensymphony:sitemesh'
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -20,3 +20,7 @@ dependencies { @@ -20,3 +20,7 @@ dependencies {
testCompile project(':spring-security-test')
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -27,3 +27,7 @@ dependencies { @@ -27,3 +27,7 @@ dependencies {
integrationTestCompile seleniumDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -20,3 +20,7 @@ dependencies { @@ -20,3 +20,7 @@ dependencies {
testCompile project(':spring-security-test')
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -39,3 +39,7 @@ dependencies { @@ -39,3 +39,7 @@ dependencies {
integrationTestCompile seleniumDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -37,3 +37,7 @@ dependencies { @@ -37,3 +37,7 @@ dependencies {
integrationTestCompile seleniumDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -29,3 +29,7 @@ dependencies { @@ -29,3 +29,7 @@ dependencies {
providedCompile 'javax.servlet:javax.servlet-api'
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -20,3 +20,7 @@ dependencies { @@ -20,3 +20,7 @@ dependencies {
runtime 'net.sourceforge.nekohtml:nekohtml'
runtime 'opensymphony:sitemesh'
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -17,3 +17,7 @@ dependencies { @@ -17,3 +17,7 @@ dependencies {
runtime 'opensymphony:sitemesh'
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -17,3 +17,7 @@ dependencies { @@ -17,3 +17,7 @@ dependencies {
runtime 'opensymphony:sitemesh'
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -9,3 +9,7 @@ dependencies { @@ -9,3 +9,7 @@ dependencies {
testCompile project(':spring-security-test')
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -17,3 +17,7 @@ dependencies { @@ -17,3 +17,7 @@ dependencies {
runtime 'opensymphony:sitemesh'
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -65,6 +65,7 @@ gretty { @@ -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() {

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

@ -0,0 +1,12 @@ @@ -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>

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

@ -53,4 +53,5 @@ gretty { @@ -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"
}

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

@ -0,0 +1,12 @@ @@ -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>

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

@ -41,3 +41,7 @@ dependencies { @@ -41,3 +41,7 @@ dependencies {
integrationTestCompile seleniumDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -31,3 +31,7 @@ dependencies { @@ -31,3 +31,7 @@ dependencies {
integrationTestCompile seleniumDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -26,3 +26,7 @@ dependencies { @@ -26,3 +26,7 @@ dependencies {
integrationTestCompile seleniumDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -0,0 +1,12 @@ @@ -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>

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

@ -15,3 +15,7 @@ dependencies { @@ -15,3 +15,7 @@ dependencies {
runtime 'opensymphony:sitemesh'
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -0,0 +1,12 @@ @@ -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>

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

@ -31,3 +31,7 @@ dependencies { @@ -31,3 +31,7 @@ dependencies {
integrationTestCompile seleniumDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -29,3 +29,7 @@ dependencies { @@ -29,3 +29,7 @@ dependencies {
integrationTestCompile seleniumDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -12,3 +12,7 @@ dependencies { @@ -12,3 +12,7 @@ dependencies {
runtime jstlDependencies
runtime slf4jDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -14,3 +14,7 @@ dependencies { @@ -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"
}

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

@ -19,3 +19,7 @@ dependencies { @@ -19,3 +19,7 @@ dependencies {
}
eclipse.wtp.component.contextPath = 'servletapi'
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

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

@ -14,3 +14,7 @@ dependencies { @@ -14,3 +14,7 @@ dependencies {
runtime project(':spring-security-web')
runtime jstlDependencies
}
gretty {
logbackConfigFile = "src/main/resources/logback.xml"
}

Loading…
Cancel
Save