diff --git a/.idea/icon.svg b/.idea/icon.svg index 89da1f709357..d0ac702b5b01 100644 --- a/.idea/icon.svg +++ b/.idea/icon.svg @@ -1,52 +1 @@ - - - - -icon-framework - - - - - - +icon-framework \ No newline at end of file diff --git a/framework-docs/modules/ROOT/assets/images/DataAccessException.png b/framework-docs/modules/ROOT/assets/images/DataAccessException.png index 746f17399b99..dfeb1d8a503b 100644 Binary files a/framework-docs/modules/ROOT/assets/images/DataAccessException.png and b/framework-docs/modules/ROOT/assets/images/DataAccessException.png differ diff --git a/framework-docs/modules/ROOT/assets/images/aop-proxy-call.png b/framework-docs/modules/ROOT/assets/images/aop-proxy-call.png index de6be86ed543..f77924d3d364 100644 Binary files a/framework-docs/modules/ROOT/assets/images/aop-proxy-call.png and b/framework-docs/modules/ROOT/assets/images/aop-proxy-call.png differ diff --git a/framework-docs/modules/ROOT/assets/images/aop-proxy-plain-pojo-call.png b/framework-docs/modules/ROOT/assets/images/aop-proxy-plain-pojo-call.png index 8ece077d3445..8b15808d9073 100644 Binary files a/framework-docs/modules/ROOT/assets/images/aop-proxy-plain-pojo-call.png and b/framework-docs/modules/ROOT/assets/images/aop-proxy-plain-pojo-call.png differ diff --git a/framework-docs/modules/ROOT/assets/images/container-magic.png b/framework-docs/modules/ROOT/assets/images/container-magic.png index 2628e59b00e8..67d25a2d280d 100644 Binary files a/framework-docs/modules/ROOT/assets/images/container-magic.png and b/framework-docs/modules/ROOT/assets/images/container-magic.png differ diff --git a/framework-docs/modules/ROOT/assets/images/message-flow-broker-relay.png b/framework-docs/modules/ROOT/assets/images/message-flow-broker-relay.png index 3cf93fa1439c..a234ca1d8e46 100644 Binary files a/framework-docs/modules/ROOT/assets/images/message-flow-broker-relay.png and b/framework-docs/modules/ROOT/assets/images/message-flow-broker-relay.png differ diff --git a/framework-docs/modules/ROOT/assets/images/message-flow-simple-broker.png b/framework-docs/modules/ROOT/assets/images/message-flow-simple-broker.png index 9afd54f57c23..afc837efbdf7 100644 Binary files a/framework-docs/modules/ROOT/assets/images/message-flow-simple-broker.png and b/framework-docs/modules/ROOT/assets/images/message-flow-simple-broker.png differ diff --git a/framework-docs/modules/ROOT/assets/images/mvc-context-hierarchy.png b/framework-docs/modules/ROOT/assets/images/mvc-context-hierarchy.png index 9ade68881de4..7b6250fe5719 100644 Binary files a/framework-docs/modules/ROOT/assets/images/mvc-context-hierarchy.png and b/framework-docs/modules/ROOT/assets/images/mvc-context-hierarchy.png differ diff --git a/framework-docs/modules/ROOT/assets/images/mvc-context-hierarchy.svg b/framework-docs/modules/ROOT/assets/images/mvc-context-hierarchy.svg index 817a97ec2fe2..fd3dc49288d9 100644 --- a/framework-docs/modules/ROOT/assets/images/mvc-context-hierarchy.svg +++ b/framework-docs/modules/ROOT/assets/images/mvc-context-hierarchy.svg @@ -1,625 +1 @@ - - - -image/svg+xmlPage-1DispatcherServlet -Servlet WebApplicationContext -(containing controllers, view resolvers,and other web-related beans) -Controllers -ViewResolver -HandlerMapping -Root WebApplicationContext -(containing middle-tier services, datasources, etc.) -Services -Repositories -Delegates if no bean found - \ No newline at end of file +Page-1DispatcherServletServlet WebApplicationContext(containing controllers, view resolvers,and other web-related beans)ControllersViewResolverHandlerMappingRoot WebApplicationContext(containing middle-tier services, datasources, etc.)ServicesRepositoriesDelegates if no bean found \ No newline at end of file diff --git a/framework-docs/modules/ROOT/assets/images/oxm-exceptions.png b/framework-docs/modules/ROOT/assets/images/oxm-exceptions.png index 8515e7c4887a..062af488f9c4 100644 Binary files a/framework-docs/modules/ROOT/assets/images/oxm-exceptions.png and b/framework-docs/modules/ROOT/assets/images/oxm-exceptions.png differ diff --git a/framework-docs/modules/ROOT/assets/images/prototype.png b/framework-docs/modules/ROOT/assets/images/prototype.png index 26fa2c1cf2d9..af5e4fa6eac8 100644 Binary files a/framework-docs/modules/ROOT/assets/images/prototype.png and b/framework-docs/modules/ROOT/assets/images/prototype.png differ diff --git a/framework-docs/modules/ROOT/assets/images/singleton.png b/framework-docs/modules/ROOT/assets/images/singleton.png index 591520ec1dcc..5ae5eccd1c22 100644 Binary files a/framework-docs/modules/ROOT/assets/images/singleton.png and b/framework-docs/modules/ROOT/assets/images/singleton.png differ diff --git a/framework-docs/modules/ROOT/assets/images/spring-mvc-and-webflux-venn.png b/framework-docs/modules/ROOT/assets/images/spring-mvc-and-webflux-venn.png index 6e0eeab744d4..7267662e0fd5 100644 Binary files a/framework-docs/modules/ROOT/assets/images/spring-mvc-and-webflux-venn.png and b/framework-docs/modules/ROOT/assets/images/spring-mvc-and-webflux-venn.png differ diff --git a/framework-docs/modules/ROOT/assets/images/tx.png b/framework-docs/modules/ROOT/assets/images/tx.png index 06f2e77c76f8..212f719e4cca 100644 Binary files a/framework-docs/modules/ROOT/assets/images/tx.png and b/framework-docs/modules/ROOT/assets/images/tx.png differ diff --git a/framework-docs/src/docs/spring-framework.png b/framework-docs/src/docs/spring-framework.png index 8945d6c6cbd7..8ce887b867ce 100644 Binary files a/framework-docs/src/docs/spring-framework.png and b/framework-docs/src/docs/spring-framework.png differ diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.gif b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.gif index da8b8f109291..aef8a855d5e2 100644 Binary files a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.gif and b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.gif differ diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png b/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png index f589a8a8023b..57ed09baa5ab 100644 Binary files a/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png and b/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/spring-ws.png differ diff --git a/spring-web/src/test/resources/org/springframework/http/converter/logo.jpg b/spring-web/src/test/resources/org/springframework/http/converter/logo.jpg index 8a70e6af1725..533c6f67940b 100644 Binary files a/spring-web/src/test/resources/org/springframework/http/converter/logo.jpg and b/spring-web/src/test/resources/org/springframework/http/converter/logo.jpg differ diff --git a/spring-webflux/src/test/resources/org/springframework/web/reactive/result/method/annotation/logo.png b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/method/annotation/logo.png index 10cc93fbcf9e..3daed5426ea6 100644 Binary files a/spring-webflux/src/test/resources/org/springframework/web/reactive/result/method/annotation/logo.png and b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/method/annotation/logo.png differ diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/method/annotation/logo.jpg b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/method/annotation/logo.jpg index 8a70e6af1725..533c6f67940b 100644 Binary files a/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/method/annotation/logo.jpg and b/spring-webmvc/src/test/resources/org/springframework/web/servlet/mvc/method/annotation/logo.jpg differ