From 94f97da4dc96f19ad3b263e964f2961c59903b02 Mon Sep 17 00:00:00 2001 From: "yihua.huang" Date: Wed, 2 Apr 2014 07:36:31 +0800 Subject: [PATCH] [Avalon] fix spring config for static and ignore google fonts for better loading speed --- webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/static/css/bootstrap-cerulean.css | 2 +- .../src/main/webapp/static/css/bootstrap-cyborg.css | 2 +- .../src/main/webapp/static/css/bootstrap-journal.css | 2 +- .../src/main/webapp/static/css/bootstrap-redy.css | 2 +- .../src/main/webapp/static/css/bootstrap-united.css | 2 +- .../webmagic-admin/src/main/webapp/static/css/charisma-app.css | 2 +- .../main/resources/config/spring/applicationContext-webmvc.xml | 2 ++ webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml index 4c255cd..cd7ee5b 100644 --- a/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml +++ b/webmagic-avalon/webmagic-admin/src/main/webapp/WEB-INF/web.xml @@ -33,7 +33,7 @@ org.springframework.web.servlet.DispatcherServlet contextConfigLocation - classpath:/spring/applicationContext*.xml + classpath*:config/spring/applicationContext*.xml 1 diff --git a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cerulean.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cerulean.css index 82037d4..3d95708 100755 --- a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cerulean.css +++ b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cerulean.css @@ -1,4 +1,4 @@ -@import url(https://fonts.googleapis.com/css?family=Karla|Ubuntu); +/*@import url(https://fonts.googleapis.com/css?family=Karla|Ubuntu);*/ /*! * Bootstrap v2.0.4 * diff --git a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cyborg.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cyborg.css index 6f4b9c4..39ec617 100755 --- a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cyborg.css +++ b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-cyborg.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Droid+Sans:400,700'); +/*@import url('https://fonts.googleapis.com/css?family=Droid+Sans:400,700');*/ /*! * Bootstrap v2.0.4 * diff --git a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-journal.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-journal.css index 9c18433..e335d98 100755 --- a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-journal.css +++ b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-journal.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700'); +/*@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');*/ /*! * Bootstrap v2.0.4 * diff --git a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-redy.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-redy.css index f498982..2e208b2 100644 --- a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-redy.css +++ b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-redy.css @@ -1,4 +1,4 @@ -@import url(https://fonts.googleapis.com/css?family=Karla|Ubuntu); +/*@import url(https://fonts.googleapis.com/css?family=Karla|Ubuntu);*/ /*! * Bootstrap v2.0.4 * diff --git a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-united.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-united.css index b05b04e..94e4c79 100755 --- a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-united.css +++ b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/bootstrap-united.css @@ -1,4 +1,4 @@ -@import url(https://fonts.googleapis.com/css?family=Ubuntu); +/*@import url(https://fonts.googleapis.com/css?family=Ubuntu);*/ /*! * Bootstrap v2.0.4 * diff --git a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/charisma-app.css b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/charisma-app.css index f795fb4..5b46b39 100755 --- a/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/charisma-app.css +++ b/webmagic-avalon/webmagic-admin/src/main/webapp/static/css/charisma-app.css @@ -1,4 +1,4 @@ -@import url(https://fonts.googleapis.com/css?family=Shojumaru); +/*@import url(https://fonts.googleapis.com/css?family=Shojumaru);*/ select{ background-color:#fff; diff --git a/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-webmvc.xml b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-webmvc.xml index 340cfb2..476cd39 100644 --- a/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-webmvc.xml +++ b/webmagic-avalon/webmagic-avalon-common/src/main/resources/config/spring/applicationContext-webmvc.xml @@ -26,6 +26,8 @@ + + \ No newline at end of file diff --git a/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml b/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml index b521ed6..533832e 100644 --- a/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml +++ b/webmagic-avalon/webmagic-worker/src/main/webapp/WEB-INF/web.xml @@ -33,7 +33,7 @@ org.springframework.web.servlet.DispatcherServlet contextConfigLocation - classpath:/config/spring/applicationContext*.xml + classpath*:/config/spring/applicationContext*.xml 1