modify the jsp page and AppConfigManager

cat-core/src/main/java/com/dianping/cat/config/app/AppConfigManager.java

@@ -188,8 +188,8 @@ public class AppConfigManager implements Initializable {
 				AppConfig appConfig = DefaultSaxParser.parse(content);
 
 				m_config = appConfig;
-				refreshData();
 				m_modifyTime = modifyTime;
+				refreshData();
 			}
 		}
 	}
@@ -224,6 +224,7 @@ public class AppConfigManager implements Initializable {
 			boolean active = true;
 			while (active) {
 				try {
+					refreshAppConfigConfig();
 				} catch (Exception e) {
 					Cat.logError(e);
 				}

cat-home/src/main/java/com/dianping/cat/report/service/impl/RouterConfigService.java

 package com.dianping.cat.report.service.impl;
 
 import java.util.Date;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.unidal.dal.jdbc.DalException;
@@ -19,7 +19,7 @@ import com.dianping.cat.report.service.AbstractReportService;
 
 public class RouterConfigService extends AbstractReportService<RouterConfig> {
 
-	private Map<Long, RouterConfig> m_configs = new LinkedHashMap<Long, RouterConfig>();
+	private Map<Long, RouterConfig> m_configs = new HashMap<Long, RouterConfig>();
 
 	@Override
 	public RouterConfig makeReport(String domain, Date start, Date end) {

cat-home/src/main/java/com/dianping/cat/report/task/alert/sender/AlertManager.java

@@ -97,7 +97,6 @@ public class AlertManager implements Initializable {
 		@Override
 		public void shutdown() {
 		}
-
 	}
 
 	@Override

cat-home/src/main/webapp/jsp/system/alarm/alarmRecordDetail.jsp

@@ -21,9 +21,6 @@
 <a:body>
 
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
-	<res:useCss value='${res.css.local.table_css}' target="head-css" />
-	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['tableInit.js']}" target="head-js"/>
 	
 

cat-home/src/main/webapp/jsp/system/alarm/alarmRecordList.jsp

@@ -9,12 +9,8 @@
 <jsp:useBean id="model" type="com.dianping.cat.system.page.alarm.Model"scope="request" />
 
 <a:body>
-
 	
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
-	<res:useCss value='${res.css.local.table_css}' target="head-css" />
-	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['tableInit.js']}" target="head-js"/>
 
 	<script type="text/javascript">

cat-home/src/main/webapp/jsp/system/alarm/alarmTemplateUpdate.jsp

@@ -11,9 +11,6 @@
 
 <a:body>
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
-	<res:useCss value='${res.css.local.table_css}' target="head-css" />
-	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['tableInit.js']}" target="head-js"/>
 	
 	<script type="text/javascript">

cat-home/src/main/webapp/jsp/system/alarm/scheduledReports.jsp

@@ -10,9 +10,6 @@
 
 <a:body>
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
-	<res:useCss value='${res.css.local.table_css}' target="head-css" />
-	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['tableInit.js']}" target="head-js"/>
 	
 	<script type="text/javascript">