| commit 228a77552db58fdacd662f64455a96d7edbf1f09 (springsource/master, springsource/HEAD) | |
| Author: Juergen Hoeller <jhoeller@vmware.com> | |
| AuthorDate: Mon Sep 10 15:44:12 2012 +0200 | |
| Commit: Juergen Hoeller <jhoeller@vmware.com> | |
| CommitDate: Mon Sep 10 15:44:12 2012 +0200 | |
| @Import'ed configuration classes get properly registered in case of same class name | |
| Issue: SPR-9243 |
| diff --git a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java | |
| index 2839865..7e7c92e 100644 | |
| --- a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java | |
| +++ b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java | |
| @@ -85,7 +85,7 @@ import javax.servlet.ServletException; | |
| * are free to create and work with your Spring application contexts as necessary before | |
| * injecting them into the {@code DispatcherServlet}. | |
| * | |
| - * <p>Most major Spring Web components has been updated to support this style of | |
| + * <p>Most major Spring Web components have been updated to support this style of |
| /* | |
| * Copyright 2002-2012 the original author or authors. | |
| * | |
| * Licensed under the Apache License, Version 2.0 (the "License"); | |
| * you may not use this file except in compliance with the License. | |
| * You may obtain a copy of the License at | |
| * | |
| * http://www.apache.org/licenses/LICENSE-2.0 | |
| * | |
| * Unless required by applicable law or agreed to in writing, software |
| /* | |
| * Copyright 2002-2012 the original author or authors. | |
| * | |
| * Licensed under the Apache License, Version 2.0 (the "License"); | |
| * you may not use this file except in compliance with the License. | |
| * You may obtain a copy of the License at | |
| * | |
| * http://www.apache.org/licenses/LICENSE-2.0 | |
| * | |
| * Unless required by applicable law or agreed to in writing, software |
| /* | |
| * Copyright 2002-2012 the original author or authors. | |
| * | |
| * Licensed under the Apache License, Version 2.0 (the "License"); | |
| * you may not use this file except in compliance with the License. | |
| * You may obtain a copy of the License at | |
| * | |
| * http://www.apache.org/licenses/LICENSE-2.0 | |
| * | |
| * Unless required by applicable law or agreed to in writing, software |
| /* | |
| * Copyright 2002-2012 the original author or authors. | |
| * | |
| * Licensed under the Apache License, Version 2.0 (the "License"); | |
| * you may not use this file except in compliance with the License. | |
| * You may obtain a copy of the License at | |
| * | |
| * http://www.apache.org/licenses/LICENSE-2.0 | |
| * | |
| * Unless required by applicable law or agreed to in writing, software |
| /* | |
| * Copyright 2002-2012 the original author or authors. | |
| * | |
| * Licensed under the Apache License, Version 2.0 (the "License"); | |
| * you may not use this file except in compliance with the License. | |
| * You may obtain a copy of the License at | |
| * | |
| * http://www.apache.org/licenses/LICENSE-2.0 | |
| * | |
| * Unless required by applicable law or agreed to in writing, software |
