mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken samples (#606)

Browse Source
This commit is contained in:
Vedran Pavić
2016-09-02 20:44:17 +02:00
committed by Rob Winch
parent 3e293e8b54
commit 8db7d394ba
34 changed files with 56 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -3,7 +3,7 @@ buildscript {
maven { url "https://repo.spring.io/plugins-release" }
}
dependencies {
classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
classpath("com.bmuschko:gradle-tomcat-plugin:2.2.5")
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
classpath("io.spring.gradle:spring-io-plugin:0.0.4.RELEASE")
classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
@@ -69,4 +69,4 @@ task docsZip(type: Zip, dependsOn: 'configDocsZip') {
artifacts {
archives docsZip
}
}

11
gradle/tomcat.gradle
View File

@@ -3,19 +3,18 @@ buildscript {
maven { url "https://repo.spring.io/plugins-release" }
}
dependencies {
classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
classpath("com.bmuschko:gradle-tomcat-plugin:2.2.5")
}
}
apply plugin: 'war'
apply plugin: 'tomcat'
apply plugin: 'com.bmuschko.tomcat'
[tomcatRun,tomcatRunWar]*.contextPath = '/'
task integrationTomcatRun(type: org.gradle.api.plugins.tomcat.tasks.TomcatRun) {
task integrationTomcatRun(type: com.bmuschko.gradle.tomcat.tasks.TomcatRun) {
onlyIf { !sourceSets.integrationTest.allSource.empty }
buildscriptClasspath = tomcatRun.buildscriptClasspath
contextPath = tomcatRun.contextPath
daemon = true
tomcatClasspath = tomcatRun.tomcatClasspath
@@ -36,7 +35,7 @@ task integrationTomcatRun(type: org.gradle.api.plugins.tomcat.tasks.TomcatRun) {
}
}
task integrationTomcatStop(type: org.gradle.api.plugins.tomcat.tasks.TomcatStop) {
task integrationTomcatStop(type: com.bmuschko.gradle.tomcat.tasks.TomcatStop) {
onlyIf { !sourceSets.integrationTest.allSource.empty }
doFirst {
stopPort = integrationTomcatRun.stopPort
@@ -61,4 +60,4 @@ def reservePorts(int count) {
def result = sockets*.localPort
sockets*.close()
result
}
}

8
gradle/tomcat7.gradle
View File

@@ -3,8 +3,6 @@ apply from: TOMCAT_GRADLE
dependencies {
def tomcatVersion = '7.0.59'
tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}"
tomcat("org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}") {
exclude group: 'org.eclipse.jdt.core.compiler', module: 'ecj'
}
}
"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
"org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
}

4
samples/custom-cookie/build.gradle
View File

@@ -2,10 +2,6 @@ apply from: JAVA_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-data-redis'),
"org.springframework:spring-web:$springVersion",

3
samples/custom-cookie/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/hazelcast-spring/build.gradle
View File

@@ -2,10 +2,6 @@ apply from: JAVA_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session'),
"org.springframework:spring-web:$springVersion",

3
samples/hazelcast-spring/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Secured Content</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/hazelcast/build.gradle
View File

@@ -2,10 +2,6 @@ apply from: JAVA_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session'),
"org.webjars:bootstrap:$bootstrapVersion",

3
samples/hazelcast/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/httpsession-gemfire-clientserver-xml/build.gradle
View File

@@ -8,10 +8,6 @@ sonarqube {
skipProject = true
}
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-data-geode'),
"org.springframework:spring-web:$springVersion",

1
samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml
View File

@@ -23,7 +23,6 @@
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>ERROR</dispatcher>
<dispatcher>ASYNC</dispatcher>
</filter-mapping>
<!-- end::springSessionRepositoryFilter[] -->

3
samples/httpsession-gemfire-clientserver-xml/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/httpsession-gemfire-clientserver/build.gradle
View File

@@ -3,10 +3,6 @@ apply from: TOMCAT_7_GRADLE
apply plugin: "application"
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-data-gemfire'),
"org.springframework:spring-web:$springVersion",

3
samples/httpsession-gemfire-clientserver/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/httpsession-gemfire-p2p-xml/build.gradle
View File

@@ -2,10 +2,6 @@ apply from: JAVA_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-data-gemfire'),
"org.springframework:spring-web:$springVersion",

7
samples/httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml
View File

@@ -23,9 +23,8 @@
<filter-mapping>
<filter-name>springSessionRepositoryFilter</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>ERROR</dispatcher>
<dispatcher>ASYNC</dispatcher>
<dispatcher>REQUEST</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
<!-- end::springSessionRepositoryFilter[] -->
@@ -55,4 +54,4 @@
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
</web-app>
</web-app>

3
samples/httpsession-gemfire-p2p-xml/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/httpsession-gemfire-p2p/build.gradle
View File

@@ -2,10 +2,6 @@ apply from: JAVA_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-data-geode'),
"org.springframework:spring-web:$springVersion",

3
samples/httpsession-gemfire-p2p/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

6
samples/httpsession-jdbc-xml/build.gradle
View File

@@ -1,11 +1,7 @@
apply from: JAVA_GRADLE
apply from: TOMCAT_6_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-jdbc'),
"org.springframework:spring-web:$springVersion",

5
samples/httpsession-jdbc-xml/src/main/webapp/WEB-INF/web.xml
View File

@@ -23,9 +23,8 @@
<filter-mapping>
<filter-name>springSessionRepositoryFilter</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>ERROR</dispatcher>
<dispatcher>ASYNC</dispatcher>
<dispatcher>REQUEST</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
<!-- end::springSessionRepositoryFilter[] -->

3
samples/httpsession-jdbc-xml/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/httpsession-jdbc/build.gradle
View File

@@ -2,10 +2,6 @@ apply from: JAVA_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-jdbc'),
"org.springframework:spring-web:$springVersion",

3
samples/httpsession-jdbc/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

6
samples/httpsession-xml/build.gradle
View File

@@ -1,11 +1,7 @@
apply from: JAVA_GRADLE
apply from: TOMCAT_6_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-data-redis'),
"org.springframework:spring-web:$springVersion",

4
samples/httpsession-xml/src/main/webapp/WEB-INF/web.xml
View File

@@ -23,8 +23,8 @@
<filter-mapping>
<filter-name>springSessionRepositoryFilter</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>ERROR</dispatcher>
<dispatcher>REQUEST</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
<!-- end::springSessionRepositoryFilter[] -->

3
samples/httpsession-xml/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/httpsession/build.gradle
View File

@@ -2,10 +2,6 @@ apply from: JAVA_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-data-redis'),
"org.springframework:spring-web:$springVersion",

4
samples/httpsession/src/main/webapp/index.jsp
View File

@@ -1,9 +1,11 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
<!DOCTYPE html>
<html lang="en">
<head>
<title>Session Attributes</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/security/build.gradle
View File

@@ -2,10 +2,6 @@ apply from: JAVA_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-data-redis'),
"org.springframework:spring-web:$springVersion",

3
samples/security/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Secured Content</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;

4
samples/users/build.gradle
View File

@@ -2,10 +2,6 @@ apply from: JAVA_GRADLE
apply from: TOMCAT_7_GRADLE
apply from: SAMPLE_GRADLE
configurations {
compile.exclude group: 'org.slf4j', module: 'slf4j-api'
}
dependencies {
compile project(':spring-session-data-redis'),
"org.springframework:spring-web:$springVersion",

9
samples/users/src/main/webapp/index.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Demonstrates Multi User Log In</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;
@@ -101,8 +102,10 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="<wj:locate path="jquery.min.js" relativeTo="META-INF/resources"/>"></script>
<script src="<wj:locate path="bootstrap.min.js" relativeTo="META-INF/resources"/>"></script>
<wj:locate path="jquery.min.js" relativeTo="META-INF/resources" var="jqueryLocation"/>
<script src="<c:url value="${jqueryLocation}"/>"></script>
<wj:locate path="bootstrap.min.js" relativeTo="META-INF/resources" var="bootstrapJsLocation"/>
<script src="<c:url value="${bootstrapJsLocation}"/>"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="<c:url value="/assets/js/ie10-viewport-bug-workaround.js"/>"></script>
</body>

9
samples/users/src/main/webapp/link.jsp
View File

@@ -4,7 +4,8 @@
<html lang="en">
<head>
<title>Linked Page</title>
<link rel="stylesheet" href="<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources"/>">
<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
<style type="text/css">
body {
padding: 1em;
@@ -74,8 +75,10 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="<wj:locate path="jquery.min.js" relativeTo="META-INF/resources"/>"></script>
<script src="<wj:locate path="bootstrap.min.js" relativeTo="META-INF/resources"/>"></script>
<wj:locate path="jquery.min.js" relativeTo="META-INF/resources" var="jqueryLocation"/>
<script src="<c:url value="${jqueryLocation}"/>"></script>
<wj:locate path="bootstrap.min.js" relativeTo="META-INF/resources" var="bootstrapJsLocation"/>
<script src="<c:url value="${bootstrapJsLocation}"/>"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="<c:url value="/assets/js/ie10-viewport-bug-workaround.js"/>"></script>
</body>