Standardize Build
The build now uses spring build conventions to simplify the build Fixes gh-4284
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
apply from: BOOT_SAMPLE_GRADLE
|
||||
|
||||
springBoot {
|
||||
mainClass = 'org.springframework.security.samples.HelloWorldApplication'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.springframework.boot:spring-boot-starter-web",
|
||||
"org.springframework.boot:spring-boot-starter-thymeleaf",
|
||||
"org.thymeleaf.extras:thymeleaf-extras-springsecurity4:2.1.2.RELEASE",
|
||||
project(":spring-security-config"),
|
||||
project(":spring-security-web")
|
||||
|
||||
testCompile "org.springframework.boot:spring-boot-starter-test",
|
||||
project(":spring-security-test")
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-boot'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-web')
|
||||
compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
|
||||
compile 'org.springframework.boot:spring-boot-starter-web'
|
||||
compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4'
|
||||
|
||||
testCompile project(':spring-security-test')
|
||||
testCompile 'org.springframework.boot:spring-boot-starter-test'
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
apply from: BOOT_SAMPLE_GRADLE
|
||||
|
||||
springBoot {
|
||||
mainClass = 'org.springframework.security.samples.InsecureApplication'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.springframework.boot:spring-boot-starter-web",
|
||||
"org.springframework.boot:spring-boot-starter-thymeleaf"
|
||||
|
||||
testCompile "org.springframework.boot:spring-boot-starter-test"
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-boot'
|
||||
|
||||
dependencies {
|
||||
compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
|
||||
compile 'org.springframework.boot:spring-boot-starter-web'
|
||||
|
||||
testCompile 'org.springframework.boot:spring-boot-starter-test'
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-core'),
|
||||
project(':spring-security-config')
|
||||
|
||||
aspectpath project(':spring-security-aspects')
|
||||
|
||||
runtime project(':spring-security-aspects')
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample'
|
||||
apply plugin: 'aspectj'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
|
||||
aspectpath project(':spring-security-aspects')
|
||||
|
||||
runtime project(':spring-security-aspects')
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
|
||||
|
||||
runtime 'ch.qos.logback:logback-classic'
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
dependencies {
|
||||
compile project(':spring-security-data'),
|
||||
project(':spring-security-config'),
|
||||
"org.springframework.data:spring-data-jpa:$springDataJpaVersion",
|
||||
"org.eclipse.persistence:javax.persistence:$javaPersistenceVersion",
|
||||
"org.hibernate:hibernate-entitymanager:$hibernateVersion",
|
||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-data')
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.eclipse.persistence:javax.persistence'
|
||||
compile 'org.hibernate:hibernate-entitymanager'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.hsqldb:hsqldb'
|
||||
compile 'org.springframework.data:spring-data-jpa'
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion",
|
||||
"com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'com.fasterxml.jackson.core:jackson-databind'
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
+4
-3
@@ -17,6 +17,7 @@ package org.springframework.security.samples.mvc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
@@ -51,9 +52,9 @@ public class MessageJsonController {
|
||||
}
|
||||
|
||||
@RequestMapping("{id}")
|
||||
public ResponseEntity<Message> view(@PathVariable Long id) {
|
||||
Message message = messageRepository.findOne(id);
|
||||
return new ResponseEntity<Message>(message, HttpStatus.OK);
|
||||
public ResponseEntity<Optional<Message>> view(@PathVariable Long id) {
|
||||
Optional<Message> message = messageRepository.findOne(id);
|
||||
return new ResponseEntity<>(message, HttpStatus.OK);
|
||||
}
|
||||
|
||||
@RequestMapping(method = RequestMethod.POST, consumes = "application/json")
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
testCompile project(":spring-security-test")
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
testCompile project(':spring-security-test')
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-web"),
|
||||
jstlDependencies,
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion"
|
||||
|
||||
runtime "ch.qos.logback:logback-classic:$logbackVersion"
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-web')
|
||||
compile jstlDependencies
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
testCompile project(":spring-security-test")
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
testCompile project(':spring-security-test')
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-ldap"),
|
||||
apachedsDependencies,
|
||||
project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-ldap')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile apachedsDependencies
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
sonarqube.skipProject = true
|
||||
|
||||
dependencies {
|
||||
provided "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
|
||||
compile project(":spring-security-web"),
|
||||
project(":spring-security-config"),
|
||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion",
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-orm:$springVersion",
|
||||
"org.springframework:spring-context:$springVersion",
|
||||
"org.springframework:spring-aop:$springVersion",
|
||||
"org.springframework:spring-tx:$springVersion",
|
||||
"org.springframework:spring-beans:$springVersion",
|
||||
"org.springframework:spring-instrument:$springVersion",
|
||||
"org.springframework:spring-core:$springVersion",
|
||||
"org.springframework:spring-aspects:$springVersion",
|
||||
"org.thymeleaf:thymeleaf-spring4:$thymeleafVersion",
|
||||
"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.0.4",
|
||||
"org.eclipse.persistence:javax.persistence:$javaPersistenceVersion"
|
||||
compile("org.hibernate:hibernate-entitymanager:$hibernateVersion") {
|
||||
exclude group:'javassist', module: 'javassist'
|
||||
}
|
||||
compile("org.springframework.data:spring-data-jpa:$springDataJpaVersion") {
|
||||
exclude group:'org.aspectj', module:'aspectjrt'
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.0.4'
|
||||
compile 'org.eclipse.persistence:javax.persistence'
|
||||
compile('org.hibernate:hibernate-entitymanager') {
|
||||
exclude group:'javassist', module: 'javassist'
|
||||
}
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.hsqldb:hsqldb'
|
||||
compile('org.springframework.data:spring-data-jpa') {
|
||||
exclude group:'org.aspectj', module:'aspectjrt'
|
||||
}
|
||||
compile 'org.springframework:spring-aop'
|
||||
compile 'org.springframework:spring-aspects'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-core'
|
||||
compile 'org.springframework:spring-instrument'
|
||||
compile 'org.springframework:spring-orm'
|
||||
compile 'org.springframework:spring-tx'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile 'org.thymeleaf:thymeleaf-spring5'
|
||||
|
||||
provided 'javax.servlet:javax.servlet-api'
|
||||
}
|
||||
+4
-4
@@ -28,9 +28,9 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
|
||||
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
|
||||
import org.thymeleaf.TemplateEngine;
|
||||
import org.thymeleaf.spring4.SpringTemplateEngine;
|
||||
import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver;
|
||||
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
|
||||
import org.thymeleaf.spring5.SpringTemplateEngine;
|
||||
import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
|
||||
import org.thymeleaf.spring5.view.ThymeleafViewResolver;
|
||||
import org.thymeleaf.templatemode.TemplateMode;
|
||||
|
||||
@EnableWebMvc
|
||||
@@ -65,7 +65,7 @@ public class WebMvcConfiguration extends WebMvcConfigurerAdapter {
|
||||
}
|
||||
|
||||
@Bean
|
||||
public TemplateEngine templateEngine() {
|
||||
public SpringTemplateEngine templateEngine() {
|
||||
SpringTemplateEngine engine = new SpringTemplateEngine();
|
||||
engine.setEnableSpringELCompiler(true);
|
||||
engine.setTemplateResolver(templateResolver());
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-openid"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30',
|
||||
"net.sourceforge.nekohtml:nekohtml:1.9.10"
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-openid')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'net.sourceforge.nekohtml:nekohtml'
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.slf4j:jcl-over-slf4j'
|
||||
compile 'org.slf4j:jul-to-slf4j'
|
||||
compile 'org.slf4j:log4j-over-slf4j'
|
||||
compile 'org.slf4j:slf4j-api'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
|
||||
aspectpath project(':spring-security-aspects')
|
||||
|
||||
runtime project(':spring-security-config'),
|
||||
project(':spring-security-aspects')
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
apply plugin: 'aspectj'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
|
||||
aspectpath project(':spring-security-aspects')
|
||||
|
||||
runtime project(':spring-security-aspects')
|
||||
runtime project(':spring-security-config')
|
||||
}
|
||||
+23
-26
@@ -1,11 +1,8 @@
|
||||
// CAS sample build file
|
||||
|
||||
apply plugin: 'io.spring.convention.spring-sample'
|
||||
apply plugin: 'war'
|
||||
apply plugin: 'jetty'
|
||||
apply plugin: 'groovy'
|
||||
|
||||
def excludeModules = ['spring-security-acl', 'jsr250-api', 'spring-jdbc', 'spring-tx']
|
||||
def jettyVersion = '8.1.9.v20130131'
|
||||
def keystore = "$rootDir/samples/certificates/server.jks"
|
||||
def password = 'password'
|
||||
|
||||
@@ -26,32 +23,31 @@ sourceSets {
|
||||
eclipse.classpath.plusConfigurations += [configurations.integrationTestRuntime]
|
||||
|
||||
dependencies {
|
||||
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
compile project(':spring-security-cas')
|
||||
compile project(':spring-security-core')
|
||||
compile 'org.jasig.cas.client:cas-client-core'
|
||||
|
||||
compile project(':spring-security-core'),
|
||||
project(':spring-security-cas'),
|
||||
"org.jasig.cas.client:cas-client-core:$casClientVersion"
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime project(':spring-security-web'),
|
||||
project(':spring-security-config'),
|
||||
"org.springframework:spring-context-support:$springVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"ch.qos.logback:logback-classic:$logbackVersion",
|
||||
"net.sf.ehcache:ehcache:$ehcacheVersion"
|
||||
runtime project(':spring-security-config')
|
||||
runtime project(':spring-security-web')
|
||||
runtime 'ch.qos.logback:logback-classic'
|
||||
runtime 'net.sf.ehcache:ehcache'
|
||||
runtime 'org.slf4j:jcl-over-slf4j'
|
||||
runtime 'org.springframework:spring-context-support'
|
||||
|
||||
integrationTestCompile project(':spring-security-cas'),
|
||||
"org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion",
|
||||
"org.gebish:geb-spock:$gebVersion",
|
||||
'commons-httpclient:commons-httpclient:3.1',
|
||||
"org.eclipse.jetty:jetty-server:$jettyVersion",
|
||||
"org.eclipse.jetty:jetty-servlet:$jettyVersion",
|
||||
"org.codehaus.groovy:groovy:$groovyVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
spockDependencies
|
||||
integrationTestCompile project(':spring-security-cas')
|
||||
integrationTestCompile gebDependencies
|
||||
integrationTestCompile seleniumDependencies
|
||||
integrationTestCompile spockDependencies
|
||||
integrationTestCompile 'org.codehaus.groovy:groovy'
|
||||
integrationTestCompile 'org.eclipse.jetty:jetty-server'
|
||||
integrationTestCompile 'org.eclipse.jetty:jetty-servlet'
|
||||
integrationTestCompile 'org.slf4j:jcl-over-slf4j'
|
||||
}
|
||||
|
||||
[jettyRun, jettyRunWar]*.configure {
|
||||
contextPath = "/cas-sample"
|
||||
[project.tasks.jettyRun, project.tasks.jettyRunWar]*.configure {
|
||||
contextPath = '/cas-sample'
|
||||
def httpConnector = jettyRunWar.class.classLoader.loadClass('org.mortbay.jetty.nio.SelectChannelConnector').newInstance()
|
||||
httpConnector.port = 8080
|
||||
httpConnector.confidentialPort = 8443
|
||||
@@ -74,6 +70,7 @@ task cas (dependsOn: [jettyRunWar]) {
|
||||
task casServer(dependsOn: ':spring-security-samples-xml-casserver:casServer') {
|
||||
}
|
||||
|
||||
|
||||
integrationTest.dependsOn cas
|
||||
integrationTest.doFirst {
|
||||
def casServiceHost = jettyRunWar.httpsHost
|
||||
@@ -105,7 +102,7 @@ gradle.taskGraph.whenReady {graph ->
|
||||
if(graph.hasTask(integrationTest)) {
|
||||
tasks.getByPath(':spring-security-samples-xml-casserver:casServerOverlay').logLevel = 'ERROR'
|
||||
jettyRunWar {
|
||||
additionalRuntimeJars += file("src/integration-test/resources")
|
||||
additionalRuntimeJars += file('src/integration-test/resources')
|
||||
daemon = true
|
||||
}
|
||||
|
||||
+35
-13
@@ -13,23 +13,25 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.springframework.security.samples.cas;
|
||||
package org.springframework.security.samples.cas
|
||||
|
||||
import java.io.IOException
|
||||
import org.eclipse.jetty.http.HttpVersion
|
||||
import org.eclipse.jetty.server.HttpConfiguration
|
||||
import org.eclipse.jetty.server.HttpConnectionFactory
|
||||
import org.eclipse.jetty.server.SecureRequestCustomizer
|
||||
import org.eclipse.jetty.server.ServerConnector
|
||||
import org.eclipse.jetty.server.SslConnectionFactory
|
||||
import org.eclipse.jetty.util.ssl.SslContextFactory;
|
||||
|
||||
import javax.servlet.ServletException
|
||||
import javax.servlet.http.HttpServletRequest
|
||||
import javax.servlet.http.HttpServletResponse
|
||||
|
||||
import org.apache.commons.httpclient.HttpClient
|
||||
import org.apache.commons.httpclient.methods.GetMethod;
|
||||
import org.eclipse.jetty.server.Request
|
||||
import org.eclipse.jetty.server.Server
|
||||
import org.eclipse.jetty.server.handler.AbstractHandler
|
||||
import org.eclipse.jetty.server.ssl.SslSelectChannelConnector
|
||||
import org.jasig.cas.client.proxy.ProxyGrantingTicketStorage;
|
||||
import org.jasig.cas.client.proxy.ProxyGrantingTicketStorageImpl;
|
||||
import org.jasig.cas.client.validation.Assertion
|
||||
import org.jasig.cas.client.validation.Cas20ProxyTicketValidator;
|
||||
|
||||
/**
|
||||
@@ -54,6 +56,7 @@ class JettyCasService extends Server {
|
||||
* @return
|
||||
*/
|
||||
def init(String casServerUrl) {
|
||||
println "Initializing to " + casServerUrl
|
||||
ProxyGrantingTicketStorage storage = new ProxyGrantingTicketStorageImpl()
|
||||
validator = new Cas20ProxyTicketValidator(casServerUrl)
|
||||
validator.setAcceptAnyProxy(true)
|
||||
@@ -61,12 +64,31 @@ class JettyCasService extends Server {
|
||||
validator.setProxyCallbackUrl(absoluteUrl('callback'))
|
||||
|
||||
String password = System.getProperty('javax.net.ssl.trustStorePassword','password')
|
||||
SslSelectChannelConnector ssl_connector = new SslSelectChannelConnector()
|
||||
ssl_connector.setPort(port)
|
||||
ssl_connector.setKeystore(getTrustStore())
|
||||
ssl_connector.setPassword(password)
|
||||
ssl_connector.setKeyPassword(password)
|
||||
addConnector(ssl_connector)
|
||||
|
||||
|
||||
SslContextFactory sslContextFactory = new SslContextFactory();
|
||||
sslContextFactory.setKeyStorePath(getTrustStore());
|
||||
sslContextFactory.setKeyStorePassword(password);
|
||||
sslContextFactory.setKeyManagerPassword(password);
|
||||
|
||||
HttpConfiguration http_config = new HttpConfiguration();
|
||||
http_config.setSecureScheme("https");
|
||||
http_config.setSecurePort(availablePort());
|
||||
http_config.setOutputBufferSize(32768);
|
||||
|
||||
HttpConfiguration https_config = new HttpConfiguration(http_config);
|
||||
SecureRequestCustomizer src = new SecureRequestCustomizer();
|
||||
src.setStsMaxAge(2000);
|
||||
src.setStsIncludeSubDomains(true);
|
||||
https_config.addCustomizer(src);
|
||||
|
||||
ServerConnector https = new ServerConnector(this,
|
||||
new SslConnectionFactory(sslContextFactory,HttpVersion.HTTP_1_1.asString()),
|
||||
new HttpConnectionFactory(https_config));
|
||||
https.setPort(port);
|
||||
https.setIdleTimeout(500000);
|
||||
|
||||
addConnector(https)
|
||||
setHandler(new AbstractHandler() {
|
||||
public void handle(String target, Request baseRequest,
|
||||
HttpServletRequest request, HttpServletResponse response)
|
||||
@@ -121,4 +143,4 @@ class JettyCasService extends Server {
|
||||
server.close()
|
||||
port
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
import org.apache.tools.ant.filters.ReplaceTokens
|
||||
|
||||
apply plugin: 'jetty'
|
||||
apply plugin: 'io.spring.convention.spring-sample'
|
||||
|
||||
def keystore = "$rootDir/samples/certificates/server.jks"
|
||||
def password = 'password'
|
||||
@@ -1,29 +0,0 @@
|
||||
// Contacts sample build file
|
||||
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
|
||||
compile project(':spring-security-core'),
|
||||
project(':spring-security-acl'),
|
||||
"org.springframework:spring-aop:$springVersion",
|
||||
"org.springframework:spring-beans:$springVersion",
|
||||
"org.springframework:spring-context:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.springframework:spring-tx:$springVersion",
|
||||
"org.springframework:spring-web:$springVersion",
|
||||
"org.springframework:spring-webmvc:$springVersion"
|
||||
|
||||
runtime project(':spring-security-web'),
|
||||
project(':spring-security-config'),
|
||||
project(':spring-security-taglibs'),
|
||||
"org.springframework:spring-context-support:$springVersion",
|
||||
jstlDependencies,
|
||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"ch.qos.logback:logback-classic:$logbackVersion",
|
||||
"net.sf.ehcache:ehcache:$ehcacheVersion"
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-acl')
|
||||
compile project(':spring-security-core')
|
||||
compile slf4jDependencies
|
||||
compile 'org.springframework:spring-aop'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-tx'
|
||||
compile 'org.springframework:spring-web'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime project(':spring-security-config')
|
||||
runtime project(':spring-security-taglibs')
|
||||
runtime project(':spring-security-web')
|
||||
runtime jstlDependencies
|
||||
runtime 'ch.qos.logback:logback-classic'
|
||||
runtime 'net.sf.ehcache:ehcache'
|
||||
runtime 'org.hsqldb:hsqldb'
|
||||
runtime 'org.slf4j:jcl-over-slf4j'
|
||||
runtime 'org.springframework:spring-context-support'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
|
||||
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'),
|
||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||
"org.springframework:spring-context-support:$springVersion"
|
||||
|
||||
optional "net.sf.ehcache:ehcache:$ehcacheVersion"
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-acl')
|
||||
compile project(':spring-security-core')
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-tx'
|
||||
|
||||
optional 'net.sf.ehcache:ehcache'
|
||||
|
||||
runtime project(':spring-security-config')
|
||||
runtime 'org.hsqldb:hsqldb'
|
||||
runtime 'org.springframework:spring-context-support'
|
||||
|
||||
testCompile 'org.springframework:spring-context'
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
apply plugin: 'war'
|
||||
apply plugin: 'jetty'
|
||||
apply plugin: 'appengine'
|
||||
|
||||
def gaeVersion="1.9.23"
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.google.appengine:gradle-appengine-plugin:1.9.23'
|
||||
}
|
||||
}
|
||||
|
||||
appengine {
|
||||
downloadSdk = true
|
||||
}
|
||||
|
||||
// Remove logback as it causes security issues with GAE.
|
||||
configurations.runtime.exclude(group: 'ch.qos.logback')
|
||||
|
||||
dependencies {
|
||||
appengineSdk "com.google.appengine:appengine-java-sdk:$gaeVersion"
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
|
||||
compile project(':spring-security-core'),
|
||||
project(':spring-security-web'),
|
||||
"org.springframework:spring-beans:$springVersion",
|
||||
"org.springframework:spring-web:$springVersion",
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-context:$springVersion",
|
||||
"org.springframework:spring-context-support:$springVersion",
|
||||
"com.google.appengine:appengine-api-1.0-sdk:$gaeVersion",
|
||||
'javax.validation:validation-api:1.0.0.GA',
|
||||
'org.hibernate:hibernate-validator:4.2.0.Final',
|
||||
"org.slf4j:slf4j-api:$slf4jVersion"
|
||||
|
||||
runtime project(':spring-security-config'),
|
||||
project(':spring-security-taglibs'),
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:slf4j-jdk14:$slf4jVersion",
|
||||
jstlDependencies
|
||||
testCompile "com.google.appengine:appengine-testing:$gaeVersion"
|
||||
|
||||
testRuntime "com.google.appengine:appengine-api-labs:$gaeVersion",
|
||||
"com.google.appengine:appengine-api-stubs:$gaeVersion"
|
||||
|
||||
}
|
||||
|
||||
appengineRun.onlyIf { !gradle.taskGraph.hasTask(appengineFunctionalTest) }
|
||||
@@ -0,0 +1,47 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
apply plugin: 'appengine'
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath "com.google.appengine:gradle-appengine-plugin:$gaeVersion"
|
||||
}
|
||||
}
|
||||
|
||||
appengine {
|
||||
downloadSdk = true
|
||||
}
|
||||
|
||||
// Remove logback as it causes security issues with GAE.
|
||||
configurations.runtime.exclude(group: 'ch.qos.logback')
|
||||
|
||||
dependencies {
|
||||
appengineSdk "com.google.appengine:appengine-java-sdk:$gaeVersion"
|
||||
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-taglibs')
|
||||
compile project(':spring-security-web')
|
||||
compile jstlDependencies
|
||||
compile slf4jDependencies
|
||||
compile "com.google.appengine:appengine-api-1.0-sdk:$gaeVersion"
|
||||
compile "com.google.appengine:appengine-api-stubs:$gaeVersion"
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-context-support'
|
||||
compile 'org.springframework:spring-web'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime project(':spring-security-config')
|
||||
|
||||
testCompile "com.google.appengine:appengine-testing:$gaeVersion"
|
||||
|
||||
testRuntime "com.google.appengine:appengine-api-labs:$gaeVersion"
|
||||
}
|
||||
|
||||
appengineRun.onlyIf { !gradle.taskGraph.hasTask(appengineFunctionalTest) }
|
||||
@@ -1,16 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-web"),
|
||||
jstlDependencies,
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion"
|
||||
|
||||
runtime "ch.qos.logback:logback-classic:$logbackVersion"
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-web')
|
||||
compile jstlDependencies
|
||||
compile slf4jDependencies
|
||||
compile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile jstlDependencies,
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion"
|
||||
|
||||
runtime "ch.qos.logback:logback-classic:$logbackVersion"
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile jstlDependencies
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-samples-javaconfig-messages"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile slf4jDependencies
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
// JAAS sample build file
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
def excludeModules = ['spring-security-acl', 'jsr250-api', 'ehcache', 'spring-jdbc', 'spring-tx']
|
||||
|
||||
configurations {
|
||||
excludeModules.each {name ->
|
||||
runtime.exclude module: name
|
||||
}
|
||||
|
||||
runtime.exclude group: 'org.aspectj'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
|
||||
compile project(':spring-security-core'),
|
||||
"org.springframework:spring-beans:$springVersion",
|
||||
"org.springframework:spring-context:$springVersion",
|
||||
"org.springframework:spring-web:$springVersion"
|
||||
|
||||
runtime project(':spring-security-web'),
|
||||
project(':spring-security-config'),
|
||||
project(':spring-security-taglibs'),
|
||||
"org.springframework:spring-context-support:$springVersion",
|
||||
jstlDependencies,
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"ch.qos.logback:logback-classic:$logbackVersion"
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-web'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime project(':spring-security-config')
|
||||
runtime project(':spring-security-taglibs')
|
||||
runtime project(':spring-security-web')
|
||||
runtime jstlDependencies
|
||||
runtime slf4jDependencies
|
||||
runtime 'org.springframework:spring-context-support'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
// LDAP sample build file
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
def excludeModules = ['spring-security-acl', 'jsr250-api', 'ehcache', 'spring-jdbc', 'ldapsdk']
|
||||
|
||||
configurations {
|
||||
excludeModules.each {name ->
|
||||
runtime.exclude module: name
|
||||
}
|
||||
|
||||
runtime.exclude group: 'org.aspectj'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-taglibs'),
|
||||
jstlDependencies
|
||||
|
||||
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",
|
||||
apachedsDependencies
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-taglibs')
|
||||
compile jstlDependencies
|
||||
|
||||
runtime project(':spring-security-web')
|
||||
runtime project(':spring-security-config')
|
||||
runtime project(':spring-security-ldap')
|
||||
runtime apachedsDependencies
|
||||
runtime slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
// OpenID sample build file
|
||||
|
||||
apply plugin: 'war'
|
||||
apply plugin: 'jetty'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-core'),
|
||||
project(':spring-security-openid'),
|
||||
"org.springframework:spring-webmvc:$springVersion"
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
|
||||
runtime project(':spring-security-config'),
|
||||
project(':spring-security-taglibs'),
|
||||
jstlDependencies,
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"ch.qos.logback:logback-classic:$logbackVersion"
|
||||
}
|
||||
|
||||
[jettyRun, jettyRunWar]*.contextPath = "/openid"
|
||||
@@ -0,0 +1,14 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-openid')
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime project(':spring-security-config')
|
||||
runtime project(':spring-security-taglibs')
|
||||
runtime jstlDependencies
|
||||
runtime slf4jDependencies
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
// Preauth sample build file
|
||||
|
||||
apply plugin: 'war'
|
||||
apply plugin: 'jetty'
|
||||
|
||||
war.baseName = "sample"
|
||||
|
||||
def excludeModules = ['jsr250-api', 'ehcache', 'spring-jdbc', 'spring-tx']
|
||||
|
||||
configurations {
|
||||
excludeModules.each {name ->
|
||||
runtime.exclude module: name
|
||||
}
|
||||
|
||||
runtime.exclude group: 'org.aspectj'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1"
|
||||
|
||||
runtime project(':spring-security-web'),
|
||||
project(':spring-security-config'),
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"ch.qos.logback:logback-classic:$logbackVersion"
|
||||
|
||||
testCompile project(':spring-security-web'),
|
||||
project(':spring-security-config')
|
||||
}
|
||||
|
||||
jettyRun {
|
||||
userRealms = [jettyRun.class.classLoader.loadClass('org.mortbay.jetty.security.HashUserRealm').newInstance('Preauth Realm', "$projectDir/realm.properties")]
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime project(':spring-security-config')
|
||||
runtime project(':spring-security-web')
|
||||
runtime slf4jDependencies
|
||||
|
||||
testCompile project(':spring-security-config')
|
||||
testCompile project(':spring-security-web')
|
||||
}
|
||||
|
||||
//jettyRun {
|
||||
// userRealms = [jettyRun.class.classLoader.loadClass('org.mortbay.jetty.security.HashUserRealm').newInstance('Preauth Realm' '$projectDir/realm.properties')]
|
||||
//}
|
||||
@@ -1,34 +0,0 @@
|
||||
// Servlet API integration sample build file
|
||||
|
||||
apply plugin: 'war'
|
||||
|
||||
def excludeModules = ['spring-security-acl', 'jsr250-api', 'ehcache', 'spring-jdbc', 'spring-tx']
|
||||
|
||||
configurations {
|
||||
excludeModules.each {name ->
|
||||
runtime.exclude module: name
|
||||
}
|
||||
|
||||
runtime.exclude group: 'org.aspectj'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
|
||||
compile project(':spring-security-core'),
|
||||
project(':spring-security-web'),
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"org.springframework:spring-beans:$springVersion",
|
||||
"org.springframework:spring-context:$springVersion",
|
||||
"org.springframework:spring-web:$springVersion",
|
||||
"org.springframework:spring-webmvc:$springVersion"
|
||||
|
||||
runtime project(':spring-security-config'),
|
||||
project(':spring-security-taglibs'),
|
||||
"org.springframework:spring-context-support:$springVersion",
|
||||
jstlDependencies,
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"ch.qos.logback:logback-classic:$logbackVersion"
|
||||
}
|
||||
|
||||
eclipse.wtp.component.contextPath = "servletapi"
|
||||
@@ -0,0 +1,21 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-web'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime project(':spring-security-config')
|
||||
runtime project(':spring-security-taglibs')
|
||||
runtime jstlDependencies
|
||||
runtime slf4jDependencies
|
||||
runtime 'org.springframework:spring-context-support'
|
||||
}
|
||||
|
||||
eclipse.wtp.component.contextPath = 'servletapi'
|
||||
@@ -0,0 +1,16 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-core')
|
||||
compile slf4jDependencies
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-web'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime project(':spring-security-config')
|
||||
runtime project(':spring-security-taglibs')
|
||||
runtime project(':spring-security-web')
|
||||
runtime jstlDependencies
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
// Tutorial sample build file
|
||||
|
||||
apply plugin: 'war'
|
||||
apply plugin: 'jetty'
|
||||
|
||||
war.baseName = "sample"
|
||||
|
||||
def excludeModules = ['spring-security-acl', 'jsr250-api', 'ehcache', 'spring-jdbc', 'spring-tx']
|
||||
|
||||
configurations {
|
||||
excludeModules.each {name ->
|
||||
runtime.exclude module: name
|
||||
}
|
||||
|
||||
runtime.exclude group: 'org.aspectj'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
|
||||
compile project(':spring-security-core'),
|
||||
"org.springframework:spring-beans:$springVersion",
|
||||
"org.springframework:spring-web:$springVersion",
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion"
|
||||
|
||||
runtime project(':spring-security-web'),
|
||||
project(':spring-security-config'),
|
||||
project(':spring-security-taglibs'),
|
||||
jstlDependencies,
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"ch.qos.logback:logback-core:$logbackVersion",
|
||||
"ch.qos.logback:logback-classic:$logbackVersion"
|
||||
}
|
||||
|
||||
jettyRun {
|
||||
def httpConnector = jettyRunWar.class.classLoader.loadClass('org.mortbay.jetty.nio.SelectChannelConnector').newInstance()
|
||||
httpConnector.port = 8080
|
||||
httpConnector.confidentialPort = 8443
|
||||
def httpsConnector = jettyRunWar.class.classLoader.loadClass('org.mortbay.jetty.security.SslSocketConnector').newInstance()
|
||||
httpsConnector.port = 8443
|
||||
httpsConnector.keystore = "$rootDir/samples/certificates/server.jks"
|
||||
httpsConnector.keyPassword = 'password'
|
||||
|
||||
connectors = [httpConnector, httpsConnector]
|
||||
}
|
||||
Reference in New Issue
Block a user