Skip to content

Commit 72f775b

Browse files
kolorobotkolorobot
committed
Introduced webjars + minor improvements
1 parent 718a271 commit 72f775b

File tree

9 files changed

+55
-34
lines changed

9 files changed

+55
-34
lines changed

‎pom.xml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,21 @@
44

55
<groupId>pl.codeleak.demos.sbt</groupId>
66
<artifactId>spring-boot-thymeleaf</artifactId>
7-
<packaging>war</packaging>
8-
<version>1.0-SNAPSHOT</version>
7+
<version>1.0</version>
98
<name>spring-boot-thymeleaf</name>
9+
<packaging>war</packaging>
10+
11+
<properties>
12+
<java.version>1.8</java.version>
13+
<tomcat.version>8.0.9</tomcat.version>
14+
<junit.version>4.11</junit.version>
15+
</properties>
1016

1117
<!-- Inherit defaults from Spring Boot -->
1218
<parent>
1319
<groupId>org.springframework.boot</groupId>
1420
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>1.0.1.RELEASE</version>
21+
<version>1.1.4.RELEASE</version>
1622
</parent>
1723

1824
<!-- Add typical dependencies for a web application -->
@@ -25,6 +31,21 @@
2531
<groupId>org.springframework.boot</groupId>
2632
<artifactId>spring-boot-starter-thymeleaf</artifactId>
2733
</dependency>
34+
<dependency>
35+
<groupId>org.webjars</groupId>
36+
<artifactId>bootstrap</artifactId>
37+
<version>3.2.0</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.webjars</groupId>
41+
<artifactId>jquery</artifactId>
42+
<version>2.1.1</version>
43+
</dependency>
44+
<!-- Test -->
45+
<dependency>
46+
<groupId>org.springframework.boot</groupId>
47+
<artifactId>spring-boot-starter-test</artifactId>
48+
</dependency>
2849
<!-- Provided (for embedded war support) -->
2950
<dependency>
3051
<groupId>org.springframework.boot</groupId>
@@ -42,5 +63,4 @@
4263
</plugin>
4364
</plugins>
4465
</build>
45-
4666
</project>

‎src/main/java/pl/codeleak/demos/sbt/App.java renamed to ‎src/main/java/pl/codeleak/demos/sbt/Application.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
@EnableAutoConfiguration
99
@Configuration
1010
@ComponentScan
11-
public class App {
11+
public class Application {
1212
public static void main(String[] args) {
13-
SpringApplication.run(App.class);
13+
SpringApplication.run(Application.class);
1414
}
1515
}

‎src/main/java/pl/codeleak/demos/sbt/Init.java renamed to ‎src/main/java/pl/codeleak/demos/sbt/ServletInitializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import org.springframework.boot.builder.SpringApplicationBuilder;
44
import org.springframework.boot.context.web.SpringBootServletInitializer;
55

6-
public class Init extends SpringBootServletInitializer {
6+
public class ServletInitializer extends SpringBootServletInitializer {
77
@Override
88
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
9-
return application.sources(App.class);
9+
return application.sources(Application.class);
1010
}
1111
}

‎src/main/resources/static/css/bootstrap.min.css

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/main/resources/static/js/bootstrap.min.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/main/resources/templates/fragments/alert.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<link href="../../static/css/bootstrap.min.css" rel="stylesheet" media="screen" />
4+
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.2.0/css/bootstrap.min.css"
5+
th:href="@{/webjars/bootstrap/3.2.0/css/bootstrap.min.css}"
6+
rel="stylesheet" media="screen" />
7+
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.2.0/js/bootstrap.min.js"
8+
th:href="@{/webjars/bootstrap/3.2.0/js/bootstrap.min.js}"
9+
rel="stylesheet" media="screen" />
10+
<script src="http://cdn.jsdelivr.net/webjars/jquery/2.1.1/jquery.min.js"
11+
th:src="@{/webjars/jquery/2.1.1/jquery.min.js}"></script>
512
</head>
613
<body>
714
<div th:fragment="alert (type, message)" class="alert alert-dismissable" th:classappend="'alert-' + ${type}">

‎src/main/resources/templates/fragments/footer.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<link href="../../static/css/bootstrap.min.css" rel="stylesheet" media="screen" />
4+
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.2.0/css/bootstrap.min.css"
5+
th:href="@{/webjars/bootstrap/3.2.0/css/bootstrap.min.css}"
6+
rel="stylesheet" media="screen" />
57
</head>
68
<body>
79
<div th:fragment="footer">

‎src/main/resources/templates/fragments/header.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
<html>
33

44
<head>
5-
<link href="../../static/css/bootstrap.min.css" rel="stylesheet" media="screen" th:href="@{/css/bootstrap.min.css}"/>
6-
<script src="../../static/js/bootstrap.min.js"></script>
7-
<script src="http://code.jquery.com/jquery-latest.js"></script>
5+
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.2.0/css/bootstrap.min.css"
6+
th:href="@{/webjars/bootstrap/3.2.0/css/bootstrap.min.css}"
7+
rel="stylesheet" media="screen" />
8+
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.2.0/js/bootstrap.min.js"
9+
th:href="@{/webjars/bootstrap/3.2.0/js/bootstrap.min.js}"
10+
rel="stylesheet" media="screen" />
11+
<script src="http://cdn.jsdelivr.net/webjars/jquery/2.1.1/jquery.min.js"
12+
th:src="@{/webjars/jquery/2.1.1/jquery.min.js}"></script>
813
</head>
914
<body>
1015

@@ -23,9 +28,6 @@
2328
<ul class="nav navbar-nav">
2429
<li><a href="#" th:href="@{/}">Home</a></li>
2530
</ul>
26-
<ul class="nav navbar-nav navbar-right">
27-
<li><a href="#">Sign in</a></li>
28-
</ul>
2931
</div>
3032
<!--/.nav-collapse -->
3133
</div>

‎src/main/resources/templates/index.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44
<head>
55
<title>Hello Spring Boot!</title>
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
7-
<link href="../static/css/bootstrap.min.css" rel="stylesheet" media="screen" th:href="@{/css/bootstrap.min.css}"/>
8-
<link href="../static/css/core.css" rel="stylesheet" media="screen" th:href="@{/css/core.css}" />
9-
<script src="http://code.jquery.com/jquery-latest.js"></script>
7+
<link href="http://cdn.jsdelivr.net/webjars/bootstrap/3.2.0/css/bootstrap.min.css"
8+
th:href="@{/webjars/bootstrap/3.2.0/css/bootstrap.min.css}"
9+
rel="stylesheet" media="screen" />
10+
<link href="../static/css/core.css"
11+
th:href="@{/css/core.css}"
12+
rel="stylesheet" media="screen" />
13+
<script src="http://cdn.jsdelivr.net/webjars/jquery/2.1.1/jquery.min.js"
14+
th:src="@{/webjars/jquery/2.1.1/jquery.min.js}"></script>
1015
</head>
1116
<body>
1217
<!-- Header -->

0 commit comments

Comments
 (0)