diff --git a/spring-rest/.springBeans b/spring-rest/.springBeans index 7623a7e888..a79097f40d 100644 --- a/spring-rest/.springBeans +++ b/spring-rest/.springBeans @@ -1,13 +1,13 @@ 1 - + - src/main/webapp/WEB-INF/mvc-servlet.xml + src/main/webapp/WEB-INF/api-servlet.xml diff --git a/spring-rest/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml similarity index 100% rename from spring-rest/src/main/webapp/WEB-INF/mvc-servlet.xml rename to spring-rest/src/main/webapp/WEB-INF/api-servlet.xml diff --git a/spring-rest/src/main/webapp/WEB-INF/web.xml b/spring-rest/src/main/webapp/WEB-INF/web.xml index c6d7ff0e96..48d4b8fe61 100644 --- a/spring-rest/src/main/webapp/WEB-INF/web.xml +++ b/spring-rest/src/main/webapp/WEB-INF/web.xml @@ -12,8 +12,8 @@ contextClass - org.springframework.web.context.support.AnnotationConfigWebApplicationContext - + org.springframework.web.context.support.AnnotationConfigWebApplicationContext + contextConfigLocation @@ -26,12 +26,12 @@ - mvc + api org.springframework.web.servlet.DispatcherServlet 1 - mvc + api /