diff --git a/spring-mvc-forms-jsp/README.md b/spring-mvc-forms-jsp/README.md index 86abd7e4c1..826be378b1 100644 --- a/spring-mvc-forms-jsp/README.md +++ b/spring-mvc-forms-jsp/README.md @@ -4,3 +4,4 @@ - [MaxUploadSizeExceededException in Spring](http://www.baeldung.com/spring-maxuploadsizeexceeded) - [Getting Started with Forms in Spring MVC](http://www.baeldung.com/spring-mvc-form-tutorial) - [Form Validation with AngularJS and Spring MVC](http://www.baeldung.com/validation-angularjs-spring-mvc) +- [Guide to JSTL](http://www.baeldung.com/guide-to-jstl) diff --git a/spring-mvc-forms-jsp/pom.xml b/spring-mvc-forms-jsp/pom.xml index bb666cff4f..88b18b16c4 100644 --- a/spring-mvc-forms-jsp/pom.xml +++ b/spring-mvc-forms-jsp/pom.xml @@ -48,6 +48,12 @@ ${jstl.version} + + mysql + mysql-connector-java + 6.0.6 + + org.hibernate hibernate-validator @@ -66,6 +72,7 @@ ${jackson.version} + @@ -97,6 +104,14 @@ + + + 1 + jstl + https://mvnrepository.com/artifact/javax.servlet/jstl + + + 4.3.7.RELEASE 2.6 @@ -104,9 +119,11 @@ 2.3.1 3.1.0 5.4.0.Final - enter-location-of-server + server default deploy directory 1.3.2 - 2.8.7 + 2.8.7 + 5.2.5.Final + 5.1.40 diff --git a/spring-mvc-xml/src/main/java/com/baeldung/jstl/bundles/CustomMessage_en.java b/spring-mvc-forms-jsp/src/main/java/com/baeldung/jstl/bundles/CustomMessage_en.java similarity index 100% rename from spring-mvc-xml/src/main/java/com/baeldung/jstl/bundles/CustomMessage_en.java rename to spring-mvc-forms-jsp/src/main/java/com/baeldung/jstl/bundles/CustomMessage_en.java diff --git a/spring-mvc-xml/src/main/java/com/baeldung/jstl/bundles/CustomMessage_fr_FR.java b/spring-mvc-forms-jsp/src/main/java/com/baeldung/jstl/bundles/CustomMessage_fr_FR.java similarity index 100% rename from spring-mvc-xml/src/main/java/com/baeldung/jstl/bundles/CustomMessage_fr_FR.java rename to spring-mvc-forms-jsp/src/main/java/com/baeldung/jstl/bundles/CustomMessage_fr_FR.java diff --git a/spring-mvc-xml/src/main/java/com/baeldung/jstl/controllers/JSTLController.java b/spring-mvc-forms-jsp/src/main/java/com/baeldung/jstl/controllers/JSTLController.java similarity index 98% rename from spring-mvc-xml/src/main/java/com/baeldung/jstl/controllers/JSTLController.java rename to spring-mvc-forms-jsp/src/main/java/com/baeldung/jstl/controllers/JSTLController.java index c69e8a1b2a..eb0ef820b4 100644 --- a/spring-mvc-xml/src/main/java/com/baeldung/jstl/controllers/JSTLController.java +++ b/spring-mvc-forms-jsp/src/main/java/com/baeldung/jstl/controllers/JSTLController.java @@ -91,6 +91,7 @@ public class JSTLController { @RequestMapping(value = "/xml_tags", method = RequestMethod.GET) public ModelAndView xmlTags(final Model model) { + System.out.println("dddddddddddddddddffffffffffffff"); ModelAndView mv = new ModelAndView("xml_tags"); return mv; } diff --git a/spring-mvc-xml/src/main/java/com/baeldung/jstl/dbaccess/SQLConnection.java b/spring-mvc-forms-jsp/src/main/java/com/baeldung/jstl/dbaccess/SQLConnection.java similarity index 100% rename from spring-mvc-xml/src/main/java/com/baeldung/jstl/dbaccess/SQLConnection.java rename to spring-mvc-forms-jsp/src/main/java/com/baeldung/jstl/dbaccess/SQLConnection.java diff --git a/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/configuration/ApplicationConfiguration.java b/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/configuration/ApplicationConfiguration.java index 7292d95b21..93fab9caf8 100644 --- a/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/configuration/ApplicationConfiguration.java +++ b/spring-mvc-forms-jsp/src/main/java/com/baeldung/springmvcforms/configuration/ApplicationConfiguration.java @@ -3,16 +3,18 @@ package com.baeldung.springmvcforms.configuration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.web.multipart.MultipartResolver; import org.springframework.web.multipart.commons.CommonsMultipartResolver; import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping; import org.springframework.web.servlet.view.InternalResourceViewResolver; @Configuration @EnableWebMvc -@ComponentScan(basePackages = "com.baeldung.springmvcforms") +@ComponentScan(basePackages = {"com.baeldung.springmvcforms", "com.baeldung.jstl"}) class ApplicationConfiguration extends WebMvcConfigurerAdapter { @Override @@ -20,14 +22,23 @@ class ApplicationConfiguration extends WebMvcConfigurerAdapter { configurer.enable(); } + @Bean + public ResourceBundleMessageSource resourceBundleMessageSource() { + ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource(); + messageSource.setBasename("messages"); + return messageSource; + } + + // switch orders to server views from html over views directory + @Bean public InternalResourceViewResolver jspViewResolver() { InternalResourceViewResolver bean = new InternalResourceViewResolver(); bean.setPrefix("/WEB-INF/views/"); bean.setSuffix(".jsp"); + bean.setOrder(1); return bean; } - @Bean public InternalResourceViewResolver htmlViewResolver() { diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/items.xsl b/spring-mvc-forms-jsp/src/main/webapp/WEB-INF/items.xsl similarity index 100% rename from spring-mvc-xml/src/main/webapp/WEB-INF/items.xsl rename to spring-mvc-forms-jsp/src/main/webapp/WEB-INF/items.xsl diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/view/core_tags.jsp b/spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/core_tags.jsp similarity index 100% rename from spring-mvc-xml/src/main/webapp/WEB-INF/view/core_tags.jsp rename to spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/core_tags.jsp diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/view/core_tags_redirect.jsp b/spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/core_tags_redirect.jsp similarity index 100% rename from spring-mvc-xml/src/main/webapp/WEB-INF/view/core_tags_redirect.jsp rename to spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/core_tags_redirect.jsp diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/view/formatting_tags.jsp b/spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/formatting_tags.jsp similarity index 100% rename from spring-mvc-xml/src/main/webapp/WEB-INF/view/formatting_tags.jsp rename to spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/formatting_tags.jsp diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/view/function_tags.jsp b/spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/function_tags.jsp similarity index 100% rename from spring-mvc-xml/src/main/webapp/WEB-INF/view/function_tags.jsp rename to spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/function_tags.jsp diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/view/sql_tags.jsp b/spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/sql_tags.jsp similarity index 100% rename from spring-mvc-xml/src/main/webapp/WEB-INF/view/sql_tags.jsp rename to spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/sql_tags.jsp diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/view/xml_tags.jsp b/spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/xml_tags.jsp similarity index 100% rename from spring-mvc-xml/src/main/webapp/WEB-INF/view/xml_tags.jsp rename to spring-mvc-forms-jsp/src/main/webapp/WEB-INF/views/xml_tags.jsp diff --git a/spring-mvc-xml/README.md b/spring-mvc-xml/README.md index b84614dd71..7a5e8c75e9 100644 --- a/spring-mvc-xml/README.md +++ b/spring-mvc-xml/README.md @@ -15,4 +15,3 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring - [Geolocation by IP in Java](http://www.baeldung.com/geolocation-by-ip-with-maxmind) - [Guide to JavaServer Pages (JSP)](http://www.baeldung.com/jsp) - [Exploring SpringMVC’s Form Tag Library](http://www.baeldung.com/spring-mvc-form-tags) -- [Guide to JSTL](http://www.baeldung.com/guide-to-jstl) diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 47ecdc438d..581b94e0c8 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -64,12 +64,6 @@ ${hibernate-validator.version} - - mysql - mysql-connector-java - 6.0.6 - - diff --git a/spring-mvc-xml/src/main/resources/webMvcConfig.xml b/spring-mvc-xml/src/main/resources/webMvcConfig.xml index ebb0a14113..37aebe1d1d 100644 --- a/spring-mvc-xml/src/main/resources/webMvcConfig.xml +++ b/spring-mvc-xml/src/main/resources/webMvcConfig.xml @@ -23,7 +23,7 @@ - + diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-mvc-xml/src/main/webapp/WEB-INF/mvc-servlet.xml index f664472652..5c8fa611ed 100644 --- a/spring-mvc-xml/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-mvc-xml/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - +