Merge branch 'master' into bael-16656

2019-10-26 15:37:05 -06:00
parent db85c8f275
commit 0be2175c89
20539 changed files with 1643630 additions and 0 deletions
@@ -0,0 +1,15 @@
+package com.baeldung.webjar;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class TestController {
+
+    @GetMapping(value = "/")
+    public String welcome(Model model) {
+        return "index";
+    }
+
+}
@@ -0,0 +1,12 @@
+package com.baeldung.webjar;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class WebjarsdemoApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(WebjarsdemoApplication.class, args);
+    }
+}
@@ -0,0 +1 @@
+spring.main.allow-bean-definition-overriding=true
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
@@ -0,0 +1,19 @@
+<html>
+<head>
+	<title>WebJars Demo</title>
+	<link rel="stylesheet" href="/webjars/bootstrap/3.3.7-1/css/bootstrap.min.css" />
+</head>
+<body>
+	<h1>Welcome Home</h1>
+	<div class="container"><br/>
+		<div class="alert alert-success">
+		  <a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
+		  <strong>Success!</strong> It is working as we expected.
+		</div>
+	</div>
+
+<script src="/webjars/jquery/3.1.1/jquery.min.js"></script>
+<script src="/webjars/bootstrap/3.3.7-1/js/bootstrap.min.js"></script>
+
+</body>
+</html>
@@ -0,0 +1,18 @@
+package com.baeldung.webjar;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = WebjarsdemoApplication.class)
+@WebAppConfiguration
+public class WebjarsdemoApplicationIntegrationTest {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}
				`@@ -0,0 +1 @@`
				`spring.main.allow-bean-definition-overriding=true`