From 1ab8bf81998104375aa0c85c8deac8c3a2f1c94b Mon Sep 17 00:00:00 2001
From: liaoxuezhi <liaoxuezhi@baidu.com>
Date: Mon, 11 Aug 2014 14:26:22 +0800
Subject: [PATCH] update

---
 .../com/baidu/fis/velocity/spring/FisBean.java     | 13 ++++++++++++-
 web/WEB-INF/web.xml                                | 14 --------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/baidu/fis/velocity/spring/FisBean.java b/src/main/java/com/baidu/fis/velocity/spring/FisBean.java
index db0b01c..7ab5d6e 100644
--- a/src/main/java/com/baidu/fis/velocity/spring/FisBean.java
+++ b/src/main/java/com/baidu/fis/velocity/spring/FisBean.java
@@ -1,7 +1,18 @@
 package com.baidu.fis.velocity.spring;
 
+import com.baidu.fis.velocity.util.Settings;
+import org.springframework.web.context.ServletContextAware;
+
+import javax.servlet.ServletContext;
+
 /**
  * Created by 2betop on 8/11/14.
  */
-public class FisBean {
+public class FisBean implements ServletContextAware {
+
+    @Override
+    public void setServletContext(ServletContext servletContext) {
+        Settings.setApplicationAttribute(ServletContext.class.getName(), servletContext);
+        Settings.load(servletContext.getResourceAsStream(Settings.DEFAULT_PATH));
+    }
 }
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 5e297a6..3ef594f 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -13,24 +13,10 @@
         <dispatcher>REQUEST</dispatcher>
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
-    <servlet>
-        <servlet-name>appServlet</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <init-param>
-            <param-name>contextConfigLocation</param-name>
-            <param-value>/WEB-INF/servlet-context.xml</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-        <async-supported>true</async-supported>
-    </servlet>
     <servlet>
         <servlet-name>velocity</servlet-name>
         <servlet-class>com.baidu.fis.velocity.servlet.VelocityServlet</servlet-class>
     </servlet>
-    <servlet-mapping>
-        <servlet-name>appServlet</servlet-name>
-        <url-pattern>/spring/*</url-pattern>
-    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>velocity</servlet-name>
         <url-pattern>*.vm</url-pattern>