Browse Source

Added missing gradle build files for remaining samples. Some related reordering, dependency fixing etc. CAS sample no longer requires two separate subprojects as both client and server app can be run from a single gradle build.

pull/1/head
Luke Taylor 16 years ago
parent
commit
2d9a848265
  1. 3
      config/config.gradle
  2. 5
      gradle/javaprojects.gradle
  3. 2
      openid/openid.gradle
  4. 54
      samples/cas/cas.gradle
  5. 101
      samples/cas/client/pom.xml
  6. 19
      samples/cas/client/src/main/webapp/WEB-INF/classes/log4j.properties
  7. 16
      samples/cas/pom.xml
  8. 47
      samples/cas/server/pom.xml
  9. 0
      samples/cas/src/main/java/Dummy.java
  10. 0
      samples/cas/src/main/webapp/WEB-INF/applicationContext-security.xml
  11. 9
      samples/cas/src/main/webapp/WEB-INF/web.xml
  12. 0
      samples/cas/src/main/webapp/cas-logout.jsp
  13. 0
      samples/cas/src/main/webapp/casfailed.jsp
  14. 0
      samples/cas/src/main/webapp/index.jsp
  15. 0
      samples/cas/src/main/webapp/secure/extreme/index.jsp
  16. 0
      samples/cas/src/main/webapp/secure/index.jsp
  17. 7
      samples/contacts/contacts.gradle
  18. 20
      samples/contacts/src/main/webapp/WEB-INF/classes/log4j.properties
  19. 9
      samples/contacts/src/main/webapp/WEB-INF/web.xml
  20. 16
      samples/dms/dms.gradle
  21. 6
      samples/dms/src/main/resources/applicationContext-dms-insecure.xml
  22. 8
      samples/dms/src/main/resources/applicationContext-dms-secure.xml
  23. 9
      samples/dms/src/main/resources/applicationContext-dms-shared.xml
  24. 17
      samples/ldap/ldap.gradle
  25. 18
      samples/ldap/src/main/webapp/WEB-INF/classes/log4j.properties
  26. 14
      samples/ldap/src/main/webapp/WEB-INF/classes/logback.xml
  27. 9
      samples/openid/openid.gradle
  28. 12
      samples/openid/src/main/webapp/WEB-INF/classes/log4j.properties
  29. 9
      samples/openid/src/main/webapp/WEB-INF/web.xml
  30. 1
      samples/pom.xml
  31. 17
      samples/preauth/preauth.gradle
  32. 20
      samples/preauth/src/main/webapp/WEB-INF/classes/log4j.properties
  33. 1
      samples/tutorial/tutorial.gradle
  34. 8
      settings.gradle

3
config/config.gradle

@ -26,7 +26,8 @@ dependencies { @@ -26,7 +26,8 @@ dependencies {
"org.springframework.ldap:spring-ldap-core:$springLdapVersion",
"org.springframework:spring-jdbc:$springVersion",
"org.springframework:spring-tx:$springVersion",
'org.spockframework:spock-core:0.4-groovy-1.7'
'org.spockframework:spock-core:0.4-groovy-1.7',
"org.slf4j:jcl-over-slf4j:$slf4jVersion"
testRuntime "hsqldb:hsqldb:$hsqlVersion",
"cglib:cglib-nodep:2.2"

5
gradle/javaprojects.gradle

@ -20,6 +20,7 @@ configurations { @@ -20,6 +20,7 @@ configurations {
provided
compile.extendsFrom provided
compile.transitive = false
testCompile.transitive = false
}
dependencies {
@ -38,9 +39,7 @@ dependencies { @@ -38,9 +39,7 @@ dependencies {
"org.springframework:spring-test:$springVersion"
// Use slf4j/logback for logging
testRuntime "org.slf4j:slf4j-api:$slf4jVersion",
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-core:$logbackVersion",
testRuntime "org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion"
}

2
openid/openid.gradle

@ -12,4 +12,4 @@ dependencies { @@ -12,4 +12,4 @@ dependencies {
provided 'javax.servlet:servlet-api:2.5'
runtime 'commons-httpclient:commons-httpclient:3.1'
}
}

54
samples/cas/cas.gradle

@ -1,9 +1,55 @@ @@ -1,9 +1,55 @@
// CAS sample build file
apply plugin: 'war'
apply plugin: 'jetty'
configurations {
casServer
}
dependencies {
runtime project(':spring-security-core'),
project(':spring-security-web'),
casServer "org.jasig.cas:cas-server-webapp:3.4.2.1@war"
runtime project(':spring-security-web'),
project(':spring-security-cas'),
project(':spring-security-config'),
'log4j:log4j:1.2.15@jar'
}
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion"
}
def keystore = "$rootDir/samples/certificates/server.jks"
jettyRun {
contextPath = "/cas"
def httpConnector = new org.mortbay.jetty.nio.SelectChannelConnector();
httpConnector.port = 8080
httpConnector.confidentialPort = 8443
def httpsConnector = new org.mortbay.jetty.security.SslSocketConnector();
httpsConnector.port = 8443
httpsConnector.keystore = httpsConnector.truststore = keystore
httpsConnector.keyPassword = httpsConnector.trustPassword = 'password'
connectors = [httpConnector, httpsConnector]
}
task casServer (type: org.gradle.api.plugins.jetty.JettyRunWar) {
contextPath = "/cas"
connectors = [new org.mortbay.jetty.security.SslSocketConnector()]
connectors[0].port = 9443
connectors[0].keystore = connectors[0].truststore = keystore
connectors[0].keyPassword = connectors[0].trustPassword = 'password'
connectors[0].wantClientAuth = true
connectors[0].needClientAuth = false
webApp = configurations.casServer.resolve().toArray()[0]
doFirst() {
System.setProperty('javax.net.ssl.trustStore', keystore)
System.setProperty('javax.net.ssl.trustStorePassword', 'password')
}
}
task cas (dependsOn: jettyRun) {
jettyRun.dependsOn(casServer)
casServer.daemon = true
}

101
samples/cas/client/pom.xml

@ -1,101 +0,0 @@ @@ -1,101 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas</artifactId>
<version>3.1.0.CI-SNAPSHOT</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas-client</artifactId>
<name>Spring Security - CAS Sample Client Web Application</name>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-cas-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.3</version>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
<contextPath>/cas-sample</contextPath>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8080</port>
<confidentialPort>8443</confidentialPort>
</connector>
<connector implementation="org.mortbay.jetty.security.SslSocketConnector">
<port>8443</port>
<keystore>../../certificates/server.jks</keystore>
<password>password</password>
<keyPassword>password</keyPassword>
<truststore>../../certificates/server.jks</truststore>
<trustPassword>password</trustPassword>
</connector>
</connectors>
<systemProperties>
<systemProperty>
<name>javax.net.ssl.trustStore</name>
<value>../../certificates/server.jks</value>
</systemProperty>
<systemProperty>
<name>javax.net.ssl.trustStorePassword</name>
<value>password</value>
</systemProperty>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
</project>

19
samples/cas/client/src/main/webapp/WEB-INF/classes/log4j.properties

@ -1,19 +0,0 @@ @@ -1,19 +0,0 @@
# Global logging configuration
log4j.rootLogger=INFO, stdout, fileout
log4j.logger.org.springframework.security=DEBUG
# Console output...
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n
# Rolling log file output...
log4j.appender.fileout=org.apache.log4j.RollingFileAppender
log4j.appender.fileout.File=spring-security-cas-client.log
log4j.appender.fileout.MaxFileSize=1024KB
log4j.appender.fileout.MaxBackupIndex=1
log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
log4j.appender.fileout.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n

16
samples/cas/pom.xml

@ -1,16 +0,0 @@ @@ -1,16 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples</artifactId>
<version>3.1.0.CI-SNAPSHOT</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas</artifactId>
<name>Spring Security - CAS Sample Parent</name>
<packaging>pom</packaging>
<modules>
<module>client</module>
<module>server</module>
</modules>
</project>

47
samples/cas/server/pom.xml

@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas</artifactId>
<version>3.1.0.CI-SNAPSHOT</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas-server</artifactId>
<name>Spring Security - CAS Server for CAS Sample Application</name>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
<contextPath>/cas</contextPath>
<webApp>${basedir}/cas-server-webapp-3.3.5.war</webApp>
<connectors>
<connector implementation="org.mortbay.jetty.security.SslSocketConnector">
<port>9443</port>
<keystore>../../certificates/server.jks</keystore>
<password>password</password>
<keyPassword>password</keyPassword>
<truststore>../../certificates/server.jks</truststore>
<trustPassword>password</trustPassword>
<wantClientAuth>true</wantClientAuth>
<needClientAuth>false</needClientAuth>
</connector>
</connectors>
<systemProperties>
<systemProperty>
<name>javax.net.ssl.trustStore</name>
<value>../../certificates/server.jks</value>
</systemProperty>
<systemProperty>
<name>javax.net.ssl.trustStorePassword</name>
<value>password</value>
</systemProperty>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
</project>

0
samples/cas/client/src/main/java/Dummy.java → samples/cas/src/main/java/Dummy.java

0
samples/cas/client/src/main/webapp/WEB-INF/applicationContext-security.xml → samples/cas/src/main/webapp/WEB-INF/applicationContext-security.xml

9
samples/cas/client/src/main/webapp/WEB-INF/web.xml → samples/cas/src/main/webapp/WEB-INF/web.xml

@ -21,11 +21,6 @@ @@ -21,11 +21,6 @@
</param-value>
</context-param>
<context-param>
<param-name>log4jConfigLocation</param-name>
<param-value>/WEB-INF/classes/log4j.properties</param-value>
</context-param>
<context-param>
<param-name>webAppRootKey</param-name>
<param-value>cas.root</param-value>
@ -64,10 +59,6 @@ @@ -64,10 +59,6 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
</listener>
<error-page>
<error-code>403</error-code>
<location>/casfailed.jsp</location>

0
samples/cas/client/src/main/webapp/cas-logout.jsp → samples/cas/src/main/webapp/cas-logout.jsp

0
samples/cas/client/src/main/webapp/casfailed.jsp → samples/cas/src/main/webapp/casfailed.jsp

0
samples/cas/client/src/main/webapp/index.jsp → samples/cas/src/main/webapp/index.jsp

0
samples/cas/client/src/main/webapp/secure/extreme/index.jsp → samples/cas/src/main/webapp/secure/extreme/index.jsp

0
samples/cas/client/src/main/webapp/secure/index.jsp → samples/cas/src/main/webapp/secure/index.jsp

7
samples/contacts/contacts.gradle

@ -23,9 +23,10 @@ dependencies { @@ -23,9 +23,10 @@ dependencies {
"org.springframework:spring-context-support:$springVersion",
"net.sf.ehcache:ehcache:$ehcacheVersion",
"hsqldb:hsqldb:$hsqlVersion",
'log4j:log4j:1.2.15@jar'
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion"
}
jettyRun {
contextPath = "/tutorial"
}
contextPath = "/contacts"
}

20
samples/contacts/src/main/webapp/WEB-INF/classes/log4j.properties

@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
# Global logging configuration
log4j.rootLogger=INFO, stdout, fileout
log4j.logger.sample.contact=DEBUG
log4j.logger.org.springframework.web.*=DEBUG
log4j.logger.org.springframework.security=DEBUG
# Console output...
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n
# Rolling log file output...
log4j.appender.fileout=org.apache.log4j.RollingFileAppender
log4j.appender.fileout.File=contacts.log
#log4j.appender.fileout.File=${webapp.root}/WEB-INF/log4j.log
log4j.appender.fileout.MaxFileSize=1024KB
log4j.appender.fileout.MaxBackupIndex=1
log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
log4j.appender.fileout.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n

9
samples/contacts/src/main/webapp/WEB-INF/web.xml

@ -26,11 +26,6 @@ @@ -26,11 +26,6 @@
<!-- Nothing below here needs to be modified -->
<context-param>
<param-name>log4jConfigLocation</param-name>
<param-value>/WEB-INF/classes/log4j.properties</param-value>
</context-param>
<context-param>
<param-name>webAppRootKey</param-name>
<param-value>contacts.root</param-value>
@ -55,10 +50,6 @@ @@ -55,10 +50,6 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
</listener>
<!--
- Provides core MVC application controller. See contacts-servlet.xml.
-->

16
samples/dms/dms.gradle

@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
dependencies {
compile project(':spring-security-core'),
project(':spring-security-acl'),
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-tx:$springVersion",
"org.springframework:spring-jdbc:$springVersion"
testCompile "org.springframework:spring-context:$springVersion"
runtime project(':spring-security-config'),
"hsqldb:hsqldb:$hsqlVersion",
"net.sf.ehcache:ehcache:$ehcacheVersion",
"org.springframework:spring-context-support:$springVersion"
}

6
samples/dms/src/main/resources/applicationContext-dms-insecure.xml

@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
- Application context representing the application without any security services.
-
-->
<beans>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
<property name="dataSource" ref="dataSource"/>

8
samples/dms/src/main/resources/applicationContext-dms-secure.xml

@ -86,13 +86,13 @@ @@ -86,13 +86,13 @@
<!-- ACL permission masks used by this application -->
<bean id="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
<property name="staticField"><value>org.springframework.security.acls.domain.BasePermission.ADMINISTRATION</value></property>
<property name="staticField" value="org.springframework.security.acls.domain.BasePermission.ADMINISTRATION"/>
</bean>
<bean id="org.springframework.security.acls.domain.BasePermission.READ" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
<property name="staticField"><value>org.springframework.security.acls.domain.BasePermission.READ</value></property>
<property name="staticField" value="org.springframework.security.acls.domain.BasePermission.READ"/>
</bean>
<bean id="org.springframework.security.acls.domain.BasePermission.WRITE" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
<property name="staticField"><value>org.springframework.security.acls.domain.BasePermission.WRITE</value></property>
<property name="staticField" value="org.springframework.security.acls.domain.BasePermission.WRITE"/>
</bean>
@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
<ref local="org.springframework.security.acls.domain.BasePermission.WRITE"/>
</list>
</constructor-arg>
<property name="processDomainObjectClass"><value>sample.dms.AbstractElement</value></property>
<property name="processDomainObjectClass" value="sample.dms.AbstractElement"/>
</bean>
<!-- An access decision manager used by the business objects -->

9
samples/dms/src/main/resources/applicationContext-dms-shared.xml

@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
- Application context representing the transaction, auto proxy and data source beans.
-
-->
<beans>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource"><ref bean="dataSource"/></property>
<property name="dataSource" ref="dataSource"/>
</bean>
<bean id="autoproxy" class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator" />

17
samples/ldap/ldap.gradle

@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
// LDAP sample build file
apply plugin: 'war'
apply plugin: 'jetty'
dependencies {
runtime project(':spring-security-web'),
project(':spring-security-config'),
project(':spring-security-ldap'),
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion"
}
jettyRun {
contextPath = "/ldap"
}

18
samples/ldap/src/main/webapp/WEB-INF/classes/log4j.properties

@ -1,18 +0,0 @@ @@ -1,18 +0,0 @@
# Global logging configuration
log4j.rootLogger=INFO, stdout, fileout
log4j.logger.org.springframework.security=DEBUG
# Console output...
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n
# Rolling log file output...
log4j.appender.fileout=org.apache.log4j.FileAppender
log4j.appender.fileout.File=spring-security-ldap.log
log4j.appender.fileout.Append=false
log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
log4j.appender.fileout.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n

14
samples/ldap/src/main/webapp/WEB-INF/classes/logback.xml

@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
<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>
<logger name="org.apache.directory" level="WARN"/>
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
</configuration>

9
samples/openid/openid.gradle

@ -12,5 +12,10 @@ dependencies { @@ -12,5 +12,10 @@ dependencies {
runtime project(':spring-security-web'),
project(':spring-security-config'),
project(':spring-security-taglibs'),
'log4j:log4j:1.2.15@jar'
}
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion"
}
jettyRun {
contextPath = "/openid"
}

12
samples/openid/src/main/webapp/WEB-INF/classes/log4j.properties

@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
# Global logging configuration
log4j.rootLogger=INFO, stdout
log4j.logger.org.springframework.security=DEBUG
# Console output...
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.conversionPattern=[%p,%c{1}] %m%n

9
samples/openid/src/main/webapp/WEB-INF/web.xml

@ -21,11 +21,6 @@ @@ -21,11 +21,6 @@
</param-value>
</context-param>
<context-param>
<param-name>log4jConfigLocation</param-name>
<param-value>/WEB-INF/classes/log4j.properties</param-value>
</context-param>
<context-param>
<param-name>webAppRootKey</param-name>
<param-value>openid.root</param-value>
@ -50,8 +45,4 @@ @@ -50,8 +45,4 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
</listener>
</web-app>

1
samples/pom.xml

@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
<module>preauth</module>
<module>openid</module>
<module>ldap</module>
<module>cas</module>
<module>aspectj</module>
</modules>
<dependencies>

17
samples/preauth/preauth.gradle

@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
// Preauth sample build file
apply plugin: 'war'
apply plugin: 'jetty'
dependencies {
runtime project(':spring-security-web'),
project(':spring-security-config'),
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
"ch.qos.logback:logback-classic:$logbackVersion"
}
jettyRun {
contextPath = "/preauth"
userRealms = [new org.mortbay.jetty.security.HashUserRealm('Preauth Realm', "$projectDir/realm.properties")]
}

20
samples/preauth/src/main/webapp/WEB-INF/classes/log4j.properties

@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
# Global logging configuration
log4j.rootLogger=INFO, stdout, fileout
log4j.logger.org.springframework.security=DEBUG, stdout, fileout
# Console output...
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n
# Rolling log file output...
log4j.appender.fileout=org.apache.log4j.RollingFileAppender
log4j.appender.fileout.File=spring-security-preauth.log
#log4j.appender.fileout.File=${webapp.root}/WEB-INF/log4j.log
log4j.appender.fileout.MaxFileSize=1024KB
log4j.appender.fileout.MaxBackupIndex=1
log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
log4j.appender.fileout.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n

1
samples/tutorial/tutorial.gradle

@ -17,7 +17,6 @@ dependencies { @@ -17,7 +17,6 @@ dependencies {
project(':spring-security-config'),
project(':spring-security-taglibs'),
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
"org.slf4j:slf4j-jdk14:$slf4jVersion",
"ch.qos.logback:logback-core:$logbackVersion",
"ch.qos.logback:logback-classic:$logbackVersion"
}

8
settings.gradle

@ -15,7 +15,11 @@ def String[] samples = [ @@ -15,7 +15,11 @@ def String[] samples = [
'contacts',
'openid',
'aspectj',
'gae'
'gae',
'dms',
'preauth',
'cas',
'ldap'
]
def String[] docs = [
@ -65,4 +69,4 @@ docs.each { name -> @@ -65,4 +69,4 @@ docs.each { name ->
rootProject.children.each {project ->
assert project.projectDir.isDirectory()
assert project.buildFile.isFile()
}
}

Loading…
Cancel
Save