Merge branch 'master' of https://github.com/eugenp/tutorials

spring-mvc-simple/pom.xml

@@ -27,6 +27,7 @@
         <org.thymeleaf-version>3.0.7.RELEASE</org.thymeleaf-version>
         <groovy.version>2.4.12</groovy.version>
         <freemarker.version>2.3.23</freemarker.version>
+        <jade.version>1.2.5</jade.version>
     </properties>
 
     <dependencies>
@@ -115,6 +116,13 @@
             <version>${groovy.version}</version>
         </dependency>
 		
+        <!-- jade dependency -->
+        <dependency>
+            <groupId>de.neuland-bfi</groupId>
+            <artifactId>spring-jade4j</artifactId>
+            <version>${jade.version}</version>
+        </dependency>
+
     </dependencies>
     <build>
         <pluginManagement>

spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/JadeTemplateConfiguration.java

@@ -0,0 +1,39 @@
+package com.baeldung.spring.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+
+import de.neuland.jade4j.JadeConfiguration;
+import de.neuland.jade4j.spring.template.SpringTemplateLoader;
+import de.neuland.jade4j.spring.view.JadeViewResolver;
+
+@Configuration
+@EnableWebMvc
+@ComponentScan(basePackages = { "com.baeldung.springmvcforms", "com.baeldung.spring.controller", "com.baeldung.spring.validator" })
+public class JadeTemplateConfiguration {
+    @Bean
+    public SpringTemplateLoader templateLoader() {
+            SpringTemplateLoader templateLoader = new SpringTemplateLoader();
+            templateLoader.setBasePath("/WEB-INF/views/");
+            templateLoader.setSuffix(".jade");
+            return templateLoader;
+    }
+
+    @Bean
+    public JadeConfiguration jadeConfiguration() {
+            JadeConfiguration configuration = new JadeConfiguration();
+            configuration.setCaching(false);
+            configuration.setTemplateLoader(templateLoader());
+            return configuration;
+    }
+
+    @Bean
+    public ViewResolver viewResolver() {
+            JadeViewResolver viewResolver = new JadeViewResolver();
+            viewResolver.setConfiguration(jadeConfiguration());
+            return viewResolver;
+    }
+}

spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/WebInitializer.java

@@ -18,6 +18,7 @@ public class WebInitializer implements WebApplicationInitializer {
 		//ctx.register(ThymeleafConfiguration.class);
 		//ctx.register(FreemarkerConfiguration.class);
 		//ctx.register(GroovyConfiguration.class);
+		//ctx.register(JadeTemplateConfiguration.class);
 		ctx.setServletContext(container);
 
 		// Manage the lifecycle of the root application context

spring-mvc-simple/src/main/java/com/baeldung/spring/controller/UserController.java

@@ -35,6 +35,12 @@ public class UserController {
         return "registration-groovy";
     }
     
+    @GetMapping("/registration-jade")
+    public String getRegistrationJade(Model model) {
+        model.addAttribute("user", new User());
+        return "registration-jade";
+    }
+    
     @PostMapping("/register")
     @ResponseBody
     public void register(User user){

spring-mvc-simple/src/main/webapp/WEB-INF/views/registration-jade.jade

@@ -0,0 +1,11 @@
+doctype html
+html
+  head
+    title User Registration
+  body
+    form(action="register" method="post" )
+      label(for="email") Emailaaaaaaaa:
+      input(type="text" name="email")
+      label(for="password") Password:
+      input(type="password" name="password")
+      input(type="submit" value="Submit")

spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/Application.java

@@ -2,10 +2,11 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class Application extends SpringBootServletInitializer {
 
     @Override

spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/Application.java

@@ -2,10 +2,11 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class Application extends SpringBootServletInitializer {
 
     @Override

spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/Application.java

@@ -2,10 +2,11 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class Application extends SpringBootServletInitializer {
 
     @Override

spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/Application.java

@@ -2,9 +2,10 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class Application {
+public class Application extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/Application.java

@@ -2,9 +2,10 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class Application {
+public class Application extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/Application.java

@@ -2,9 +2,10 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class Application {
+public class Application extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

spring-security-core/src/main/java/org/baeldung/app/App.java

@@ -3,6 +3,7 @@ package org.baeldung.app;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
@@ -10,7 +11,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 @EnableJpaRepositories("org.baeldung.repository")
 @ComponentScan("org.baeldung")
 @EntityScan("org.baeldung.entity")
-public class App {
+public class App extends SpringBootServletInitializer {
     public static void main(String[] args) {
         SpringApplication.run(App.class, args);
     }