root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Correct sample in webmvc.adoc 

Closes gh-25965
This commit is contained in:
Rossen Stoyanchev 2020-10-26 07:40:33 +00:00
parent fb4363e4e0
commit 86af93a504
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/docs/asciidoc/web/webmvc.adoc
View File

@ -46,16 +46,15 @@ the `DispatcherServlet`, which is auto-detected by the Servlet container
public class MyWebApplicationInitializer implements WebApplicationInitializer { public class MyWebApplicationInitializer implements WebApplicationInitializer {
@Override @Override
public void onStartup(ServletContext servletCxt) { public void onStartup(ServletContext servletContext) {
// Load Spring web application configuration // Load Spring web application configuration
AnnotationConfigWebApplicationContext ac = new AnnotationConfigWebApplicationContext(); AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
ac.register(AppConfig.class); context.register(AppConfig.class);
ac.refresh();
// Create and register the DispatcherServlet // Create and register the DispatcherServlet
DispatcherServlet servlet = new DispatcherServlet(ac); DispatcherServlet servlet = new DispatcherServlet(context);
ServletRegistration.Dynamic registration = servletCxt.addServlet("app", servlet); ServletRegistration.Dynamic registration = servletContext.addServlet("app", servlet);
registration.setLoadOnStartup(1); registration.setLoadOnStartup(1);
registration.addMapping("/app/*"); registration.addMapping("/app/*");
} }
@ -66,16 +65,15 @@ the `DispatcherServlet`, which is auto-detected by the Servlet container
---- ----
class MyWebApplicationInitializer : WebApplicationInitializer { class MyWebApplicationInitializer : WebApplicationInitializer {
override fun onStartup(servletCxt: ServletContext) { override fun onStartup(servletContext: ServletContext) {
// Load Spring web application configuration // Load Spring web application configuration
val ac = AnnotationConfigWebApplicationContext() val context = AnnotationConfigWebApplicationContext()
ac.register(AppConfig::class.java) context.register(AppConfig::class.java)
ac.refresh()
// Create and register the DispatcherServlet // Create and register the DispatcherServlet
val servlet = DispatcherServlet(ac) val servlet = DispatcherServlet(context)
val registration = servletCxt.addServlet("app", servlet) val registration = servletContext.addServlet("app", servlet)
registration.setLoadOnStartup(1) registration.setLoadOnStartup(1)
registration.addMapping("/app/*") registration.addMapping("/app/*")
} }