Index: ssts-web/src/main/webapp/WEB-INF/web-cszxyy.xml
===================================================================
diff -u -r12331 -r12335
--- ssts-web/src/main/webapp/WEB-INF/web-cszxyy.xml	(.../web-cszxyy.xml)	(revision 12331)
+++ ssts-web/src/main/webapp/WEB-INF/web-cszxyy.xml	(.../web-cszxyy.xml)	(revision 12335)
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+	      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	      version="3.0">
+	      
     <display-name>SterileSupplySystem</display-name>
   
     <context-param>
@@ -22,15 +27,26 @@
         <param-value>com.forgon.portal</param-value>
     </context-param>
 
-    <context-param>
-        <param-name>jmesaPreferencesLocation</param-name>
-        <param-value>WEB-INF/jmesa.properties</param-value>
-    </context-param>
-    <context-param>
-        <param-name>jmesaMessagesLocation</param-name>
-        <param-value>resources/jmesaResourceBundle</param-value>
-    </context-param>
+    <filter>
+        <filter-name>SSOFilter</filter-name>
+        <filter-class>com.forgon.disinfectsystem.security.filter.LoginFilterForChangshaZhongXinHospital</filter-class>
+    </filter>
     
+    <filter-mapping>
+       <filter-name>SSOFilter</filter-name>
+       <url-pattern>/j_spring_security_check</url-pattern>
+    </filter-mapping>
+    
+	<filter>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>springSecurityFilterChain</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
     <filter>
         <filter-name>EncodingFilter</filter-name>
         <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
@@ -50,39 +66,17 @@
     </filter>
     
     <!--Hibernate Open Session in View Filter-->
-    <filter>
-        <filter-name>Acegi Filter Chain Proxy</filter-name>
-        <filter-class>org.springframework.security.util.FilterToBeanProxy</filter-class>
-        <init-param>
-            <param-name>targetClass</param-name>
-            <param-value>org.springframework.security.util.FilterChainProxy</param-value>
-        </init-param>
-    </filter>
     
     <filter>
-        <filter-name>versionManagerFilter</filter-name>
-        <filter-class>com.forgon.register.filter.VersionManagerFilter</filter-class>
-        <init-param>
-            <param-name>noFilterUrl</param-name>
-            <param-value>/debug/;/disinfectsystem/config/;/disinfectsystem/common/;/disinfectSystem/fileUploadServlet;/CodeImageServlet;/fckeditor/;/UserUpLoadFiles/;/openSystemMainPage.jsp;/logon.jsp;/favicon.ico;/js/;/common/taglibs.jsp;/jquery/;/ext/;/dwr/;/images/;/styles/;/scripts/;/wap/index.jsp;/themes/;/services/;/ikey/;/mobileClient/;/disinfectSystem/sterilization/sterilizationRecordAction!uploadSterilizationRecordPic.do</param-value>
-        </init-param>
-    </filter>
-    
-    <filter>
         <filter-name>struts2</filter-name>
         <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
     
      <filter>
         <filter-name>hibernateFilter</filter-name>
-        <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
+        <filter-class>org.springframework.orm.hibernate4.support.OpenSessionInViewFilter</filter-class>
     </filter>
     
-    <filter>
-        <filter-name>SSOFilter</filter-name>
-        <filter-class>com.forgon.disinfectsystem.security.filter.LoginFilterForChangshaZhongXinHospital</filter-class>
-    </filter>
-    
     <filter-mapping>
         <filter-name>EncodingFilter</filter-name>
         <url-pattern>/*</url-pattern>
@@ -93,22 +87,10 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
     
-    <filter-mapping>
-       <filter-name>SSOFilter</filter-name>
-       <url-pattern>/j_spring_security_check</url-pattern>
-    </filter-mapping>
 
-    <filter-mapping>
-      <filter-name>Acegi Filter Chain Proxy</filter-name>
-      <url-pattern>/*</url-pattern>
-    </filter-mapping>
+
     
     <filter-mapping>
-        <filter-name>versionManagerFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    
-    <filter-mapping>
         <filter-name>struts2</filter-name>
         <url-pattern>*.do</url-pattern>
     </filter-mapping>
@@ -134,7 +116,7 @@
     </listener-->
     
     <listener>
-        <listener-class>org.springframework.security.ui.session.HttpSessionEventPublisher</listener-class>
+        <listener-class>org.springframework.security.web.session.HttpSessionEventPublisher</listener-class>
     </listener>  
     <listener>
         <listener-class>com.forgon.oa.onlineusers.listener.SessionInvalidationListener</listener-class>
@@ -174,19 +156,16 @@
     </servlet>
     
     <servlet>
-        <servlet-name>spring-action</servlet-name>
+        <servlet-name>spring-mvc</servlet-name>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextConfigLocation</param-name>
+			<param-value>/WEB-INF/spring-mvc-servlet.xml</param-value>
+		</init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
     
     <servlet>
-        <servlet-name>workFlowPictureServlet</servlet-name>
-        <servlet-class>
-            com.forgon.workflow.util.WorkFlowPictureServlet
-        </servlet-class>
-    </servlet>
-    
-    <servlet>
         <servlet-name>fileDownLoad</servlet-name>
         <servlet-class>com.forgon.filedownload.servlet.FileDownLoadServlet</servlet-class>
     </servlet>
@@ -328,17 +307,12 @@
     </servlet-mapping>
     
     <servlet-mapping>
-        <servlet-name>workFlowPictureServlet</servlet-name>
-        <url-pattern>/workflow/processInstacePicture</url-pattern>
-    </servlet-mapping>
-    
-    <servlet-mapping>
         <servlet-name>fileDownLoad</servlet-name>
         <url-pattern>/attachfiles/fileDownLoad</url-pattern>
     </servlet-mapping>
     
     <servlet-mapping>
-        <servlet-name>spring-action</servlet-name>
+        <servlet-name>spring-mvc</servlet-name>
         <url-pattern>*.mhtml</url-pattern>
     </servlet-mapping>