Index: ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml =================================================================== diff -u -r35940 -r35947 --- ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 35940) +++ ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 35947) @@ -1856,7 +1856,7 @@ - 0 0/1 * * * ? + 0 0/5 * * * ? Index: ssts-web/src/main/webapp/WEB-INF/web.xml =================================================================== diff -u -r35940 -r35947 --- ssts-web/src/main/webapp/WEB-INF/web.xml (.../web.xml) (revision 35940) +++ ssts-web/src/main/webapp/WEB-INF/web.xml (.../web.xml) (revision 35947) @@ -1,364 +1,2915 @@ - - - SterileSupplySystem-standard - - - reload_interval_in_minutes - 30 - + + + + + + + + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_SUPPORTS + PROPAGATION_MANDATORY + PROPAGATION_REQUIRES_NEW + PROPAGATION_REQUIRES_NEW + PROPAGATION_NOT_SUPPORTED + PROPAGATION_NEVER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - contextConfigLocation - classpath*:spring/applicationContext-blank.xml - + + + + + + + + - - locatorFactorySelector - classpath*:beanRefContext.xml - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - parentContextKey - com.forgon.portal - + + + + + - - - sessionTimeOutFilter - com.forgon.security.filter.SessionTimeOutFilter - - notFilterURIs - /disinfectSystem/packingAction!loadWaitPackingTaskPageJson.do;/system/timeoutAction!getTimeoutSetting.do;/disinfectSystem/packingAction!getErrorAndDamageCount.do;/disinfectSystem/packingAction!loadWaitPackingTaskJson.do;/disinfectSystem/recyclingRecordAction!loadPoItems.do;/disinfectSystem/recyclingRecordAction!getAwaitForRecyclingInvoicePlan.do;/dwr/call/plaincall/OnlineUserManager.getTotalOnlineUsers.dwr;/systemmanage/user/userAction!getLoginUserData.do;/dwr/call/plaincall/ForeignTousseApplicationTableManager.getUnFinishedForeignTousseApplicationCountForSelfDepart.dwr;/disinfectSystem/baseData/supplyRoomConfigAction!dashboardsScreenSaver.do;/jasperreports/jasperreportsAction!getFirstSupplyRoomConfigOnlineUserDate.do;/jasperreports/jasperreportsAction!getEquipmentData.do;/jasperreports/jasperreportsAction!getRealTimeBulletinBoardWorkloadData.do - - + + - - sessionTimeOutFilter - /* - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + updateSupplierAndCertificateStatus + + + + + + + + + + 14 2 0 * * ? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - xssfilter - com.forgon.xss.filter.XSSFilter - + + + + + + + + + + + + + + + - - xssfilter - /* - + + + + + + + + - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - + + + + + + + + - - springSecurityFilterChain - /* - + + - - - autoLoginOutFilter - com.forgon.security.filter.AutoLoginOutFilter - + + + - - autoLoginOutFilter - /* - + + + + + + + + + + - - EncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - resetPasswordFilter - com.forgon.security.filter.ResetPasswordFilter - - toUrl - /logon.jsp - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - versionManagerFilter - com.forgon.register.filter.VersionManagerFilter - - noFilterUrl - /ext-4.2.3/;/buttjoint/;/qualitymonitoringWithNoLogon/;/debug/;/disinfectsystem/config/;/disinfectsystem/common/;/disinfectSystem/fileUploadServlet;/disinfectSystem/mediaDownloadServlet;/CodeImageServlet;/UserUpLoadFiles/;/openSystemMainPage.jsp;/logon.jsp;/favicon.ico;/js/;/common/taglibs.jsp;/jquery/;/ext/;/images/;/styles/;/scripts/;/wap/index.jsp;/themes/;/services/;/ikey/;/mobileClient/;/disinfectSystem/sterilization/sterilizationRecordAction!uploadSterilizationRecordPic.do/;/disinfectSystem/printBarcodeAction!printBarcodeImage.do/;/servlets/image - - + + - - struts2 - org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter - + - - hibernateFilter - org.springframework.orm.hibernate4.support.OpenSessionInViewFilter - + + + + + + + + + + + + - - EncodingFilter - /* - + + + + + + + + + - - hibernateFilter - /* - + + + + + + + + + + + + + + + + + + + + + + + - - versionManagerFilter - /* - + + - - struts2 - *.do - + + + + + + + + + + + + - + + + - - - com.forgon.servlet.ForgonServletContextListener - - - - - org.springframework.web.context.ContextLoaderListener - - - - - - org.springframework.web.context.request.RequestContextListener - - - - - com.forgon.tools.listener.SingletonSpringApplicationContextListener - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - org.springframework.security.web.session.HttpSessionEventPublisher - - - com.forgon.oa.onlineusers.listener.SessionInvalidationListener - + - - dwr-invoker - org.directwebremoting.servlet.DwrServlet - - debug - true - - - classes - java.lang.Object - - - activeReverseAjaxEnabled - true - - - maxWaitAfterWrite - 500 - - - crossDomainSessionSecurity - false - - - scriptCompressed - true - - - compressionLevel - 47 - - + + + + + - - spring-mvc - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - /WEB-INF/spring-mvc-servlet.xml - - 1 - + + + + + + + PROPAGATION_REQUIRED + PROPAGATION_NEVER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - fileDownLoad - com.forgon.filedownload.servlet.FileDownLoadServlet - + + + + + + + + + - - CodeImageServlet - com.forgon.security.servlet.CodeImageServlet - + + + + + + + + + + + + + + + + + - - CodeImageServlet - /CodeImageServlet - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + processDeviceInterfaceData + + + + + + + + + + 0 0/5 * * * ? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - JRHTMLServlet - org.xinyunfei.web.JRHTMLServlet - - - JRHTMLServlet - /JRHTMLServlet - + + + + + + + + + + + + + + + + + + + + + + + + + - - ImageServlet - net.sf.jasperreports.j2ee.servlets.ImageServlet - + + - - ImageServlet - /servlets/image - + + + + + + + + + + + + + + + + + + - - DisplayChart - org.jfree.chart.servlet.DisplayChart - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - DisplayChart - /DisplayChart - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - cxf - cxf - Apache CXF Endpoint - org.apache.cxf.transport.servlet.CXFServlet - 1 - - - uploadImageServlet - com.forgon.disinfectsystem.maintain.servlet.UploadServlet - - - mediaDownloadServlet - com.forgon.disinfectsystem.maintain.servlet.DownloadServlet - - - mediaDownloadServlet - /disinfectSystem/mediaDownloadServlet - - - uploadImageServlet - /disinfectSystem/fileUploadServlet - + + + + + + + + + + + + + + + + + + + + + + - - dwr-invoker - /dwr/* - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - fileDownLoad - /attachfiles/fileDownLoad - + + + + + - - spring-mvc - *.mhtml - + - - cxf - /services/* - - - - http://www.springmodules.org/tags/commons-validator - /WEB-INF/tlds/spring-commons-validator.tld - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - http://www.forgon.com/interceptString - /WEB-INF/tlds/interceptStringTag.tld - + + + + + + + + + - - http://www.forgon.com/tags-operation - /WEB-INF/tlds/operation.tld - + + + + + + - - http://www.forgon.com/tags-bean - /WEB-INF/tlds/attachfile.tld - + + + + + + - - - javax.servlet.jsp.jstl.fmt.localizationContext - resources/oa - - - - logon.jsp - + + + + + + + - - 480 - - 　　true - - - 　　 - - - - 403 - /casfailed.jsp - - - 404 - /pagenotfound.jsp - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_SUPPORTS + PROPAGATION_MANDATORY + PROPAGATION_REQUIRES_NEW + PROPAGATION_REQUIRES_NEW + PROPAGATION_NOT_SUPPORTED + PROPAGATION_NEVER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-acegi-security.xml =================================================================== diff -u -r35940 -r35947 --- ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-acegi-security.xml (.../applicationContext-acegi-security.xml) (revision 35940) +++ ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-acegi-security.xml (.../applicationContext-acegi-security.xml) (revision 35947) @@ -42,26 +42,12 @@ - - - - - - - - - - - - - - @@ -72,7 +58,7 @@ - + @@ -82,15 +68,7 @@ - - - - - - - -