diff --git a/pom.xml b/pom.xml index e6e11326d7..9b16c069fd 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,6 @@ spring-mvc-java spring-mvc-tiles spring-mvc-velocity - spring-mvc-web-vs-initializer spring-mvc-webflow spring-mvc-xml spring-mvc-simple diff --git a/spring-mvc-java/README.md b/spring-mvc-java/README.md index 533d37fe00..504cfcdcc7 100644 --- a/spring-mvc-java/README.md +++ b/spring-mvc-java/README.md @@ -22,3 +22,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring - [Guide to Spring Handler Mappings](http://www.baeldung.com/spring-handler-mappings) - [Uploading and Displaying Excel Files with Spring MVC](http://www.baeldung.com/spring-mvc-excel-files) - [Spring MVC Custom Validation](http://www.baeldung.com/spring-mvc-custom-validator) +- [web.xml vs Initializer with Spring](http://www.baeldung.com/spring-xml-vs-java-config) diff --git a/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/config/AppInitializer.java b/spring-mvc-java/src/main/java/com/baeldung/config/AppInitializer.java similarity index 97% rename from spring-mvc-web-vs-initializer/src/main/java/org/baeldung/config/AppInitializer.java rename to spring-mvc-java/src/main/java/com/baeldung/config/AppInitializer.java index 21e33820ca..9cf6e384f1 100644 --- a/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/config/AppInitializer.java +++ b/spring-mvc-java/src/main/java/com/baeldung/config/AppInitializer.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package com.baeldung.config; import org.springframework.web.WebApplicationInitializer; import org.springframework.web.context.ContextLoaderListener; diff --git a/spring-mvc-web-vs-initializer/src/main/resources/mvc-configuration.xml b/spring-mvc-java/src/main/resources/mvc-configuration.xml similarity index 100% rename from spring-mvc-web-vs-initializer/src/main/resources/mvc-configuration.xml rename to spring-mvc-java/src/main/resources/mvc-configuration.xml diff --git a/spring-mvc-web-vs-initializer/.gitignore b/spring-mvc-web-vs-initializer/.gitignore deleted file mode 100644 index 83c05e60c8..0000000000 --- a/spring-mvc-web-vs-initializer/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.class - -#folders# -/target -/neoDb* -/data -/src/main/webapp/WEB-INF/classes -*/META-INF/* - -# Packaged files # -*.jar -*.war -*.ear \ No newline at end of file diff --git a/spring-mvc-web-vs-initializer/README.MD b/spring-mvc-web-vs-initializer/README.MD deleted file mode 100644 index 4759cf6137..0000000000 --- a/spring-mvc-web-vs-initializer/README.MD +++ /dev/null @@ -1,2 +0,0 @@ -### Relevant Articles: -- [web.xml vs Initializer with Spring](http://www.baeldung.com/spring-xml-vs-java-config) diff --git a/spring-mvc-web-vs-initializer/pom.xml b/spring-mvc-web-vs-initializer/pom.xml deleted file mode 100644 index 2f7b7ea98e..0000000000 --- a/spring-mvc-web-vs-initializer/pom.xml +++ /dev/null @@ -1,193 +0,0 @@ - - 4.0.0 - com.baeldung - spring-mvc-web-vs-initializer - 0.1-SNAPSHOT - - spring-mvc-web-vs-initializer - war - - - parent-boot-4 - com.baeldung - 0.0.1-SNAPSHOT - ../parent-boot-4 - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - - org.springframework - spring-web - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - - - org.springframework - spring-context - - - - - - javax.servlet - javax.servlet-api - provided - - - - javax.servlet - jstl - runtime - - - - - - com.google.guava - guava - ${guava.version} - - - - - - org.springframework - spring-test - test - - - - org.assertj - assertj-core - test - - - - org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library - test - - - - org.mockito - mockito-core - test - - - - org.easymock - easymock - ${easymock.version} - test - - - - - - - - - - org.springframework - spring-framework-bom - ${org.springframework.version} - pom - import - - - - org.springframework - spring-core - ${org.springframework.version} - - - - - - - - spring-mvc-web-vs-initializer - - - src/main/resources - true - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - - - - - 4.3.4.RELEASE - - - 19.0 - 3.4 - - - - \ No newline at end of file diff --git a/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/config/MvcConfig.java b/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/config/MvcConfig.java deleted file mode 100644 index d460113458..0000000000 --- a/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/config/MvcConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.baeldung.config; - -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 org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; -import org.springframework.web.servlet.view.InternalResourceViewResolver; - -@Configuration -@EnableWebMvc -@ComponentScan(basePackages = "org.baeldung.controller.java") -public class MvcConfig extends WebMvcConfigurerAdapter { - - @Bean - public ViewResolver viewResolver() { - InternalResourceViewResolver viewResolver = new InternalResourceViewResolver(); - viewResolver.setPrefix("/WEB-INF/view/"); - viewResolver.setSuffix(".jsp"); - - return viewResolver; - } - -} diff --git a/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/controller/java/JavaController.java b/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/controller/java/JavaController.java deleted file mode 100644 index c979c88b34..0000000000 --- a/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/controller/java/JavaController.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung.controller.java; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - -@Controller -public class JavaController { - - @RequestMapping(value = "/endpoint") - public ModelAndView handleRequestFromJavaConfiguredServlet() { - ModelAndView mv = new ModelAndView(); - mv.setViewName("from-java"); - - return mv; - } - -} \ No newline at end of file diff --git a/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/controller/xml/XmlController.java b/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/controller/xml/XmlController.java deleted file mode 100644 index bdefc1781c..0000000000 --- a/spring-mvc-web-vs-initializer/src/main/java/org/baeldung/controller/xml/XmlController.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung.controller.xml; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - -@Controller -public class XmlController { - - @RequestMapping(value = "/endpoint") - public ModelAndView handleRequestFromXmlConfiguredServlet() { - ModelAndView mv = new ModelAndView(); - mv.setViewName("from-xml"); - - return mv; - } - -} \ No newline at end of file diff --git a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/view/from-java.jsp b/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/view/from-java.jsp deleted file mode 100644 index e54d7520dc..0000000000 --- a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/view/from-java.jsp +++ /dev/null @@ -1,7 +0,0 @@ - - - - -

Java

- - \ No newline at end of file diff --git a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/view/from-xml.jsp b/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/view/from-xml.jsp deleted file mode 100644 index 986010c183..0000000000 --- a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/view/from-xml.jsp +++ /dev/null @@ -1,7 +0,0 @@ - - - - -

XML

- - \ No newline at end of file diff --git a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml b/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 5c7a0b52d4..0000000000 --- a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - xml-servlet - - org.springframework.web.servlet.DispatcherServlet - - - contextConfigLocation - classpath*:mvc-configuration.xml - - 1 - - - - xml-servlet - /xml-servlet/* - - - diff --git a/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/JavaServletIntegrationTest.java b/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/JavaServletIntegrationTest.java deleted file mode 100644 index 0461cc8fcc..0000000000 --- a/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/JavaServletIntegrationTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.baeldung.controller; - -import org.baeldung.config.MvcConfig; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.AnnotationConfigWebContextLoader; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.servlet.ModelAndView; - - -@RunWith(SpringJUnit4ClassRunner.class) -@WebAppConfiguration -@ContextConfiguration(loader=AnnotationConfigWebContextLoader.class, classes = MvcConfig.class) -public class JavaServletIntegrationTest { - - private MockMvc mockMvc; - - @Autowired - private WebApplicationContext wac; - - @Before - public void setUp() { - this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); - } - - @Test - public void testJavaEndpoint() throws Exception { - ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/endpoint")) - .andReturn() - .getModelAndView(); - - // validate view name - Assert.assertSame(mv.getViewName(), "from-java"); - } - -} diff --git a/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/XmlServletIntegrationTest.java b/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/XmlServletIntegrationTest.java deleted file mode 100644 index e1273f8f88..0000000000 --- a/spring-mvc-web-vs-initializer/src/test/java/org/baeldung/controller/XmlServletIntegrationTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.baeldung.controller; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.GenericXmlWebContextLoader; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.servlet.ModelAndView; - - -@RunWith(SpringJUnit4ClassRunner.class) -@WebAppConfiguration -@ContextConfiguration(loader=GenericXmlWebContextLoader.class, locations = "classpath*:mvc-configuration.xml") -public class XmlServletIntegrationTest { - - private MockMvc mockMvc; - - @Autowired - private WebApplicationContext wac; - - @Before - public void setUp() { - this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); - } - - @Test - public void testXmlEndpoint() throws Exception { - ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/endpoint")) - .andReturn() - .getModelAndView(); - - // validate view name - Assert.assertSame(mv.getViewName(), "from-xml"); - } - -}