Skip to content

Commit 868c754

Browse files
davidmorleydavidmorley
committed
Merge pull request eugenp#324 from eugenp/correct-package-name-thymeleaf
Correct package name in Thymeleaf example project
2 parents 1b38cdf + a937aef commit 868c754

9 files changed

Lines changed: 270 additions & 345 deletions

File tree

‎spring-thymeleaf/.classpath‎

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

‎spring-thymeleaf/.project‎

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

‎spring-thymeleaf/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.baeldung</groupId>
4+
<groupId>com.baeldung</groupId>
55
<artifactId>spring-thymeleaf</artifactId>
66
<version>0.1-SNAPSHOT</version>
77
<packaging>war</packaging>

spring-thymeleaf/src/main/java/org/baeldung/thymeleaf/config/WebApp.java renamed to spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebApp.java

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
package org.baeldung.thymeleaf.config;
2-
3-
import javax.servlet.ServletRegistration.Dynamic;
4-
5-
import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
6-
7-
/**
8-
* Java configuration file that is used for web application initialization
9-
*/
10-
public class WebApp extends AbstractAnnotationConfigDispatcherServletInitializer {
11-
12-
public WebApp() {
13-
super();
14-
}
15-
16-
@Override
17-
protected Class<?>[] getRootConfigClasses() {
18-
return null;
19-
}
20-
21-
@Override
22-
protected Class<?>[] getServletConfigClasses() {
23-
return new Class<?>[] { WebMVCConfig.class };
24-
}
25-
26-
@Override
27-
protected String[] getServletMappings() {
28-
return new String[] { "/" };
29-
}
30-
31-
@Override
32-
protected void customizeRegistration(final Dynamic registration) {
33-
super.customizeRegistration(registration);
34-
}
35-
36-
}
1+
package com.baeldung.thymeleaf.config;
2+
3+
import javax.servlet.ServletRegistration.Dynamic;
4+
5+
import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
6+
7+
/**
8+
* Java configuration file that is used for web application initialization
9+
*/
10+
public class WebApp extends AbstractAnnotationConfigDispatcherServletInitializer {
11+
12+
public WebApp() {
13+
super();
14+
}
15+
16+
@Override
17+
protected Class<?>[] getRootConfigClasses() {
18+
return null;
19+
}
20+
21+
@Override
22+
protected Class<?>[] getServletConfigClasses() {
23+
return new Class<?>[] { WebMVCConfig.class };
24+
}
25+
26+
@Override
27+
protected String[] getServletMappings() {
28+
return new String[] { "/" };
29+
}
30+
31+
@Override
32+
protected void customizeRegistration(final Dynamic registration) {
33+
super.customizeRegistration(registration);
34+
}
35+
36+
}

spring-thymeleaf/src/main/java/org/baeldung/thymeleaf/config/WebMVCConfig.java renamed to spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
1-
package org.baeldung.thymeleaf.config;
2-
3-
import org.baeldung.thymeleaf.formatter.NameFormatter;
4-
import org.springframework.context.annotation.Bean;
5-
import org.springframework.context.annotation.ComponentScan;
6-
import org.springframework.context.annotation.Configuration;
7-
import org.springframework.context.annotation.Description;
8-
import org.springframework.context.support.ResourceBundleMessageSource;
9-
import org.springframework.format.FormatterRegistry;
10-
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
11-
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
12-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
13-
import org.thymeleaf.spring4.SpringTemplateEngine;
14-
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
15-
import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
16-
17-
@Configuration
18-
@EnableWebMvc
19-
@ComponentScan({ "org.baeldung.thymeleaf" })
20-
/**
21-
* Java configuration file that is used for Spring MVC and Thymeleaf
22-
* configurations
23-
*/
24-
public class WebMVCConfig extends WebMvcConfigurerAdapter {
25-
26-
@Bean
27-
@Description("Thymeleaf Template Resolver")
28-
public ServletContextTemplateResolver templateResolver() {
29-
ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver();
30-
templateResolver.setPrefix("/WEB-INF/views/");
31-
templateResolver.setSuffix(".html");
32-
templateResolver.setTemplateMode("HTML5");
33-
34-
return templateResolver;
35-
}
36-
37-
@Bean
38-
@Description("Thymeleaf Template Engine")
39-
public SpringTemplateEngine templateEngine() {
40-
SpringTemplateEngine templateEngine = new SpringTemplateEngine();
41-
templateEngine.setTemplateResolver(templateResolver());
42-
43-
return templateEngine;
44-
}
45-
46-
@Bean
47-
@Description("Thymeleaf View Resolver")
48-
public ThymeleafViewResolver viewResolver() {
49-
ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
50-
viewResolver.setTemplateEngine(templateEngine());
51-
viewResolver.setOrder(1);
52-
return viewResolver;
53-
}
54-
55-
@Bean
56-
@Description("Spring Message Resolver")
57-
public ResourceBundleMessageSource messageSource() {
58-
ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
59-
messageSource.setBasename("messages");
60-
return messageSource;
61-
}
62-
63-
@Override
64-
public void addResourceHandlers(ResourceHandlerRegistry registry) {
65-
registry.addResourceHandler("/resources/**").addResourceLocations("/WEB-INF/resources/");
66-
}
67-
68-
@Override
69-
@Description("Custom Conversion Service")
70-
public void addFormatters(FormatterRegistry registry) {
71-
registry.addFormatter(new NameFormatter());
72-
}
73-
}
1+
package com.baeldung.thymeleaf.config;
2+
3+
import com.baeldung.thymeleaf.formatter.NameFormatter;
4+
import org.springframework.context.annotation.Bean;
5+
import org.springframework.context.annotation.ComponentScan;
6+
import org.springframework.context.annotation.Configuration;
7+
import org.springframework.context.annotation.Description;
8+
import org.springframework.context.support.ResourceBundleMessageSource;
9+
import org.springframework.format.FormatterRegistry;
10+
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
11+
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
12+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
13+
import org.thymeleaf.spring4.SpringTemplateEngine;
14+
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
15+
import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
16+
17+
@Configuration
18+
@EnableWebMvc
19+
@ComponentScan({ "com.baeldung.thymeleaf" })
20+
/**
21+
* Java configuration file that is used for Spring MVC and Thymeleaf
22+
* configurations
23+
*/
24+
public class WebMVCConfig extends WebMvcConfigurerAdapter {
25+
26+
@Bean
27+
@Description("Thymeleaf Template Resolver")
28+
public ServletContextTemplateResolver templateResolver() {
29+
ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver();
30+
templateResolver.setPrefix("/WEB-INF/views/");
31+
templateResolver.setSuffix(".html");
32+
templateResolver.setTemplateMode("HTML5");
33+
34+
return templateResolver;
35+
}
36+
37+
@Bean
38+
@Description("Thymeleaf Template Engine")
39+
public SpringTemplateEngine templateEngine() {
40+
SpringTemplateEngine templateEngine = new SpringTemplateEngine();
41+
templateEngine.setTemplateResolver(templateResolver());
42+
43+
return templateEngine;
44+
}
45+
46+
@Bean
47+
@Description("Thymeleaf View Resolver")
48+
public ThymeleafViewResolver viewResolver() {
49+
ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
50+
viewResolver.setTemplateEngine(templateEngine());
51+
viewResolver.setOrder(1);
52+
return viewResolver;
53+
}
54+
55+
@Bean
56+
@Description("Spring Message Resolver")
57+
public ResourceBundleMessageSource messageSource() {
58+
ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
59+
messageSource.setBasename("messages");
60+
return messageSource;
61+
}
62+
63+
@Override
64+
public void addResourceHandlers(ResourceHandlerRegistry registry) {
65+
registry.addResourceHandler("/resources/**").addResourceLocations("/WEB-INF/resources/");
66+
}
67+
68+
@Override
69+
@Description("Custom Conversion Service")
70+
public void addFormatters(FormatterRegistry registry) {
71+
registry.addFormatter(new NameFormatter());
72+
}
73+
}

spring-thymeleaf/src/main/java/org/baeldung/thymeleaf/controller/HomeController.java renamed to spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.thymeleaf.controller;
1+
package com.baeldung.thymeleaf.controller;
22

33
import java.text.DateFormat;
44
import java.util.Date;

0 commit comments

Comments
 (0)