Fix broken samples (#606)

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

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",

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;

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",

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;

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",

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;

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",

View File

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

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;

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",

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;

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",

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>

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;

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",

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;

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",

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[] -->

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;

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",

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;

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",

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[] -->

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;

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",

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;

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",

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;

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",

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>

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>