[BAEL-19881] - Rename spring-mvc-simple modules

pom.xml

@@ -629,7 +629,7 @@
                 <module>spring-boot-mvc-2</module>
                 <module>spring-boot-performance</module>
                 <module>spring-boot-properties</module>
-                <!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
+                <module>spring-mvc-basics</module>
                 <module>spring-security-modules/spring-security-kerberos</module>
                 <module>oauth2-framework-impl</module>
 
@@ -786,13 +786,13 @@
 
                 <module>spring-mobile</module>
                 <module>spring-mockito</module>
-                <module>spring-mvc-basics-2</module>
+                <module>spring-mvc-basics-4</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
                 <module>spring-mvc-java</module>
                 <module>spring-mvc-kotlin</module>
-                <module>spring-mvc-simple</module>
+                <module>spring-mvc-basics-2</module>
-                <module>spring-mvc-simple-2</module>
+                <module>spring-mvc-basics-3</module>
                 <module>spring-mvc-views</module>
                 <module>spring-mvc-velocity</module>
                 <module>spring-mvc-webflow</module>
@@ -1259,7 +1259,7 @@
                 <module>spf4j</module>
                 <module>spring-boot-performance</module>
                 <module>spring-boot-properties</module>
-                <!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
+                <module>spring-mvc-basics</module>
                 <!-- <module>Twitter4J</module> --> <!-- Builds locally, but fails in Jenkins, Failed to parse POMs -->
 
             </modules>
@@ -1391,13 +1391,13 @@
 
                 <module>spring-mobile</module>
                 <module>spring-mockito</module>
-                <module>spring-mvc-basics-2</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
                 <module>spring-mvc-java</module>
                 <module>spring-mvc-kotlin</module>
-                <module>spring-mvc-simple</module>
+                <module>spring-mvc-basics-2</module>
-                <module>spring-mvc-simple-2</module>
+                <module>spring-mvc-basics-3</module>
+                <module>spring-mvc-basics-4</module>
                 <module>spring-mvc-views</module>
                 <module>spring-mvc-velocity</module>
                 <module>spring-mvc-webflow</module>

spring-mvc-basics-2/README.md

@@ -1,14 +1,15 @@
-## Spring MVC Basics
+## Spring MVC Basics 2
 
-This module contains articles about the basics of Spring MVC. Articles about more specific areas of Spring MVC have
+This module contains articles about Spring MVC
-their own module. 
 
-### The Course
+## Relevant articles:
-The "REST With Spring" Classes: http://bit.ly/restwithspring
+- [HandlerAdapters in Spring MVC](https://www.baeldung.com/spring-mvc-handler-adapters)
-
+- [Template Engines for Spring](https://www.baeldung.com/spring-template-engines)
-### Relevant Articles: 
+- [Spring 5 and Servlet 4 – The PushBuilder](https://www.baeldung.com/spring-5-push)
-- [Quick Guide to Spring Controllers](http://www.baeldung.com/spring-controllers)
+- [Servlet Redirect vs Forward](https://www.baeldung.com/servlet-redirect-forward)
-- [The Spring @Controller and @RestController Annotations](http://www.baeldung.com/spring-controller-vs-restcontroller)
+- [Apache Tiles Integration with Spring MVC](https://www.baeldung.com/spring-mvc-apache-tiles)
-- [Model, ModelMap, and ModelView in Spring MVC](http://www.baeldung.com/spring-mvc-model-model-map-model-view)
+- [Guide to Spring Email](https://www.baeldung.com/spring-email)
-- [Spring Web Contexts](http://www.baeldung.com/spring-web-contexts)
+- [Request Method Not Supported (405) in Spring](https://www.baeldung.com/spring-request-method-not-supported-405)
-- [[<-- Prev]](/spring-mvc-basics)
+- [Spring @RequestParam Annotation](https://www.baeldung.com/spring-request-param)
+- More articles: [[more -->]](/spring-mvc-basics-3)
+- More articles: [[<-- prev]](/spring-mvc-basics)

spring-mvc-basics-2/pom.xml

@@ -1,37 +1,185 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-mvc-basics-2</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
     <name>spring-mvc-basics-2</name>
     <packaging>war</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-spring-5</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>org.springframework</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <artifactId>spring-oxm</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
+            <groupId>com.sun.mail</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>javax.mail</artifactId>
+            <version>${javax.mail.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
+            <version>${javax.servlet-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+            <version>${javax.servlet.jsp-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>${jstl.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${commons-fileupload.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <!-- thymeleaf dependencies -->
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf</artifactId>
+            <version>${org.thymeleaf-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-spring4</artifactId>
+            <version>${org.thymeleaf-version}</version>
+        </dependency>
+
+        <!-- freemarker dependencies -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>${freemarker.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <!-- groovy template dependency -->
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-templates</artifactId>
+            <version>${groovy.version}</version>
+        </dependency>
+
+        <!-- jade dependency -->
+        <dependency>
+            <groupId>de.neuland-bfi</groupId>
+            <artifactId>spring-jade4j</artifactId>
+            <version>${jade.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tiles</groupId>
+            <artifactId>tiles-jsp</artifactId>
+            <version>${apache-tiles.version}</version>
+        </dependency>
+
+        <!--Testing -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.rometools</groupId>
+            <artifactId>rome</artifactId>
+            <version>${rome.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.scribejava</groupId>
+            <artifactId>scribejava-apis</artifactId>
+            <version>${scribejava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>${json.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-logger-api</artifactId>
+            <version>${maven-surefire-plugin.version}</version>
+            <!-- to get around bug https://github.com/junit-team/junit5/issues/1367 -->
+            <scope>test</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
-</project>
+    <build>
+        <finalName>spring-mvc-basics-2</finalName>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven-war-plugin.version}</version>
+                    <configuration>
+                        <warSourceDirectory>src/main/webapp</warSourceDirectory>
+                        <warName>springMvcSimple</warName>
+                        <failOnMissingWebXml>false</failOnMissingWebXml>
+                        <outputDirectory>${deploy-path}</outputDirectory>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
+        <javax.servlet-api.version>4.0.0</javax.servlet-api.version>
+        <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
+        <deploy-path>enter-location-of-server</deploy-path>
+        <commons-fileupload.version>1.3.2</commons-fileupload.version>
+        <org.thymeleaf-version>3.0.7.RELEASE</org.thymeleaf-version>
+        <groovy.version>2.4.12</groovy.version>
+        <freemarker.version>2.3.27-incubating</freemarker.version>
+        <jade.version>1.2.5</jade.version>
+        <rome.version>1.9.0</rome.version>
+        <xstream.version>1.4.9</xstream.version>
+        <scribejava.version>5.1.0</scribejava.version>
+        <json.version>20180130</json.version>
+        <apache-tiles.version>3.0.8</apache-tiles.version>
+        <javax.mail.version>1.6.1</javax.mail.version>
+    </properties>
+
+</project>

spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/AnnotationMethodHandlerAdapterExample.java

@@ -1,15 +1,15 @@
-package com.baeldung.spring.controller;
+package com.baeldung.spring.controller;
-
+
-import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.ModelAndView;
-
+
-@Controller
+@Controller
-public class AnnotationMethodHandlerAdapterExample {
+public class AnnotationMethodHandlerAdapterExample {
-    @RequestMapping("/annotedName")
+    @RequestMapping("/annotedName")
-    public ModelAndView getEmployeeName() {
+    public ModelAndView getEmployeeName() {
-        ModelAndView model = new ModelAndView("Greeting");
+        ModelAndView model = new ModelAndView("Greeting");
-        model.addObject("message", "Dinesh");
+        model.addObject("message", "Dinesh");
-        return model;
+        return model;
-    }
+    }
 }

spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/RequestMappingHandlerAdapterExample.java

@@ -1,15 +1,15 @@
-package com.baeldung.spring.controller;
+package com.baeldung.spring.controller;
-
+
-import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.ModelAndView;
-
+
-@Controller
+@Controller
-public class RequestMappingHandlerAdapterExample {
+public class RequestMappingHandlerAdapterExample {
-    @RequestMapping("/requestName")
+    @RequestMapping("/requestName")
-    public ModelAndView getEmployeeName() {
+    public ModelAndView getEmployeeName() {
-        ModelAndView model = new ModelAndView("Greeting");
+        ModelAndView model = new ModelAndView("Greeting");
-        model.addObject("message", "Madhwal");
+        model.addObject("message", "Madhwal");
-        return model;
+        return model;
-    }
+    }
 }

spring-mvc-basics-2/src/main/java/com/baeldung/spring/controller/SimpleControllerHandlerAdapterExample.java

@@ -1,16 +1,16 @@
-package com.baeldung.spring.controller;
+package com.baeldung.spring.controller;
-
+
-import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
-
+
-import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.AbstractController;
+import org.springframework.web.servlet.mvc.AbstractController;
-
+
-public class SimpleControllerHandlerAdapterExample extends AbstractController {
+public class SimpleControllerHandlerAdapterExample extends AbstractController {
-    @Override
+    @Override
-    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        ModelAndView model = new ModelAndView("Greeting");
+        ModelAndView model = new ModelAndView("Greeting");
-        model.addObject("message", "Dinesh Madhwal");
+        model.addObject("message", "Dinesh Madhwal");
-        return model;
+        return model;
-    }
+    }
 }

spring-mvc-basics-2/src/main/resources/application.properties

@@ -1 +1,22 @@
-spring.main.allow-bean-definition-overriding=true
+#this property file will have to be loaded explicitly as this is not a Spring Boot project
+
+# Gmail SMTP
+spring.mail.host=smtp.gmail.com
+spring.mail.port=587
+spring.mail.username=username
+spring.mail.password=password
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+
+# Amazon SES SMTP
+#spring.mail.host=email-smtp.us-west-2.amazonaws.com
+#spring.mail.username=username
+#spring.mail.password=password
+#spring.mail.properties.mail.transport.protocol=smtp
+#spring.mail.properties.mail.smtp.port=25
+#spring.mail.properties.mail.smtp.auth=true
+#spring.mail.properties.mail.smtp.starttls.enable=true
+#spring.mail.properties.mail.smtp.starttls.required=true
+
+# path to attachment file
+attachment.invoice=path_to_file

spring-mvc-basics-3/README.md

@@ -1,4 +1,4 @@
-## Spring MVC Simple 2
+## Spring MVC Basics 3
 
 This module contains articles about Spring MVC
 
@@ -11,4 +11,5 @@ This module contains articles about Spring MVC
 - [Using Enums as Request Parameters in Spring](https://www.baeldung.com/spring-enum-request-param)
 - [Excluding URLs for a Filter in a Spring Web Application](https://www.baeldung.com/spring-exclude-filter)
 - [Guide to Flash Attributes in a Spring Web Application](https://www.baeldung.com/spring-web-flash-attributes)
-- More articles: [[<-- prev]](/spring-mvc-simple)
+- More articles: [[more -->]](/spring-mvc-basics-4)
+- More articles: [[<-- prev]](/spring-mvc-basics-2)

spring-mvc-basics-3/pom.xml

@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-mvc-simple-2</artifactId>
+    <artifactId>spring-mvc-basics-3</artifactId>
-    <name>spring-mvc-simple-2</name>
+    <name>spring-mvc-basics-3</name>
     <packaging>war</packaging>
     <description>Demo project for Spring Boot</description>